generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2838 from ilya-lavrenov:tapi_warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2014-06-09 20:25:28 +04:00 committed by OpenCV Buildbot
commit 8681b52dba
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/histogram.cpp
View File

@ -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

2
modules/ts/src/ocl_test.cpp
View File

@ -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)
{