Build warnings fix

nuno-aj-aniceto · Aug 17, 2012 · 017e190 · 017e190
1 parent fe8f4b9
commit 017e190
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/CollectedStatistics.cpp b/CollectedStatistics.cpp
@@ -1,21 +1,21 @@
 #include "CollectedStatistics.hpp"
 
-#include <strstream>
+#include <sstream>
 #include <iostream>
 #include <iterator>
 #include <numeric>
 
 template<typename T>
 std::string quote(const T& t)
 {
-    std::ostrstream quoteStr;
+    std::ostringstream quoteStr;
     quoteStr << "\"" << t << "\"";
     return quoteStr.str();
 }
 
 std::ostream& tab(std::ostream& str)
 {
-    return str << tab;
+    return str << "\t";
 }
 
 std::ostream& null(std::ostream& str)

diff --git a/main.cpp b/main.cpp
@@ -17,12 +17,11 @@ int main(int argc, const char* argv[])
     std::vector<cv::Ptr<ImageTransformation> > transformations;
 
     // Initialize list of algorithm tuples:
-
     algorithms.push_back(FeatureAlgorithm("SURF-FREAK",
                                           new cv::SurfFeatureDetector(),
                                           new cv::FREAK(),
                                           new cv::BFMatcher(cv::NORM_HAMMING)));
-
+                                          
     algorithms.push_back(FeatureAlgorithm("ORB-FREAK",
                                           new cv::OrbFeatureDetector(),
                                           new cv::FREAK(),
@@ -42,14 +41,12 @@ int main(int argc, const char* argv[])
                                           new cv::ORB(500, 1.2f, 8, 31, 0, 4),
                                           new cv::ORB(500, 1.2f, 8, 31, 0, 4),
                                           new cv::BFMatcher(cv::NORM_HAMMING2, false)));
-
 
     algorithms.push_back(FeatureAlgorithm("FAST+BRIEF",
                                           new cv::FastFeatureDetector(50),
                                           new cv::BriefDescriptorExtractor(),
                                           new cv::BFMatcher(cv::NORM_HAMMING, false)));
 
-
     algorithms.push_back(FeatureAlgorithm("SURF-BruteForce",
                                           new cv::SurfFeatureDetector(),
                                           new cv::SurfDescriptorExtractor(),
@@ -59,12 +56,12 @@ int main(int argc, const char* argv[])
                                           new cv::SurfFeatureDetector(),
                                           new cv::SurfDescriptorExtractor(),
                                           new cv::FlannBasedMatcher()));
-
+    /**/
     // Initialize list of used transformations:
     transformations.push_back(new GaussianBlurTransform(9));
     transformations.push_back(new BrightnessImageTransform(-127, +127,1));
     transformations.push_back(new ImageRotationTransformation(0, 360, 1, cv::Point2f(0.5f,0.5f)));
-    transformations.push_back(new ImageScalingTransformation(0.25, 2, 0.01));
+    transformations.push_back(new ImageScalingTransformation(0.25f, 2f, 0.01f));
 
     if (argc < 2)
     {