potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages 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
modules/core/src/datastructs.cpp
+4 -4
View File
@@ -3937,9 +3937,9 @@ void KDTree::findOrthoRange(const float* L, const float* R,
void KDTree::getPoints(const int* idx, size_t nidx, Mat& pts) const
{
int dims = points.cols;
pts.create( nidx, dims, points.type());
for( size_t i = 0; i < nidx; i++ )
int dims = points.cols, n = (int)nidx;
pts.create( n, dims, points.type());
for( int i = 0; i < n; i++ )
{
int k = idx[i];
CV_Assert( (unsigned)k < (unsigned)points.rows );
@@ -3954,7 +3954,7 @@ void KDTree::getPoints(const Mat& idx, Mat& pts) const
CV_Assert(idx.type() == CV_32S && idx.isContinuous() &&
(idx.cols == 1 || idx.rows == 1));
int dims = points.cols;
size_t i, nidx = idx.cols + idx.rows - 1;
int i, nidx = idx.cols + idx.rows - 1;
pts.create( nidx, dims, points.type());
const int* _idx = idx.ptr<int>();