Remove commented out code.

[geeqie.git] / src / format_nikon.c

diff --git a/src/format_nikon.c b/src/format_nikon.c
index 5d6dedf..2b60ee5 100644 (file)
--- a/src/format_nikon.c
+++ b/src/format_nikon.c
@@ -1,6 +1,7 @@
 /*
- *  GQView
- *  (C) 2005 John Ellis
+ * Geeqie
+ * (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  *  Authors:
  *    Raw NEF jpeg extraction based on nefextract.c by Joseph Heled,
@@ -15,6 +16,7 @@
 #  include "config.h"
 #endif
 
+#ifndef HAVE_EXIV2
 
 #include <stdio.h>
 #include <string.h>
@@ -24,7 +26,7 @@
 
 #include "intl.h"
 
-#include "gqview.h"
+#include "main.h"
 #include "format_nikon.h"
 
 #include "exif.h"
@@ -36,12 +38,12 @@
  *-----------------------------------------------------------------------------
  */
 
-static guint nikon_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static guint nikon_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                              gint level,
                              guint *image_offset, guint *jpeg_len);
 
 
-static void nikon_tiff_entry(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static void nikon_tiff_entry(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                             gint level,
                             guint *image_offset, guint *image_length, guint *jpeg_start, guint *jpeg_len)
 {
@@ -72,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++)
                        {
@@ -95,7 +97,7 @@ static void nikon_tiff_entry(unsigned char *data, const guint len, guint offset,
                }
 }
 
-static guint nikon_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static guint nikon_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                              gint level,
                              guint *image_offset, guint *image_length)
 {
@@ -129,8 +131,8 @@ static guint nikon_tiff_table(unsigned char *data, const guint len, guint offset
        return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo);
 }
 
-gint format_nikon_raw(unsigned char *data, const guint len,
-                     guint *image_offset, guint *exif_offset)
+gboolean format_nikon_raw(guchar *data, const guint len,
+                         guint *image_offset, guint *exif_offset)
 {
        guint i_off = 0;
        guint i_len = 0;
@@ -219,14 +221,6 @@ static ExifTextList NikonTagConverter[]= {
        EXIF_TEXT_LIST_END
 };
 
-#if 0
-static ExifTextList NikonTag[]= {
-       { ,     "" },
-       { ,     "" },
-       EXIF_TEXT_LIST_END
-};
-#endif
-
 static ExifMarker NikonExifMarkersList1[] = {
 { 0x0002, EXIF_FORMAT_STRING, 6,               "Nikon.unknown",        NULL,           NULL },
 { 0x0003, EXIF_FORMAT_SHORT_UNSIGNED, 1,       "Nikon.Quality",        "Quality",      NikonTagQuality },
@@ -280,17 +274,6 @@ static ExifTextList NikonTag2FlashUsed[]= {
        EXIF_TEXT_LIST_END
 };
 
-#if 0
-static ExifTextList NikonTagi2Saturation[]= {
-       { -3,   "black and white" },
-       { -2,   "-2" },
-       { -1,   "-1" },
-       { 0,    "normal" },
-       { 1,    "+1" },
-       { 2,    "+2" },
-       EXIF_TEXT_LIST_END
-};
-#endif
 
 static ExifMarker NikonExifMarkersList2[] = {
 { 0x0002, EXIF_FORMAT_SHORT_UNSIGNED, 2,       "Nikon.ISOSpeed",       "ISO speed",    NULL },
@@ -353,10 +336,10 @@ static ExifTextList NikonAFPoint[]= {
 };
 
 
-gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
-                           guint size, ExifByteOrder bo)
+gboolean format_nikon_makernote(ExifData *exif, guchar *tiff, guint offset,
+                               guint size, ExifByteOrder bo)
 {
-       unsigned char *data;
+       guchar *data;
        ExifItem *item;
 
        if (offset + 8 + 4 >= size) return FALSE;
@@ -443,3 +426,6 @@ gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset,
        return TRUE;
 }
 
+#endif
+/* not HAVE_EXIV2 */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */