mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 11:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10444 from alalek:fix_asan_imgcodecs

Browse Source
This commit is contained in:
Alexander Alekhin 2017-12-28 18:28:29 +03:00 committed by GitHub
commit ec32022bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgcodecs/src/grfmt_png.cpp
View File

@ -228,12 +228,12 @@ bool PngDecoder::readData( Mat& img )
uchar** buffer = _buffer; uchar** buffer = _buffer;
int color = img.channels() > 1; int color = img.channels() > 1;
png_structp png_ptr = (png_structp)m_png_ptr;
png_infop info_ptr = (png_infop)m_info_ptr;
png_infop end_info = (png_infop)m_end_info;
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 )
{ {
png_structp png_ptr = (png_structp)m_png_ptr;
png_infop info_ptr = (png_infop)m_info_ptr;
png_infop end_info = (png_infop)m_end_info;
if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 ) if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
{ {
int y; int y;