libexif: 64-bit compile issues Change-Id: I15df565b96f3e3d7e39ac9f6ce1e9738b5404bc7
diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c index eb53598..acf88ab 100644 --- a/libexif/canon/exif-mnote-data-canon.c +++ b/libexif/canon/exif-mnote-data-canon.c
@@ -267,7 +267,7 @@ if ((dataofs + s < s) || (dataofs + s < dataofs) || (dataofs + s > buf_size)) { exif_log (ne->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteCanon", - "Tag data past end of buffer (%u > %u)", + "Tag data past end of buffer (%zu > %u)", dataofs + s, buf_size); continue; }
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c index 54a90a2..0f72865 100644 --- a/libexif/exif-entry.c +++ b/libexif/exif-entry.c
@@ -989,7 +989,7 @@ int editor_ofs = tagdata - e->data; int remaining = e->size - editor_ofs; if (match_repeated_char(tagdata, ' ', remaining)) { - strncat (val, (const char*)tagdata, MIN (maxlen - strlen (val), remaining)); + strncat (val, (const char*)tagdata, MIN (maxlen - strlen (val), (size_t)remaining)); ++k; } }
diff --git a/libexif/fuji/exif-mnote-data-fuji.c b/libexif/fuji/exif-mnote-data-fuji.c index 9514654..a9949e1 100644 --- a/libexif/fuji/exif-mnote-data-fuji.c +++ b/libexif/fuji/exif-mnote-data-fuji.c
@@ -225,7 +225,7 @@ (dataofs + s >= buf_size)) { exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteDataFuji", "Tag data past end of " - "buffer (%u >= %u)", dataofs + s, buf_size); + "buffer (%zu >= %u)", dataofs + s, buf_size); continue; }
diff --git a/libexif/olympus/exif-mnote-data-olympus.c b/libexif/olympus/exif-mnote-data-olympus.c index 099671d..f4ccbb0 100644 --- a/libexif/olympus/exif-mnote-data-olympus.c +++ b/libexif/olympus/exif-mnote-data-olympus.c
@@ -482,7 +482,7 @@ (dataofs + s > buf_size)) { exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus", - "Tag data past end of buffer (%u > %u)", + "Tag data past end of buffer (%zu > %u)", dataofs + s, buf_size); continue; }
diff --git a/libexif/pentax/exif-mnote-data-pentax.c b/libexif/pentax/exif-mnote-data-pentax.c index 757bb72..38fbf64 100644 --- a/libexif/pentax/exif-mnote-data-pentax.c +++ b/libexif/pentax/exif-mnote-data-pentax.c
@@ -308,7 +308,7 @@ (dataofs + s > buf_size)) { exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataPentax", "Tag data past end " - "of buffer (%u > %u)", dataofs + s, buf_size); + "of buffer (%zu > %u)", dataofs + s, buf_size); continue; }