Commit1575d53

committed

Make sure all the lines of a JPEG are read

1 parent015b400 commit1575d53Copy full SHA for 1575d53

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -494,12 +494,13 @@ bool JpegDecoder::readData( Mat& img )`
`494`	`494`
`495`	`495`	`jpeg_start_decompress( cinfo );`
`496`	`496`
	`497`	`+int num_read_lines =0;`
`497`	`498`	`if( doDirectRead)`
`498`	`499`	`{`
`499`	`500`	`for(int iy =0 ; iy < m_height; iy ++ )`
`500`	`501`	`{`
`501`	`502`	`uchar* data = img.ptr<uchar>(iy);`
`502`		`-jpeg_read_scanlines( cinfo, &data,1 );`
	`503`	`+num_read_lines +=jpeg_read_scanlines( cinfo, &data,1 );`
`503`	`504`	`}`
`504`	`505`	`}`
`505`	`506`	`else`
`@@ -510,7 +511,7 @@ bool JpegDecoder::readData( Mat& img )`
`510`	`511`	`for(int iy =0 ; iy < m_height; iy ++ )`
`511`	`512`	`{`
`512`	`513`	`uchar* data = img.ptr<uchar>(iy);`
`513`		`-jpeg_read_scanlines( cinfo, buffer,1 );`
	`514`	`+num_read_lines +=jpeg_read_scanlines( cinfo, buffer,1 );`
`514`	`515`
`515`	`516`	`if( color )`
`516`	`517`	`{`
`@@ -539,7 +540,7 @@ bool JpegDecoder::readData( Mat& img )`
`539`	`540`	`}`
`540`	`541`	`}`
`541`	`542`
`542`		`- result =true;`
	`543`	`+ result =num_read_lines >= m_height;`
`543`	`544`	`jpeg_finish_decompress( cinfo );`
`544`	`545`	`}`
`545`	`546`	`}`

Comments

(0)