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

@@ -1704,13 +1704,13 @@ namespace cv{
for (int i = 0; i < patch_count; i++)
{
float sum = cvSum(patches[i]).val[0];
float nf = (float)(1./cvSum(patches[i]).val[0]);
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
*((float*)(data->data.ptr + data->step * i) + y * width + x)
= (float)(unsigned char)patches[i]->imageData[y * patches[i]->widthStep + x] / sum;
= (unsigned char)patches[i]->imageData[y * patches[i]->widthStep + x] * nf;
}
}
}