changeset 749:f606e8962329

Silent few warnings that appeared when using --disable-exiv2 configure option.
author zas_
date Fri, 23 May 2008 23:18:40 +0000
parents 1758c34f13fe
children 5329797d8ff1
files src/exif.c src/format_nikon.c src/format_raw.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/exif.c	Fri May 23 22:57:51 2008 +0000
+++ b/src/exif.c	Fri May 23 23:18:40 2008 +0000
@@ -97,7 +97,7 @@
 	{ EXIF_FORMAT_RATIONAL,		8, "srational",	"signed rational" },
 	{ EXIF_FORMAT_FLOAT,		4, "float",	"float" },
 	{ EXIF_FORMAT_DOUBLE,		8, "double",	"double" },
-	{ -1, 0, NULL }
+	{ -1, 0, NULL, NULL }
 };
 
 /* tags that are special, or need special treatment */
@@ -619,7 +619,7 @@
 	i = 0;
 	while (!result && list[i].value >= 0)
 		{
-		if (value == list[i].value) result = g_strdup(_(list[i].description));
+		if (value == (guint) list[i].value) result = g_strdup(_(list[i].description));
 		i++;
 		}
 	if (!result) result = g_strdup_printf("%d (%s)", value, _("unknown"));
@@ -879,7 +879,7 @@
 
 	/* Where is the data, is it available?
 	 */
-	if (marker->components > 0 && marker->components != count)
+	if (marker->components > 0 && (guint) marker->components != count)
 		{
 		log_printf("warning: exif tag %s has %d elements, exif spec requests %d\n",
 			marker->key, count, marker->components);
--- a/src/format_nikon.c	Fri May 23 22:57:51 2008 +0000
+++ b/src/format_nikon.c	Fri May 23 23:18:40 2008 +0000
@@ -74,7 +74,7 @@
 	if (tag == 0x14a)
 		{
 		/* sub IFD table */
-		gint i;
+		guint i;
 
 		for (i = 0; i < count; i++)
 			{
--- a/src/format_raw.c	Fri May 23 22:57:51 2008 +0000
+++ b/src/format_raw.c	Fri May 23 23:18:40 2008 +0000
@@ -78,7 +78,7 @@
 	FORMAT_EXIF_FUJI,
 	FORMAT_EXIF_NIKON,
 	FORMAT_EXIF_OLYMPUS,
-	{ 0, NULL, 0, NULL }
+	{ 0, NULL, 0, NULL, NULL }
 };
 
 
@@ -363,7 +363,7 @@
 
 	if (success && image_offset)
 		{
-		if (lseek(fd, *image_offset, SEEK_SET) != *image_offset)
+		if (lseek(fd, *image_offset, SEEK_SET) != (off_t) *image_offset)
 			{
 			log_printf("Failed to seek to embedded image\n");