Silent few warnings that appeared when using --disable-exiv2 configure option.

diff --git a/src/exif.c b/src/exif.c
index 48b1425..dd58bb0 100644 (file)
--- a/src/exif.c
+++ b/src/exif.c
@@ -97,7 +97,7 @@ ExifFormatAttrib ExifFormatList[] = {
        { 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 @@ gchar *exif_text_list_find_value(ExifTextList *list, guint value)
        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 @@ static gint exif_parse_IFD_entry(ExifData *exif, unsigned char *tiff, guint offs
 
        /* 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);

diff --git a/src/format_nikon.c b/src/format_nikon.c
index bbfcb87..389bca0 100644 (file)
--- a/src/format_nikon.c
+++ b/src/format_nikon.c
@@ -74,7 +74,7 @@ static void nikon_tiff_entry(unsigned char *data, const guint len, guint offset,
        if (tag == 0x14a)
                {
                /* sub IFD table */
-               gint i;
+               guint i;
 
                for (i = 0; i < count; i++)
                        {

diff --git a/src/format_raw.c b/src/format_raw.c
index b2f73bf..dbf4b1a 100644 (file)
--- a/src/format_raw.c
+++ b/src/format_raw.c
@@ -78,7 +78,7 @@ static FormatExifEntry format_exif_list[] = {
        FORMAT_EXIF_FUJI,
        FORMAT_EXIF_NIKON,
        FORMAT_EXIF_OLYMPUS,
-       { 0, NULL, 0, NULL }
+       { 0, NULL, 0, NULL, NULL }
 };
 
 
@@ -363,7 +363,7 @@ gint format_raw_img_exif_offsets_fd(int fd, const gchar *path,
 
        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");