Make imgproc.hpp independent from C API

2013-04-06 18:16:51 +04:00
parent 7ac0d86992
commit 288a0634c2
95 changed files with 1400 additions and 1300 deletions
--- a/samples/gpu/generalized_hough.cpp
+++ b/samples/gpu/generalized_hough.cpp
@@ -86,11 +86,11 @@ int main(int argc, const char* argv[])
    Mat templ = loadImage(templName);
    Mat image = loadImage(imageName);

-    int method = GHT_POSITION;
+    int method = cv::GeneralizedHough::GHT_POSITION;
    if (estimateScale)
-        method += GHT_SCALE;
+        method += cv::GeneralizedHough::GHT_SCALE;
    if (estimateRotation)
-        method += GHT_ROTATION;
+        method += cv::GeneralizedHough::GHT_ROTATION;

    vector<Vec4f> position;
    cv::TickMeter tm;