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/highgui/src/grfmt_bmp.cpp
View File

@@ -184,7 +184,7 @@ bool BmpDecoder::readHeader()
bool BmpDecoder::readData( Mat& img )
{
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
bool color = img.channels() > 1;
uchar gray_palette[256];
bool result = false;

2
modules/highgui/src/grfmt_jpeg.cpp
View File

@@ -370,7 +370,7 @@ bool JpegDecoder::readData( Mat& img )
{
bool result = false;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
bool color = img.channels() > 1;
JpegState* state = (JpegState*)m_state;

2
modules/highgui/src/grfmt_jpeg2000.cpp
View File

@@ -161,7 +161,7 @@ bool Jpeg2KDecoder::readData( Mat& img )
bool result = false;
int color = img.channels() > 1;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
jas_stream_t* stream = (jas_stream_t*)m_stream;
jas_image_t* image = (jas_image_t*)m_image;

4
modules/highgui/src/grfmt_png.cpp
View File

@@ -192,7 +192,7 @@ bool PngDecoder::readData( Mat& img )
uchar** buffer = _buffer;
int color = img.channels() > 1;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
if( m_png_ptr && m_info_ptr && m_end_info && m_width && m_height )
{
@@ -223,7 +223,7 @@ bool PngDecoder::readData( Mat& img )
png_set_palette_to_rgb( png_ptr );
if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
png_set_gray_1_2_4_to_8( png_ptr );
png_set_expand_gray_1_2_4_to_8( png_ptr );
if( CV_MAT_CN(m_type) > 1 && color )
png_set_bgr( png_ptr ); // convert RGB to BGR

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;

2
modules/highgui/src/grfmt_sunras.cpp
View File

@@ -156,7 +156,7 @@ bool SunRasterDecoder::readData( Mat& img )
{
int color = img.channels() > 1;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
uchar gray_palette[256];
bool result = false;
int src_pitch = ((m_width*m_bpp + 7)/8 + 1) & -2;

2
modules/highgui/src/grfmt_tiff.cpp
View File

@@ -147,7 +147,7 @@ bool TiffDecoder::readData( Mat& img )
bool result = false;
bool color = img.channels() > 1;
uchar* data = img.data;
int step = img.step;
int step = (int)img.step;
if( m_tif && m_width && m_height )
{

2
modules/highgui/src/window_w32.cpp
View File

@@ -412,7 +412,7 @@ void cvSetModeWindow_W32( const char* name, double prop_value)//Yannick Verdie
EXIT;
{
DWORD dwStyle = GetWindowLongPtr(window->frame, GWL_STYLE);
DWORD dwStyle = (DWORD)GetWindowLongPtr(window->frame, GWL_STYLE);
CvRect position;
if (window->status==CV_WINDOW_FULLSCREEN && prop_value==CV_WINDOW_NORMAL)