Fix #1004, 1005: Various meson problems

[geeqie.git] / src / format_nikon.c

diff --git a/src/format_nikon.c b/src/format_nikon.c
index c55f66e..6de527d 100644 (file)
--- a/src/format_nikon.c
+++ b/src/format_nikon.c
@@ -19,9 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include <config.h>
 
 #ifndef HAVE_EXIV2
 
@@ -139,7 +137,7 @@ static guint nikon_tiff_table(guchar *data, const guint len, guint offset, ExifB
 }
 
 gboolean format_nikon_raw(guchar *data, const guint len,
-                         guint *image_offset, guint *exif_offset)
+                         guint *image_offset, guint *UNUSED(exif_offset))
 {
        guint i_off = 0;
        guint i_len = 0;
@@ -412,7 +410,7 @@ gboolean format_nikon_makernote(ExifData *exif, guchar *tiff, guint offset,
                ExifItem *shadow;
 
                shadow = exif_item_new(marker.format, marker.tag, 1, &marker);
-               memcpy(shadow->data, item->data + 2, 2);
+               memcpy(shadow->data, (char *)item->data + 2, 2);
 
                exif->items = g_list_prepend(exif->items, shadow);
                }
@@ -433,6 +431,8 @@ gboolean format_nikon_makernote(ExifData *exif, guchar *tiff, guint offset,
        return TRUE;
 }
 
+#else
+typedef int dummy_variable;
 #endif
 /* not HAVE_EXIV2 */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */