fixed some warnings

GPU: TargetArchs -> added FEATURE_SET prefix.

diff --git a/doc/gpu_initialization.tex b/doc/gpu_initialization.tex
index d48e47c..cf1d308 100644 (file)
--- a/doc/gpu_initialization.tex
+++ b/doc/gpu_initialization.tex
@@ -28,9 +28,9 @@ GPU compute features.
 \begin{lstlisting}
 enum GpuFeature
 {
-    COMPUTE_10, COMPUTE_11,
-    COMPUTE_12, COMPUTE_13,
-    COMPUTE_20, COMPUTE_21,
+    FEATURE_SET_COMPUTE_10, FEATURE_SET_COMPUTE_11,
+    FEATURE_SET_COMPUTE_12, FEATURE_SET_COMPUTE_13,
+    FEATURE_SET_COMPUTE_20, FEATURE_SET_COMPUTE_21,
     ATOMICS, NATIVE_DOUBLE
 };
 \end{lstlisting}

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 76ae149..a112755 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -66,14 +66,14 @@ namespace cv
 \r
         enum GpuFeature\r
         {\r
-            COMPUTE_10 = 10,\r
-            COMPUTE_11 = 11,\r
-            COMPUTE_12 = 12,\r
-            COMPUTE_13 = 13,\r
-            COMPUTE_20 = 20,\r
-            COMPUTE_21 = 21,\r
-            ATOMICS = COMPUTE_11,\r
-            NATIVE_DOUBLE = COMPUTE_13\r
+            FEATURE_SET_COMPUTE_10 = 10,\r
+            FEATURE_SET_COMPUTE_11 = 11,\r
+            FEATURE_SET_COMPUTE_12 = 12,\r
+            FEATURE_SET_COMPUTE_13 = 13,\r
+            FEATURE_SET_COMPUTE_20 = 20,\r
+            FEATURE_SET_COMPUTE_21 = 21,\r
+            ATOMICS = FEATURE_SET_COMPUTE_11,\r
+            NATIVE_DOUBLE = FEATURE_SET_COMPUTE_13\r
         };\r
 \r
         class CV_EXPORTS TargetArchs\r

diff --git a/modules/gpu/src/brute_force_matcher.cpp b/modules/gpu/src/brute_force_matcher.cpp
index 222feb6..ebf831f 100644 (file)
--- a/modules/gpu/src/brute_force_matcher.cpp
+++ b/modules/gpu/src/brute_force_matcher.cpp
@@ -192,7 +192,7 @@ void cv::gpu::BruteForceMatcher_GPU_base::matchSingle(const GpuMat& queryDescs,
     match_caller_t func = match_callers[distType][queryDescs.depth()];\r
     CV_Assert(func != 0);\r
 \r
-    bool cc_12 = TargetArchs::builtWith(COMPUTE_12) && DeviceInfo().supports(COMPUTE_12);\r
+    bool cc_12 = TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12);\r
 \r
     // For single train there is no need to save imgIdx, so we just save imgIdx to trainIdx.\r
     // trainIdx store after imgIdx, so we doesn't lose it value.\r
@@ -320,7 +320,7 @@ void cv::gpu::BruteForceMatcher_GPU_base::matchCollection(const GpuMat& queryDes
     match_caller_t func = match_callers[distType][queryDescs.depth()];\r
     CV_Assert(func != 0);\r
 \r
-    bool cc_12 = TargetArchs::builtWith(COMPUTE_12) && DeviceInfo().supports(COMPUTE_12);\r
+    bool cc_12 = TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12);\r
 \r
     func(queryDescs, trainCollection, maskCollection, trainIdx, imgIdx, distance, cc_12);\r
 }\r

