gthumb r2189 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Tue Jan 15 16:37:55 2008
New Revision: 2189
URL: http://svn.gnome.org/viewvc/gthumb?rev=2189&view=rev

Log:
2008-01-15  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/file-utils.c: (gth_pixbuf_new_from_file):
        Remove reference to get_exif_tag_short (used in systems with
        gtk < 2.11.5).

        * src/dlg-jpegtran.c: Remove libexif #includes.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/file-utils.c
   trunk/src/dlg-jpegtran.c

Modified: trunk/libgthumb/file-utils.c
==============================================================================
--- trunk/libgthumb/file-utils.c	(original)
+++ trunk/libgthumb/file-utils.c	Tue Jan 15 16:37:55 2008
@@ -3414,18 +3414,15 @@
         rotated = gdk_pixbuf_apply_embedded_orientation (pixbuf);      	
         debug (DEBUG_INFO, "Applying orientation using gtk function.\n\r");
 #else
-	/* The old way, using libexif - delete this once gtk 2.12 is widely used */
+	/* The old way - delete this once gtk 2.12 is widely used */
 	if (mime_type_is (file->mime_type, "image/jpeg")) {
-		char         *uri;
-		ExifShort     orientation;
+		GthTransform  orientation;
 		GthTransform  transform = GTH_TRANSFORM_NONE;
 		
-		uri = get_uri_from_local_path (local_file);
-		orientation = get_exif_tag_short (uri, EXIF_TAG_ORIENTATION);
+		orientation = read_orientation_field (local_file);
 		transform = (orientation >= 1 && orientation <= 8 ? orientation : GTH_TRANSFORM_NONE);
-		g_free (uri);
 		
-		debug (DEBUG_INFO, "libexif says orientation is %d, transform needed is %d.\n\r", orientation, transform);
+		debug (DEBUG_INFO, "read_orientation_field says orientation is %d, transform needed is %d.\n\r", orientation, transform);
 		rotated = _gdk_pixbuf_transform (pixbuf, transform);
 	}
 #endif	

Modified: trunk/src/dlg-jpegtran.c
==============================================================================
--- trunk/src/dlg-jpegtran.c	(original)
+++ trunk/src/dlg-jpegtran.c	Tue Jan 15 16:37:55 2008
@@ -33,10 +33,6 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <glade/glade.h>
 
-#include <libexif/exif-data.h>
-#include <libexif/exif-content.h>
-#include <libexif/exif-entry.h>
-#include <libexif/exif-utils.h>
 #include "jpegutils/jpeg-data.h"
 
 #include "file-utils.h"