Build with gcc 4.7

adakite · Feb 11, 2013 · 6e17dcd · 6e17dcd
1 parent 5c5c221
commit 6e17dcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/openMVG/image/image_concat.hpp b/src/openMVG/image/image_concat.hpp
@@ -16,7 +16,7 @@ void ConcatH(const Image & imageA, const Image & imageB, Image & Out)
   // Compute new dimensions.
   int ww = imageA.Width() + imageB.Width();
 
-  Out = Image(ww, max(imageA.Height(), imageB.Height()));
+  Out = Image(ww, std::max(imageA.Height(), imageB.Height()));
 
   // Fill with original data from imageA.
   for(size_t i = 0; i < imageA.Width(); ++i)

diff --git a/src/third_party/vectorGraphics/svgDrawer.hpp b/src/third_party/vectorGraphics/svgDrawer.hpp
@@ -153,7 +153,7 @@ class svgDrawer{
 
     DataInputIteratorY itery = yStart;
     for(DataInputIteratorX iterx = xStart;
-     iterx != xEnd; advance(iterx, 1), advance(itery, 1))
+     iterx != xEnd; std::advance(iterx, 1), std::advance(itery, 1))
     {
       svgStream << *iterx << ',' << *itery << ' ';
     }