gthumb r2321 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Thu Apr 24 13:14:03 2008
New Revision: 2321
URL: http://svn.gnome.org/viewvc/gthumb?rev=2321&view=rev

Log:
2008-04-24  Michael J. Chudobiak  <mjc svn gnome org>

        * src/catalog-png-exporter.c: (comp_func_exif_date),
        (image_loader_done):
        * src/catalog-web-exporter.c: (comp_func_exif_date):
        Make exif date sorting consistent with the other parts of gthumb.

        * src/dlg-png-exporter.c:
        * src/dlg-rename-series.c:
        * src/dlg-web-exporter.c:
        Fixed bug 512374 - array accessed past end. Patch by
        John Bryant (bryant sover net).



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/catalog-png-exporter.c
   trunk/src/catalog-web-exporter.c
   trunk/src/dlg-png-exporter.c
   trunk/src/dlg-rename-series.c
   trunk/src/dlg-web-exporter.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Apr 24 13:14:03 2008
@@ -68,6 +68,7 @@
 	* Fixed bug #510521 - Canceling Save stops movement between pictures
 	* Fixed bug #477285 - Hitting enter in Open Location Dialog while 
 	  text entry is focused does nothing
+	* Fixed bug #512374 - array accessed past end.
 
 version 2.10.8
 --------------

Modified: trunk/src/catalog-png-exporter.c
==============================================================================
--- trunk/src/catalog-png-exporter.c	(original)
+++ trunk/src/catalog-png-exporter.c	Thu Apr 24 13:14:03 2008
@@ -42,7 +42,6 @@
 #include "glib-utils.h"
 #include "main.h"
 #include "gth-sort-utils.h"
-#include "gth-exif-utils.h"
 
 
 static void begin_export       (CatalogPngExporter *ce);
@@ -135,7 +134,6 @@
 typedef struct {
 	FileData         *file;
 	char             *comment;
-	time_t		  exif_time;
 	GdkPixbuf        *thumb;
 	int               image_width;
 	int               image_height;
@@ -1328,8 +1326,7 @@
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_filetime_then_name (data_a->exif_time, data_b->exif_time,
-						data_a->file->path, data_b->file->path);
+	return gth_sort_by_exiftime_then_name (data_a->file, data_b->file);
 }
 
 
@@ -1449,10 +1446,6 @@
 	idata->image_width = gdk_pixbuf_get_width (pixbuf);
 	idata->image_height = gdk_pixbuf_get_height (pixbuf);
 
-	/* time in exif tag, if present */
-
-	idata->exif_time = get_exif_time (idata->file);
-
 	/* thumbnail. */
 	idata->thumb = pixbuf = image_loader_get_pixbuf (iloader);
 	g_object_ref (idata->thumb);

Modified: trunk/src/catalog-web-exporter.c
==============================================================================
--- trunk/src/catalog-web-exporter.c	(original)
+++ trunk/src/catalog-web-exporter.c	Thu Apr 24 13:14:03 2008
@@ -726,8 +726,7 @@
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_filetime_then_name (data_a->src_file->exif_time, data_b->src_file->exif_time,
-					       data_a->src_file->path, data_b->src_file->path);
+	return gth_sort_by_exiftime_then_name (data_a->src_file, data_b->src_file);
 }
 
 

Modified: trunk/src/dlg-png-exporter.c
==============================================================================
--- trunk/src/dlg-png-exporter.c	(original)
+++ trunk/src/dlg-png-exporter.c	Thu Apr 24 13:14:03 2008
@@ -56,7 +56,7 @@
 #define DEF_PAGE_HEIGHT     400
 #define DEF_THUMB_SIZE      128
 
-static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5 };
+static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5, 6 };
 static GthSortMethod idx_to_sort_method[] = { GTH_SORT_METHOD_BY_NAME,
 					      GTH_SORT_METHOD_BY_PATH,
 					      GTH_SORT_METHOD_BY_SIZE,

Modified: trunk/src/dlg-rename-series.c
==============================================================================
--- trunk/src/dlg-rename-series.c	(original)
+++ trunk/src/dlg-rename-series.c	Thu Apr 24 13:14:03 2008
@@ -46,7 +46,7 @@
 	RS_NUM_COLUMNS
 };
 
-static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5 };
+static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5, 6 };
 static GthSortMethod idx_to_sort_method[] = { GTH_SORT_METHOD_BY_NAME,
                                               GTH_SORT_METHOD_BY_PATH,
                                               GTH_SORT_METHOD_BY_SIZE,

Modified: trunk/src/dlg-web-exporter.c
==============================================================================
--- trunk/src/dlg-web-exporter.c	(original)
+++ trunk/src/dlg-web-exporter.c	Thu Apr 24 13:14:03 2008
@@ -47,7 +47,7 @@
 #include "gth-utils.h"
 #include "glib-utils.h"
 
-static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5 };
+static int           sort_method_to_idx[] = { -1, 0, 1, 2, 3, 4, 5, 6 };
 static GthSortMethod idx_to_sort_method[] = { GTH_SORT_METHOD_BY_NAME,
 					      GTH_SORT_METHOD_BY_PATH,
 					      GTH_SORT_METHOD_BY_SIZE,