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

Merge release 2.4.3

Browse Source
This commit is contained in:
Andrey Kamaev
2012-11-02 17:45:58 +04:00
parent 66b90d19a6 6484732509
commit 4d059e9e5b
126 changed files with 61518 additions and 51142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/test/test_labeling.cpp
View File

@@ -135,7 +135,7 @@ namespace {
int outliers = 0;
for (int j = 0; j < image.rows; ++j)
for (int i = 0; i < image.cols; ++i)
for (int i = 0; i < image.cols - 1; ++i)
{
if ( (_labels.at<int>(j,i) == gpu.at<int>(j,i + 1)) && (diff.at<int>(j, i) != diff.at<int>(j,i + 1)))
{

5
modules/gpu/test/test_precomp.hpp
View File

@@ -41,7 +41,10 @@
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wmissing-declarations"
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
# ifdef __clang__
# pragma GCC diagnostic ignored "-Wmissing-prototypes"
# pragma GCC diagnostic ignored "-Wextra"
# endif
#endif
#ifndef __OPENCV_TEST_PRECOMP_HPP__