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

Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4

Browse Source
This commit is contained in:
Alexander Alekhin 2016-04-19 13:32:44 +00:00
commit 1b4bd6a905
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,8 +228,6 @@ bool PngDecoder::readData( Mat& img )
AutoBuffer<uchar*> _buffer(m_height); AutoBuffer<uchar*> _buffer(m_height);
uchar** buffer = _buffer; uchar** buffer = _buffer;
int color = img.channels() > 1; int color = img.channels() > 1;
uchar* data = img.data;
int step = (int)img.step;
if( m_png_ptr && m_info_ptr && m_end_info && m_width && m_height ) if( m_png_ptr && m_info_ptr && m_end_info && m_width && m_height )
{ {
@ -281,7 +279,7 @@ bool PngDecoder::readData( Mat& img )
png_read_update_info( png_ptr, info_ptr ); png_read_update_info( png_ptr, info_ptr );
for( y = 0; y < m_height; y++ ) for( y = 0; y < m_height; y++ )
buffer[y] = data + y*step; buffer[y] = img.data + y*img.step;
png_read_image( png_ptr, buffer ); png_read_image( png_ptr, buffer );
png_read_end( png_ptr, end_info ); png_read_end( png_ptr, end_info );