Mercurial > geeqie.yaz

changeset 179:37004d5a584a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
and first version that actually shows some exif data (see advanced view)
author nadvornik
date Wed, 13 Feb 2008 17:08:04 +0000
parents 9dc8bc9b2bb9
children e6c8cf017d68
files src/bar_exif.c src/exiv2.cc
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/bar_exif.c	Wed Feb 13 16:52:41 2008 +0000
+++ b/src/bar_exif.c	Wed Feb 13 17:08:04 2008 +0000
@@ -28,7 +28,7 @@
 #define BAR_EXIF_DATA_COLUMN_WIDTH 250
 
 static const gchar *bar_exif_key_list_real[] = {
-	"fCamera",
+	"Exif.Image.Model" /*,
 	"fDateTime",
 	"fShutterSpeed",
 	"fAperture",
@@ -43,7 +43,7 @@
 	"fResolution",
 	"Orientation",
 	"ImageDescription",
-	"Copyright"
+	"Copyright" */
 };
 
 const gchar **bar_exif_key_list = bar_exif_key_list_real;
--- a/src/exiv2.cc	Wed Feb 13 16:52:41 2008 +0000
+++ b/src/exiv2.cc	Wed Feb 13 17:08:04 2008 +0000
@@ -31,10 +31,13 @@
 		g_assert (image.get() != 0);
 		image->readMetadata();
 		exif->exifData = image->exifData();
+		return exif;
 	}
 	catch (Exiv2::AnyError& e) {
 		std::cout << "Caught Exiv2 exception '" << e << "'\n";
+		return 0;
 	}
+	
 }
 
 void exif_free(ExifData *exif)