Renamed ocl tests' precomp files according to convention.

Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.

modules/ocl/perf/main.cpp

@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 int main(int argc, const char *argv[])
 {

modules/ocl/perf/perf_arithm.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 ///////////// Lut ////////////////////////
 PERFTEST(lut)
 {

modules/ocl/perf/perf_blend.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 ///////////// blend ////////////////////////
 template <typename T>
 void blendLinearGold(const cv::Mat &img1, const cv::Mat &img2, const cv::Mat &weights1, const cv::Mat &weights2, cv::Mat &result_gold)

modules/ocl/perf/perf_brute_force_matcher.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 //////////////////// BruteForceMatch /////////////////
 PERFTEST(BruteForceMatcher)

modules/ocl/perf/perf_calib3d.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 ///////////// StereoMatchBM ////////////////////////
 PERFTEST(StereoMatchBM)
 {

modules/ocl/perf/perf_canny.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// Canny ////////////////////////
 PERFTEST(Canny)

modules/ocl/perf/perf_color.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// cvtColor////////////////////////
 PERFTEST(cvtColor)

modules/ocl/perf/perf_fft.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// dft ////////////////////////
 PERFTEST(dft)

modules/ocl/perf/perf_filters.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// Blur////////////////////////
 PERFTEST(Blur)

modules/ocl/perf/perf_gemm.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// gemm ////////////////////////
 PERFTEST(gemm)

modules/ocl/perf/perf_gftt.cpp

@@ -44,7 +44,7 @@
 //M*/
 
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// GoodFeaturesToTrack ////////////////////////
 PERFTEST(GoodFeaturesToTrack)

modules/ocl/perf/perf_haar.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// Haar ////////////////////////
 namespace cv

modules/ocl/perf/perf_hog.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// HOG////////////////////////
 

modules/ocl/perf/perf_imgproc.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// equalizeHist ////////////////////////
 PERFTEST(equalizeHist)

modules/ocl/perf/perf_match_template.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 /////////// matchTemplate ////////////////////////
 //void InitMatchTemplate()

modules/ocl/perf/perf_matrix_operation.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// ConvertTo////////////////////////
 PERFTEST(ConvertTo)

modules/ocl/perf/perf_moments.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 ///////////// Moments ////////////////////////
 PERFTEST(Moments)
 {

modules/ocl/perf/perf_norm.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// norm////////////////////////
 PERFTEST(norm)

modules/ocl/perf/perf_opticalflow.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// PyrLKOpticalFlow ////////////////////////
 PERFTEST(PyrLKOpticalFlow)

modules/ocl/perf/precomp.cpp → modules/ocl/perf/perf_precomp.cpp

@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 #if GTEST_OS_WINDOWS
 #ifndef NOMINMAX
 #define NOMINMAX

modules/ocl/perf/precomp.hpp → modules/ocl/perf/perf_precomp.hpp

@@ -40,6 +40,9 @@
 //
 //M*/
 
+#ifndef __OPENCV_PERF_PRECOMP_HPP__
+#define __OPENCV_PERF_PRECOMP_HPP__
+
 #include <iomanip>
 #include <stdexcept>
 #include <string>
@@ -99,7 +102,7 @@ int EeceptDoubleEQ(T1 expected, T1 actual)
     testing::internal::Double lhs(expected);
     testing::internal::Double rhs(actual);
 
-    if (lhs.AlmostEquals(rhs)) 
+    if (lhs.AlmostEquals(rhs))
     {
         return 1;
     }
@@ -352,7 +355,7 @@ public:
         if(accurate_diff_ <= eps)
             is_accurate_ = 1;
         else
-            is_accurate_ = 0;    
+            is_accurate_ = 0;
     }
 
     std::stringstream &getCurSubtestDescription()
@@ -369,7 +372,7 @@ private:
         speedup_full_faster_count_(0), speedup_full_slower_count_(0), speedup_full_equal_count_(0), is_list_mode_(false),
         num_iters_(10), cpu_num_iters_(2),
         gpu_warmup_iters_(1), cur_iter_idx_(0), cur_warmup_idx_(0),
-        record_(0), recordname_("performance"), itname_changed_(true), 
+        record_(0), recordname_("performance"), itname_changed_(true),
         is_accurate_(-1), accurate_diff_(0.)
     {
         cpu_times_.reserve(num_iters_);
@@ -506,3 +509,5 @@ struct name##_test: Runnable { \
 #define WARMUP_OFF \
 	ocl::finish();\
 	} TestSystem::instance().warmupComplete()
+
+#endif

modules/ocl/perf/perf_pyramid.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// pyrDown //////////////////////
 PERFTEST(pyrDown)

modules/ocl/perf/perf_split_merge.cpp

@@ -43,7 +43,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "perf_precomp.hpp"
 
 ///////////// Merge////////////////////////
 PERFTEST(Merge)

modules/ocl/test/main.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/test_arithm.cpp

@@ -54,7 +54,7 @@
 //#define PRINT_TIME
 
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 
 #ifdef HAVE_OPENCL

modules/ocl/test/test_blend.cpp

@@ -42,7 +42,7 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 
 using namespace cv;

modules/ocl/test/test_brute_force_matcher.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #ifdef HAVE_OPENCL
 namespace
 {

modules/ocl/test/test_calib3d.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 
 #ifdef HAVE_OPENCL

modules/ocl/test/test_canny.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #ifdef HAVE_OPENCL
 
 ////////////////////////////////////////////////////////

modules/ocl/test/test_color.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #ifdef HAVE_OPENCL
 
 //#define MAT_DEBUG

modules/ocl/test/test_fft.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 using namespace std;
 #ifdef HAVE_CLAMDFFT
 ////////////////////////////////////////////////////////////////////////////

modules/ocl/test/test_filters.cpp

@@ -48,7 +48,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/test_gemm.cpp

@@ -43,7 +43,7 @@
 //M*/
 
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 using namespace std;
 #ifdef HAVE_CLAMDBLAS
 ////////////////////////////////////////////////////////////////////////////

modules/ocl/test/test_imgproc.cpp

@@ -51,7 +51,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/test_kmeans.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/test_match_template.cpp

@@ -43,7 +43,7 @@
 //M*/
 
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 ////////////////////////////////////////////////////////////////////////////////

modules/ocl/test/test_matrix_operation.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/test_moments.cpp

-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 #include "opencv2/imgproc/imgproc_c.h"
 

modules/ocl/test/test_objdetect.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include "opencv2/core/core.hpp"
 #include "opencv2/objdetect/objdetect.hpp"
 

modules/ocl/test/test_optflow.cpp

@@ -43,7 +43,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 
 #ifdef HAVE_OPENCL

modules/ocl/test/test_pyramids.cpp

@@ -44,7 +44,7 @@
 //M*/
 
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iomanip>
 
 #ifdef HAVE_OPENCL

modules/ocl/test/test_sort.cpp

@@ -44,7 +44,7 @@
 //M*/
 #include <map>
 #include <functional>
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 using namespace std;
 using namespace cvtest;

modules/ocl/test/test_split_merge.cpp

@@ -44,7 +44,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 
 #ifdef HAVE_OPENCL
 

modules/ocl/test/utility.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #define VARNAME(A) #A
 using namespace std;
 using namespace cv;