gthumb r2240 - in trunk: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Thu Jan 31 19:46:11 2008
New Revision: 2240
URL: http://svn.gnome.org/viewvc/gthumb?rev=2240&view=rev

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

        * libgthumb/gth-exif-utils.c:
        * libgthumb/gth-exif-utils.h:
        Removed all remaining libexif references in gth-exif-utils.*
        Still present in other files, however.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/gth-exif-utils.c
   trunk/libgthumb/gth-exif-utils.h

Modified: trunk/libgthumb/gth-exif-utils.c
==============================================================================
--- trunk/libgthumb/gth-exif-utils.c	(original)
+++ trunk/libgthumb/gth-exif-utils.c	Thu Jan 31 19:46:11 2008
@@ -122,23 +122,6 @@
 };
 
 
-ExifData *
-gth_exif_data_new_from_uri (const char *uri)
-{
-        char     *local_file = NULL;
-	ExifData *new_exif_data;
-
-	if (uri == NULL)
-		return NULL;
-
-	local_file = get_cache_filename_from_uri (uri);
-	new_exif_data = exif_data_new_from_file (local_file);
-	g_free (local_file);
-
-	return new_exif_data;
-}
-
-
 time_t
 exif_string_to_time_t (char *string) 
 {
@@ -277,28 +260,6 @@
 
 
 void 
-save_exif_data_to_uri (const char *uri,
-		       ExifData   *edata)
-{
-	char      *local_file = NULL;
-	JPEGData  *jdata;
-
-	local_file = get_cache_filename_from_uri (uri);
-	jdata = jpeg_data_new_from_file (local_file);
-	if (jdata == NULL) 
-		return;
-
-	if (edata != NULL)
-		jpeg_data_set_exif_data (jdata, edata);
-
-	jpeg_data_save_file (jdata, local_file);
-	jpeg_data_unref (jdata);
-
-        g_free (local_file);
-}
-
-
-void 
 update_and_save_metadata (const char *uri_src,
 			  const char *uri_dest,
 			  const char *tag_name,

Modified: trunk/libgthumb/gth-exif-utils.h
==============================================================================
--- trunk/libgthumb/gth-exif-utils.h	(original)
+++ trunk/libgthumb/gth-exif-utils.h	Thu Jan 31 19:46:11 2008
@@ -25,26 +25,9 @@
 
 
 #include <config.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 "typedefs.h"
 #include "file-data.h"
 
-// Return values from gth_minimal_exif_tag_writes() 
-#define PATCH_EXIF_OK               0
-#define PATCH_EXIF_TOO_MANY_IFDS    1
-#define PATCH_EXIF_TOO_FEW_IFDS     2
-#define PATCH_EXIF_FILE_ERROR       3
-#define PATCH_EXIF_NO_TIFF          4
-#define PATCH_EXIF_NO_TAGS          5
-#define PATCH_EXIF_UNSUPPORTED_TYPE 6
-#define PATCH_EXIF_TRASHED_IFD      7
-#define PATCH_EXIF_TAGVAL_OVERFLOW  8
-
 
 typedef enum { 
         GTH_METADATA_CATEGORY_FILE = 0, 
@@ -92,15 +75,12 @@
 };
 
 
-ExifData     *gth_exif_data_new_from_uri  (const char   *path);
 time_t        get_metadata_time_from_fd   (FileData     *fd);
 time_t        get_metadata_time           (const char   *mime_type,
 					   const char   *uri,
 					   GList        *md);
 char *	      get_metadata_string_from_fd (FileData	*fd,
 					   const char   *tagnames[]);
-void          save_exif_data_to_uri       (const char   *filename,
-				           ExifData     *edata);
 void          update_and_save_metadata    (const char   *uri_src,
                                            const char   *uri_dest,
                                            const char   *tag_name,