diff --git a/modules/gpu/src/imgproc_gpu.cpp b/modules/gpu/src/imgproc_gpu.cpp
index e78083d..969a4c2 100644 (file)
--- a/modules/gpu/src/imgproc_gpu.cpp
+++ b/modules/gpu/src/imgproc_gpu.cpp
@@ -128,7 +128,7 @@ void cv::gpu::remap(const GpuMat& src, GpuMat& dst, const GpuMat& xmap, const Gp
 \r
 void cv::gpu::meanShiftFiltering(const GpuMat& src, GpuMat& dst, int sp, int sr, TermCriteria criteria)\r
 {\r
-    CV_Assert(TargetArchs::builtWith(COMPUTE_12) && DeviceInfo().supports(COMPUTE_12));\r
+    CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
 \r
     if( src.empty() )\r
         CV_Error( CV_StsBadArg, "The input image is empty" );\r
@@ -156,7 +156,7 @@ void cv::gpu::meanShiftFiltering(const GpuMat& src, GpuMat& dst, int sp, int sr,
 \r
 void cv::gpu::meanShiftProc(const GpuMat& src, GpuMat& dstr, GpuMat& dstsp, int sp, int sr, TermCriteria criteria)\r
 {\r
-    CV_Assert(TargetArchs::builtWith(COMPUTE_12) && DeviceInfo().supports(COMPUTE_12));\r
+    CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
 \r
     if( src.empty() )\r
         CV_Error( CV_StsBadArg, "The input image is empty" );\r

diff --git a/modules/gpu/src/mssegmentation.cpp b/modules/gpu/src/mssegmentation.cpp
index 159a779..fd62f43 100644 (file)
--- a/modules/gpu/src/mssegmentation.cpp
+++ b/modules/gpu/src/mssegmentation.cpp
@@ -227,7 +227,7 @@ inline int dist2(const cv::Vec2s& lhs, const cv::Vec2s& rhs)
 \r
 void cv::gpu::meanShiftSegmentation(const GpuMat& src, Mat& dst, int sp, int sr, int minsize, TermCriteria criteria)\r
 {\r
-    CV_Assert(TargetArchs::builtWith(COMPUTE_12) && DeviceInfo().supports(COMPUTE_12));\r
+    CV_Assert(TargetArchs::builtWith(FEATURE_SET_COMPUTE_12) && DeviceInfo().supports(FEATURE_SET_COMPUTE_12));\r
 \r
     CV_Assert(src.type() == CV_8UC4);\r
     const int nrows = src.rows;\r

diff --git a/modules/gpu/src/surf.cpp b/modules/gpu/src/surf.cpp
index b7cfbf4..9680260 100644 (file)
--- a/modules/gpu/src/surf.cpp
+++ b/modules/gpu/src/surf.cpp
@@ -174,7 +174,7 @@ namespace
         {\r
             typedef void (*fasthessian_t)(PtrStepf hessianBuffer, int x_size, int y_size, const dim3& threads);\r
             const fasthessian_t fasthessian = \r
-                DeviceInfo().supports(COMPUTE_13) ? fasthessian_gpu : fasthessian_gpu_old;\r
+                DeviceInfo().supports(FEATURE_SET_COMPUTE_13) ? fasthessian_gpu : fasthessian_gpu_old;\r
 \r
             dim3 threads = calcBlockSize(nIntervals);\r
             for(int octave = 0; octave < nOctaves; ++octave)\r
@@ -234,7 +234,7 @@ namespace
                 const KeyPoint_GPU* features, int nFeatures);\r
 \r
             const compute_descriptors_t compute_descriptors = \r
-                DeviceInfo().supports(COMPUTE_13) ? compute_descriptors_gpu : compute_descriptors_gpu_old;\r
+                DeviceInfo().supports(FEATURE_SET_COMPUTE_13) ? compute_descriptors_gpu : compute_descriptors_gpu_old;\r
 \r
             if (keypoints.cols > 0)\r
             {\r

diff --git a/samples/cpp/convexhull.cpp b/samples/cpp/convexhull.cpp
index 8d4bba0..f9eb91b 100644 (file)
--- a/samples/cpp/convexhull.cpp
+++ b/samples/cpp/convexhull.cpp
@@ -13,7 +13,7 @@ void help()
                 << "./convexhull\n" << endl;
 }
 
-int main( int argc, char** argv )
+int main( int /*argc*/, char** /*argv*/ )
 {
     Mat img(500, 500, CV_8UC3);
     RNG& rng = theRNG();

diff --git a/samples/cpp/demhist.cpp b/samples/cpp/demhist.cpp
index 7dd724b..ee9f105 100644 (file)
--- a/samples/cpp/demhist.cpp
+++ b/samples/cpp/demhist.cpp
@@ -12,7 +12,7 @@ int _contrast = 100;
 Mat image;
 
 /* brightness/contrast callback function */
-void updateBrightnessContrast( int arg, void* )
+void updateBrightnessContrast( int /*arg*/, void* )
 {
     int histSize = 64;
     int brightness = _brightness - 100;

diff --git a/samples/cpp/squares.cpp b/samples/cpp/squares.cpp
index 9c46f9c..df16e01 100644 (file)
--- a/samples/cpp/squares.cpp
+++ b/samples/cpp/squares.cpp
@@ -139,7 +139,7 @@ void drawSquares( Mat& image, const vector<vector<Point> >& squares )
 }
 
 
-int main(int argc, char** argv)
+int main(int /*argc*/, char** /*argv*/)
 {
     static const char* names[] = { "pic1.png", "pic2.png", "pic3.png",
         "pic4.png", "pic5.png", "pic6.png", 0 };