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

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

View File

@@ -3000,7 +3000,7 @@ static void makeOffsets(int pixel[], int row_stride)
static void fast9ComputeScores(const Mat& img, vector<Point>& corners, vector<int>& scores, int b)
{
int pixel[16];
makeOffsets(pixel, img.step);
makeOffsets(pixel, (int)img.step);
size_t n, num_corners = corners.size();
scores.resize(num_corners);
@@ -3013,7 +3013,7 @@ static void fast9Detect(const Mat& img, vector<Point>& ret_corners, int b)
{
int xsize = img.cols, ysize = img.rows;
int pixel[16];
makeOffsets(pixel, img.step);
makeOffsets(pixel, (int)img.step);
ret_corners.reserve(512);