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

Fixed 2 new Android build warnings

Browse Source
This commit is contained in:
Andrey Kamaev
2012-08-13 19:24:31 +04:00
parent 941897aa3d
commit d525362cd5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,12 +382,11 @@ bool JpegDecoder::readData( Mat& img )
bool result = false;
int step = (int)img.step;
bool color = img.channels() > 1;
JpegState* state = (JpegState*)m_state;
if( state && m_width && m_height )
if( m_state && m_width && m_height )
{
jpeg_decompress_struct* cinfo = &state->cinfo;
JpegErrorMgr* jerr = &state->jerr;
jpeg_decompress_struct* cinfo = &((JpegState*)m_state)->cinfo;
JpegErrorMgr* jerr = &((JpegState*)m_state)->jerr;
JSAMPARRAY buffer = 0;
if( setjmp( jerr->setjmp_buffer ) == 0 )