Merge pull request #2838 from ilya-lavrenov:tapi_warnings

modules/imgproc/src/histogram.cpp

@@ -2212,8 +2212,8 @@ void cv::calcBackProject( InputArrayOfArrays images, const std::vector<int>& cha
                           const std::vector<float>& ranges,
                           double scale )
 {
-    Size histSize = hist.size();
 #ifdef HAVE_OPENCL
+    Size histSize = hist.size();
     bool _1D = histSize.height == 1 || histSize.width == 1;
     size_t histdims = _1D ? 1 : hist.dims();
 #endif

modules/ts/src/ocl_test.cpp

@@ -50,6 +50,7 @@ using namespace cv;
 
 int test_loop_times = 1; // TODO Read from command line / environment
 
+#ifdef HAVE_OPENCL
 
 #define DUMP_PROPERTY_XML(propertyName, propertyValue) \
     do { \
@@ -204,6 +205,7 @@ void dumpOpenCLDevice()
 #undef DUMP_MESSAGE_STDOUT
 #undef DUMP_PROPERTY_XML
 
+#endif
 
 Mat TestUtils::readImage(const String &fileName, int flags)
 {