changeset 1572:df4e69170f2b

compilation fixes
author nadvornik
date Mon, 27 Apr 2009 21:39:56 +0000
parents 282ebf388bb1
children 007d54b763cd
files src/exif.c src/exiv2.cc
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/exif.c	Mon Apr 27 20:19:21 2009 +0000
+++ b/src/exif.c	Mon Apr 27 21:39:56 2009 +0000
@@ -1606,7 +1606,7 @@
 	if (!key) return NULL;
 	
 	/* convert xmp key to exif key */
-	if (strcmp(key, ORIENTATION_KEY) == 0) key = "Exif.Image.Orientation";
+	if (strcmp(key, "Xmp.tiff.Orientation") == 0) key = "Exif.Image.Orientation";
 	
 	if (format == METADATA_FORMATTED)
 		{
--- a/src/exiv2.cc	Mon Apr 27 20:19:21 2009 +0000
+++ b/src/exiv2.cc	Mon Apr 27 21:39:56 2009 +0000
@@ -982,12 +982,12 @@
 #if EXIV2_TEST_VERSION(0,16,0)
 			Exiv2::Xmpdatum *xmpdatum;
 #endif
-			if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(metadatum)))
+			if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(&item)))
 				stream << *exifdatum;
-			else if ((iptcdatum = dynamic_cast<Exiv2::Iptcdatum *>(metadatum)))
+			else if ((iptcdatum = dynamic_cast<Exiv2::Iptcdatum *>(&item)))
 				stream << *iptcdatum;
 #if EXIV2_TEST_VERSION(0,16,0)
-			else if ((xmpdatum = dynamic_cast<Exiv2::Xmpdatum *>(metadatum)))
+			else if ((xmpdatum = dynamic_cast<Exiv2::Xmpdatum *>(&item)))
 				stream << *xmpdatum;
 #endif
 			str = stream.str();