Fix build with STLPort from NDK r8d

2012-12-21 19:58:51 +04:00
parent ffdbddd6b1
commit 9944282b09
18 changed files with 47 additions and 33 deletions
--- a/modules/stitching/src/stitcher.cpp
+++ b/modules/stitching/src/stitcher.cpp
@@ -468,7 +468,7 @@ void Stitcher::estimateCameraParams()
        focals.push_back(cameras_[i].focal);
    }

-    sort(focals.begin(), focals.end());
+    std::sort(focals.begin(), focals.end());
    if (focals.size() % 2 == 1)
        warped_image_scale_ = static_cast<float>(focals[focals.size() / 2]);
    else