eog r5101 - in branches/gnome-2-26: . src

[friemann svn gnome org]

Author: friemann
Date: Fri Apr 10 19:51:03 2009
New Revision: 5101
URL: http://svn.gnome.org/viewvc/eog?rev=5101&view=rev

Log:
2009-04-10  Felix Riemann  <friemann svn gnome org>

	* src/eog-image-private.h:
	* src/eog-metadata-reader-jpg.c:
	* src/eog-metadata-reader-png.c:
	Reorder private structure members to better avoid padding holes
	on 64bit machines. e.g. sizeof(EogImagePrivate) went down from
	208 Bytes to 184 Bytes. No change for 32bit machines though.


Modified:
   branches/gnome-2-26/ChangeLog
   branches/gnome-2-26/src/eog-image-private.h
   branches/gnome-2-26/src/eog-metadata-reader-jpg.c
   branches/gnome-2-26/src/eog-metadata-reader-png.c

Modified: branches/gnome-2-26/src/eog-image-private.h
==============================================================================
--- branches/gnome-2-26/src/eog-image-private.h	(original)
+++ branches/gnome-2-26/src/eog-image-private.h	Fri Apr 10 19:51:03 2009
@@ -45,13 +45,15 @@
 	gboolean          threadsafe_format;
 
 	/* Holds EXIF raw data */
-	guchar           *exif_chunk;
 	guint             exif_chunk_len;
+	guchar           *exif_chunk;
 
 	/* Holds IPTC raw data */
 	guchar           *iptc_chunk;
 	guint             iptc_chunk_len;
 
+	gboolean          modified;
+
 #ifdef HAVE_EXIF
 	gboolean          autorotate;
 	gint              orientation;
@@ -65,8 +67,6 @@
 	cmsHPROFILE       profile;
 #endif
 
-	gboolean          modified;
-
 	gchar            *caption;
 
 	gchar            *collate_key;
@@ -74,13 +74,12 @@
 	GMutex           *status_mutex;
 
 	gboolean          cancel_loading;
+	guint             data_ref_count;
 
 	GSList           *undo_stack;
 
 	EogTransform     *trans;
 	EogTransform     *trans_autorotate;
-
-	guint             data_ref_count;
 };
 
 G_END_DECLS

Modified: branches/gnome-2-26/src/eog-metadata-reader-jpg.c
==============================================================================
--- branches/gnome-2-26/src/eog-metadata-reader-jpg.c	(original)
+++ branches/gnome-2-26/src/eog-metadata-reader-jpg.c	Fri Apr 10 19:51:03 2009
@@ -68,14 +68,14 @@
 	EogMetadataReaderState  state;
 
 	/* data fields */
-	gpointer exif_chunk;
 	guint    exif_len;
+	gpointer exif_chunk;
 
 	gpointer iptc_chunk;
 	guint	 iptc_len;
 
-	gpointer icc_chunk;
 	guint icc_len;
+	gpointer icc_chunk;
 
 	gpointer xmp_chunk;
 	guint xmp_len;

Modified: branches/gnome-2-26/src/eog-metadata-reader-png.c
==============================================================================
--- branches/gnome-2-26/src/eog-metadata-reader-png.c	(original)
+++ branches/gnome-2-26/src/eog-metadata-reader-png.c	Fri Apr 10 19:51:03 2009
@@ -59,20 +59,20 @@
 	EogMetadataReaderPngState  state;
 
 	/* data fields */
-	gpointer icc_chunk;
 	guint32  icc_len;
+	gpointer icc_chunk;
 
 	gpointer xmp_chunk;
 	guint32  xmp_len;
 
-	gpointer sRGB_chunk;
 	guint32	 sRGB_len;
+	gpointer sRGB_chunk;
 
 	gpointer cHRM_chunk;
 	guint32	 cHRM_len;
 
-	gpointer gAMA_chunk;
 	guint32	 gAMA_len;
+	gpointer gAMA_chunk;
 
 	/* management fields */
 	gsize      size;