Merge pull request #80 from knnniggett/corruptjpeg

Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-20 06:24:20 -07:00 · 2013-08-20 06:24:20 -07:00 · 35c36bd769
parent de9b1af1a1 860c331d58
commit 35c36bd769
1 changed files with 2 additions and 1 deletions
--- a/src/zm_jpeg.cpp
+++ b/src/zm_jpeg.cpp
@ -59,7 +59,8 @@ void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level )
 		 */
 		if ( zmerr->pub.num_warnings == 0 || zmerr->pub.trace_level >= 3 )
 		{
-			(zmerr->pub.format_message)( cinfo, buffer ); 
+			(zmerr->pub.format_message)( cinfo, buffer );
+			if (!strstr(buffer, "Corrupt JPEG data:")) 
 			Warning( "%s", buffer );
 		}
 		/* Always count warnings in num_warnings. */