diff src/image-overlay.c @ 1238:947e603a52c6

simplified metadata interface, dropped metadata_read, fixes for older exiv2 versions
author nadvornik
date Sat, 10 Jan 2009 20:40:37 +0000
parents bb02d0e2a573
children 8b89e3ff286b
line wrap: on
line diff
--- a/src/image-overlay.c	Sun Jan 04 17:14:34 2009 +0000
+++ b/src/image-overlay.c	Sat Jan 10 20:40:37 2009 +0000
@@ -178,7 +178,9 @@
 
 	g_assert(fd);
 
-	if (metadata_read(fd, &keywords, NULL))
+	keywords = metadata_read_list(fd, KEYWORD_KEY);
+
+	if (keywords)
 		{
 		GList *work = keywords;
 
@@ -195,6 +197,7 @@
 			
 			g_string_append(kwstr, kw);
 			}
+		string_list_free(keywords);
 		}
 
 	if (kwstr)
@@ -275,7 +278,7 @@
 			}
 		else if (strcmp(name, "comment") == 0)
 			{
-			metadata_read(imd->image_fd, NULL, &data);
+			data = metadata_read_string(imd->image_fd, COMMENT_KEY);
 			}
 		else
 			{