compilation fixes
authorVladimir Nadvornik <nadvornik@suse.cz>
Mon, 27 Apr 2009 21:39:56 +0000 (21:39 +0000)
committerVladimir Nadvornik <nadvornik@suse.cz>
Mon, 27 Apr 2009 21:39:56 +0000 (21:39 +0000)
src/exif.c
src/exiv2.cc

index fdb099a..7db7842 100644 (file)
@@ -1606,7 +1606,7 @@ GList *exif_get_metadata(ExifData *exif, const gchar *key, MetadataFormat format
        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)
                {
index 093bbf4..ff85b78 100644 (file)
@@ -982,12 +982,12 @@ static GList *exif_add_value_to_glist(GList *list, Exiv2::Metadatum &item, Metad
 #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();