Remove commented out code.

[geeqie.git] / src / format_olympus.c

diff --git a/src/format_olympus.c b/src/format_olympus.c
index 0ddd6d3..e943ada 100644 (file)
--- a/src/format_olympus.c
+++ b/src/format_olympus.c
@@ -1,7 +1,7 @@
 /*
- *  GQView
- *  (C) 2005 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Geeqie
+ * (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.
@@ -35,12 +35,12 @@
  *-----------------------------------------------------------------------------
  */
 
-static guint olympus_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static guint olympus_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                                gint level,
                                guint *image_offset, guint *exif_offset);
 
 
-static void olympus_tiff_entry(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static void olympus_tiff_entry(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                               gint level,
                               guint *image_offset, guint *exif_offset)
 {
@@ -81,7 +81,7 @@ static void olympus_tiff_entry(unsigned char *data, const guint len, guint offse
                }
 }
 
-static guint olympus_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo,
+static guint olympus_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
                                gint level,
                                guint *image_offset, guint *exif_offset)
 {
@@ -105,8 +105,8 @@ static guint olympus_tiff_table(unsigned char *data, const guint len, guint offs
        return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo);
 }
 
-gint format_olympus_raw(unsigned char *data, const guint len,
-                       guint *image_offset, guint *exif_offset)
+gboolean format_olympus_raw(guchar *data, const guint len,
+                           guint *image_offset, guint *exif_offset)
 {
        guint i_off = 0;
        guint e_off = 0;
@@ -205,14 +205,6 @@ static ExifTextList OlympusTagContrast[]= {
        EXIF_TEXT_LIST_END
 };
 
-#if 0
-static ExifTextList OlympusTag[]= {
-       { ,     "" },
-       { ,     "" },
-       EXIF_TEXT_LIST_END
-};
-#endif
-
 
 static ExifMarker OlympusExifMarkersList[] = {
 { 0x0001, EXIF_FORMAT_LONG_UNSIGNED, -1, "Konica/MinoltaSettings", "Konica / Minolta settings", NULL },
@@ -294,10 +286,10 @@ static ExifTextList OlympusWBColorTemp[]= {
        EXIF_TEXT_LIST_END
 };
 
-gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,
-                             guint size, ExifByteOrder bo)
+gboolean format_olympus_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;
@@ -384,3 +376,4 @@ gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,
 
 #endif
 /* not HAVE_EXIV2 */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */