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

updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 12:54:53 +00:00
parent 0c9eca7922
commit f78a3b4cc1
465 changed files with 51856 additions and 41344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/core.hpp
View File

@@ -1816,7 +1816,7 @@ CV_EXPORTS void merge(const Mat* mv, size_t count, Mat& dst);
CV_EXPORTS void split(const Mat& m, Mat* mvbegin);
//! copies selected channels from the input arrays to the selected channels of the output arrays
CV_EXPORTS void mixChannels(const Mat* src, int nsrcs, Mat* dst, int ndsts,
CV_EXPORTS void mixChannels(const Mat* src, size_t nsrcs, Mat* dst, size_t ndsts,
const int* fromTo, size_t npairs);
//! reverses the order of the rows, columns or both in a matrix
CV_EXPORTS void flip(const Mat& a, Mat& b, int flipCode);

4
modules/core/include/opencv2/core/operations.hpp
View File

@@ -2372,8 +2372,8 @@ inline LineIterator LineIterator::operator ++(int)
inline Point LineIterator::pos() const
{
Point p;
p.y = (ptr - ptr0)/step;
p.x = ((ptr - ptr0) - p.y*step)/elemSize;
p.y = (int)((ptr - ptr0)/step);
p.x = (int)(((ptr - ptr0) - p.y*step)/elemSize);
return p;
}