fix for bug 2264

fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7
2012-10-08 02:37:22 +04:00
parent 2ec264303e
commit 23699acca0
3 changed files with 30 additions and 22 deletions
--- a/modules/contrib/src/spinimages.cpp
+++ b/modules/contrib/src/spinimages.cpp
@@ -85,7 +85,10 @@ namespace
    };
    size_t colors_mum = sizeof(colors)/sizeof(colors[0]);

+#if defined __cplusplus  && __cplusplus > 199711L
+#else
 template<class FwIt, class T> void iota(FwIt first, FwIt last, T value) { while(first != last) *first++ = value++; }
+#endif

 void computeNormals( const Octree& Octree, const vector<Point3f>& centers, vector<Point3f>& normals,
                    vector<uchar>& mask, float normalRadius, int minNeighbors = 20)