mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #642 from taka-no-me:fix1

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-14 11:42:05 +04:00 committed by OpenCV Buildbot
commit b076b69e68
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/libwebp/CMakeLists.txt vendored
View File

@ -41,6 +41,7 @@ if(UNIX)
endif()
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wshadow)
ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4267) # vs2005
set_target_properties(${WEBP_LIBRARY}
PROPERTIES OUTPUT_NAME ${WEBP_LIBRARY}

1
modules/core/src/lapack.cpp
View File

@ -878,6 +878,7 @@ double cv::determinant( InputArray _mat )
size_t step = mat.step;
const uchar* m = mat.data;
CV_Assert( !mat.empty() );
CV_Assert( mat.rows == mat.cols && (type == CV_32F || type == CV_64F));
#define Mf(y, x) ((float*)(m + y*step))[x]

2
modules/highgui/src/grfmt_webp.cpp
View File

@ -176,7 +176,7 @@ bool WebPEncoder::write(const Mat& img, const std::vector<int>& params)
const Mat *image = &img;
Mat temp;
int size = 0;
size_t size = 0;
bool comp_lossless = true;
int quality = 100;

8
modules/imgproc/src/convhull.cpp
View File

@ -206,9 +206,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for( i = 0; i < tl_count-1; i++ )
hullbuf[nout++] = pointer[tl_stack[i]] - data0;
hullbuf[nout++] = int(pointer[tl_stack[i]] - data0);
for( i = tr_count - 1; i > 0; i-- )
hullbuf[nout++] = pointer[tr_stack[i]] - data0;
hullbuf[nout++] = int(pointer[tr_stack[i]] - data0);
int stop_idx = tr_count > 2 ? tr_stack[1] : tl_count > 2 ? tl_stack[tl_count - 2] : -1;
// lower half
@ -244,9 +244,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for( i = 0; i < bl_count-1; i++ )
hullbuf[nout++] = pointer[bl_stack[i]] - data0;
hullbuf[nout++] = int(pointer[bl_stack[i]] - data0);
for( i = br_count-1; i > 0; i-- )
hullbuf[nout++] = pointer[br_stack[i]] - data0;
hullbuf[nout++] = int(pointer[br_stack[i]] - data0);
}
if( !returnPoints )

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

@ -316,7 +316,7 @@ public:
_mm_storel_epi64((__m128i*)(dst+6*6), g1);
}
return bayer - (bayer_end - width);
return int(bayer - (bayer_end - width));
}
bool use_simd;

2
modules/imgproc/test/test_color.cpp
View File

@ -1960,7 +1960,7 @@ static void test_Bayer2RGB_EdgeAware_8u(const Mat& src, Mat& dst, int code)
int dcn = dst.channels();
CV_Assert(dcn == 3);
int step = src.step;
int step = (int)src.step;
const uchar* S = src.ptr<uchar>(1) + 1;
uchar* D = dst.ptr<uchar>(1) + dcn;

2
modules/softcascade/src/softcascade.cpp
View File

@ -53,7 +53,7 @@ namespace {
struct SOctave
{
SOctave(const int i, const cv::Size& origObjSize, const cv::FileNode& fn)
: index(i), weaks((int)fn[SC_OCT_WEAKS]), scale(std::pow(2,(float)fn[SC_OCT_SCALE])),
: index(i), weaks((int)fn[SC_OCT_WEAKS]), scale((float)std::pow(2,(float)fn[SC_OCT_SCALE])),
size(cvRound(origObjSize.width * scale), cvRound(origObjSize.height * scale)) {}
int index;

2
modules/stitching/src/matchers.cpp
View File

@ -573,7 +573,7 @@ void BestOf2NearestMatcher::match(const ImageFeatures &features1, const ImageFea
// Find pair-wise motion
matches_info.H = findHomography(src_points, dst_points, matches_info.inliers_mask, CV_RANSAC);
if (std::abs(determinant(matches_info.H)) < std::numeric_limits<double>::epsilon())
if (matches_info.H.empty() || std::abs(determinant(matches_info.H)) < std::numeric_limits<double>::epsilon())
return;
// Find number of inliers