generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix opencv-highgui build with old versions of libpng (< 1.4.x)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-12-11 18:05:50 +00:00
parent 6c2cce6e28
commit 4339f69da4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,8 +223,12 @@ bool PngDecoder::readData( Mat& img )
png_set_palette_to_rgb( png_ptr ); png_set_palette_to_rgb( png_ptr );
if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
#if PNG_LIBPNG_VER_MAJOR*100 + PNG_LIBPNG_VER_MINOR >= 104
png_set_expand_gray_1_2_4_to_8( png_ptr ); png_set_expand_gray_1_2_4_to_8( png_ptr );
#else
png_set_gray_1_2_4_to_8( png_ptr );
#endif
if( CV_MAT_CN(m_type) > 1 && color ) if( CV_MAT_CN(m_type) > 1 && color )
png_set_bgr( png_ptr ); // convert RGB to BGR png_set_bgr( png_ptr ); // convert RGB to BGR
else if( color ) else if( color )