Revert "some more fixes towards binary compatibility"

This reverts commit a8c5e35619. Conflicts: modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
parent 3ffe0f0117
commit 18ab16dbd3
5 changed files with 14 additions and 52 deletions
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -586,7 +586,7 @@ protected:

    int threshold;
    bool nonmaxSuppression;
-    short type;
+    int type;
 };