eog r4799 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Thu Sep 25 16:10:56 2008
New Revision: 4799
URL: http://svn.gnome.org/viewvc/eog?rev=4799&view=rev

Log:
2008-09-25  Felix Riemann  <friemann svn gnome org>

	* src/eog-metadata-reader-jpg.c: (eog_metadata_reader_jpg_consume):
	Don't let a JPEG comment interrupt the parsing.


Modified:
   trunk/ChangeLog
   trunk/src/eog-metadata-reader-jpg.c

Modified: trunk/src/eog-metadata-reader-jpg.c
==============================================================================
--- trunk/src/eog-metadata-reader-jpg.c	(original)
+++ trunk/src/eog-metadata-reader-jpg.c	Thu Sep 25 16:10:56 2008
@@ -230,13 +230,14 @@
 			break;
 
 		case EMR_READ_MARKER:
-			if ((buf [i] & 0xF0) == 0xE0) { /* we are reading some sort of APPxx marker */
+			if ((buf [i] & 0xF0) == 0xE0 || buf[i] == 0xFE) {
+			/* we are reading some sort of APPxx or COM marker */
 				/* these are always followed by 2 bytes of size information */
 				priv->last_marker = buf [i];
 				priv->size = 0;
 				priv->state = EMR_READ_SIZE_HIGH_BYTE;
 
-				eog_debug_message (DEBUG_IMAGE_DATA, "APPx Marker Found: %x", priv->last_marker);
+				eog_debug_message (DEBUG_IMAGE_DATA, "APPx or COM Marker Found: %x", priv->last_marker);
 			}
 			else {
 				/* otherwise simply consume the byte */