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

8
modules/highgui/src/grfmt_pxm.cpp
View File

@@ -190,7 +190,7 @@ bool PxMDecoder::readData( Mat& img )
{
int color = img.channels() > 1;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
PaletteEntry palette[256];
bool result = false;
int bit_depth = CV_ELEM_SIZE1(m_type)*8;
@@ -372,9 +372,9 @@ bool PxMEncoder::write( const Mat& img, const vector<int>& params )
bool isBinary = true;
int width = img.cols, height = img.rows;
int _channels = img.channels(), depth = img.elemSize1()*8;
int _channels = img.channels(), depth = (int)img.elemSize1()*8;
int channels = _channels > 1 ? 3 : 1;
int fileStep = width*img.elemSize();
int fileStep = width*(int)img.elemSize();
int x, y;
for( size_t i = 0; i < params.size(); i += 2 )
@@ -399,7 +399,7 @@ bool PxMEncoder::write( const Mat& img, const vector<int>& params )
int bufferSize = 128; // buffer that should fit a header
if( isBinary )
lineLength = width * img.elemSize();
lineLength = width * (int)img.elemSize();
else
lineLength = (6 * channels + (channels > 1 ? 2 : 0)) * width + 32;