Include a Other Software section in Help file

[geeqie.git] / src / format_olympus.c

diff --git a/src/format_olympus.c b/src/format_olympus.c
index 46b76f3..305699f 100644 (file)
--- a/src/format_olympus.c
+++ b/src/format_olympus.c
@@ -1,16 +1,27 @@
 /*
- *  GQView
- *  (C) 2005 John Ellis
+ * Copyright (C) 2005 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#ifndef HAVE_EXIV2
 
 #include <stdio.h>
 #include <string.h>
@@ -20,6 +31,7 @@
 
 #include "intl.h"
 
+#include "main.h"
 #include "format_olympus.h"
 #include "format_raw.h"
 
@@ -32,12 +44,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)
 {
@@ -78,7 +90,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)
 {
@@ -102,8 +114,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;
@@ -202,14 +214,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 },
@@ -291,10 +295,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;
@@ -379,3 +383,6 @@ gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,
 }
 
 
+#endif
+/* not HAVE_EXIV2 */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */