Move border type constants and Moments class to core module

2013-04-10 15:54:14 +04:00
parent f4ae0cf19c
commit c98c246fc2
83 changed files with 541 additions and 639 deletions
--- a/modules/contrib/src/spinimages.cpp
+++ b/modules/contrib/src/spinimages.cpp
@@ -770,7 +770,7 @@ Mat cv::SpinImageModel::packRandomScaledSpins(bool separateScale, size_t xCount,
                int endx   = (x + 1) * sz + x;

                Mat color;
-                cvtColor(spins[pos++], color, CV_GRAY2BGR);
+                cvtColor(spins[pos++], color, COLOR_GRAY2BGR);
                Mat roi = result(Range(starty, endy), Range(startx, endx));
                color.copyTo(roi);
            }