gthumb r2174 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Thu Jan 10 19:23:09 2008
New Revision: 2174
URL: http://svn.gnome.org/viewvc/gthumb?rev=2174&view=rev

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

        * libgthumb/gth-exif-utils.c: (gth_read_xmp):
        * libgthumb/gth-exif-utils.h:
        * libgthumb/gth-exiv2-utils.cpp:
        * src/gth-exif-data-viewer.c:
        Don't use exempi to read embedded XMP metadata if exiv2 is installed.
        Minor categorization changes.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/gth-exif-utils.c
   trunk/libgthumb/gth-exif-utils.h
   trunk/libgthumb/gth-exiv2-utils.cpp
   trunk/src/gth-exif-data-viewer.c

Modified: trunk/libgthumb/gth-exif-utils.c
==============================================================================
--- trunk/libgthumb/gth-exif-utils.c	(original)
+++ trunk/libgthumb/gth-exif-utils.c	Thu Jan 10 19:23:09 2008
@@ -964,10 +964,12 @@
 
 	xmp_init ();
 
+#ifndef HAVE_EXIV2	
 	/* embedded xmp data */	
 	metadata = read_xmp_file (uri, 
 				  metadata, 
 				  GTH_METADATA_CATEGORY_XMP_EMBEDDED);
+#endif
 
 	/* Check for sidecar (foo.jpg <-> foo.xmp) */
 	uri_wo_ext = remove_extension_from_path (uri);

Modified: trunk/libgthumb/gth-exif-utils.h
==============================================================================
--- trunk/libgthumb/gth-exif-utils.h	(original)
+++ trunk/libgthumb/gth-exif-utils.h	Thu Jan 10 19:23:09 2008
@@ -55,7 +55,6 @@
         GTH_METADATA_CATEGORY_EXIF_THUMBNAIL, 
         GTH_METADATA_CATEGORY_VERSIONS, 
 	GTH_METADATA_CATEGORY_IPTC,
-	GTH_METADATA_CATEGORY_EXIV2_XMP,
         GTH_METADATA_CATEGORY_XMP_EMBEDDED, 
 	GTH_METADATA_CATEGORY_XMP_SIDECAR,
 	GTH_METADATA_CATEGORY_EXIV2,

Modified: trunk/libgthumb/gth-exiv2-utils.cpp
==============================================================================
--- trunk/libgthumb/gth-exiv2-utils.cpp	(original)
+++ trunk/libgthumb/gth-exiv2-utils.cpp	Thu Jan 10 19:23:09 2008
@@ -120,7 +120,9 @@
 				stream << *i;
 				string value = stream.str();
 				//metadata = add(metadata, i->tagName().c_str(), i->toString().c_str(), cat);
-				metadata = add (metadata, i->key().c_str(), improve(value).c_str(), cat);
+				//disable "improve" untils it works :-)
+				//metadata = add (metadata, i->key().c_str(), improve(value).c_str(), cat);
+				metadata = add (metadata, i->key().c_str(), value.c_str(), cat);
 			}
 		}
 
@@ -151,7 +153,7 @@
 			Exiv2::XmpData::iterator end = xmpData.end();
 			for (Exiv2::XmpData::iterator md = xmpData.begin(); md != end; ++md) {
 				//determine metadata category
-				GthMetadataCategory cat = GTH_METADATA_CATEGORY_EXIV2_XMP;
+				GthMetadataCategory cat = GTH_METADATA_CATEGORY_XMP_EMBEDDED;
 				//fill entry
 				stringstream stream;
 				stream << *md;

Modified: trunk/src/gth-exif-data-viewer.c
==============================================================================
--- trunk/src/gth-exif-data-viewer.c	(original)
+++ trunk/src/gth-exif-data-viewer.c	Thu Jan 10 19:23:09 2008
@@ -58,7 +58,6 @@
         N_("Exif Thumbnail"),  
         N_("Exif Versions"),  
 	N_("IPTC"),
-	N_("Exiv2 XMP"),
         N_("XMP Embedded"),  
 	N_("XMP Sidecar"),
 	N_("Exiv2 Experimental"),