eog r4521 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Sun Apr  6 11:01:28 2008
New Revision: 4521
URL: http://svn.gnome.org/viewvc/eog?rev=4521&view=rev

Log:
2008-04-06  Felix Riemann  <friemann svn gnome org>

	* src/eog-metadata-reader-jpg.c:
	* src/eog-metadata-reader-png.c:
	Don't skip the XMP xpacket tag. Exempi seems to handle it just fine.
	Increases compatibility with non-standard xpackets. Fixes bug #526331.


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

Modified: trunk/src/eog-metadata-reader-jpg.c
==============================================================================
--- trunk/src/eog-metadata-reader-jpg.c	(original)
+++ trunk/src/eog-metadata-reader-jpg.c	Sun Apr  6 11:01:28 2008
@@ -465,8 +465,8 @@
 
 #ifdef HAVE_EXEMPI
 
-/* skip the ID + packet */
-#define EOG_XMP_OFFSET (29 + 54)
+/* skip the signature */
+#define EOG_XMP_OFFSET (29)
 
 static gpointer 
 eog_metadata_reader_jpg_get_xmp_data (EogMetadataReaderJpg *emr )

Modified: trunk/src/eog-metadata-reader-png.c
==============================================================================
--- trunk/src/eog-metadata-reader-png.c	(original)
+++ trunk/src/eog-metadata-reader-png.c	Sun Apr  6 11:01:28 2008
@@ -457,8 +457,8 @@
 
 #ifdef HAVE_EXEMPI
 
-/* skip the ID + packet */
-#define EOG_XMP_OFFSET (22 + 54)
+/* skip the chunk ID */
+#define EOG_XMP_OFFSET (22)
 
 static gpointer 
 eog_metadata_reader_png_get_xmp_data (EogMetadataReaderPng *emr )