Include a Other Software section in Help file

[geeqie.git] / src / format_olympus.h

diff --git a/src/format_olympus.h b/src/format_olympus.h
index 7dac58c..0474a6f 100644 (file)
--- a/src/format_olympus.h
+++ b/src/format_olympus.h
@@ -1,32 +1,41 @@
 /*
- *  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.
  */
 
 #ifndef __FORMAT_OLYMPUS_H
 #define __FORMAT_OLYMPUS_H
 
 
-#include "exif.h"
+#include "exif-int.h"
 
 
-#if 0
-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);
 
 
 #define FORMAT_RAW_OLYMPUS { "orf", \
-                            FORMAT_RAW_MATCH_MAGIC, 0, "IIRS", 4, \
+                            FORMAT_RAW_MATCH_MAGIC, 0, "IIR", 3, \
+                            FORMAT_RAW_EXIF_IFD_II, NULL, \
                             "Olympus raw", format_olympus_raw }
-#endif
 
 
-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);
 
 #define FORMAT_EXIF_OLYMPUS { FORMAT_EXIF_MATCH_MAKERNOTE, "OLYMP\x00\x01", 7, \
                              "Olympus", format_olympus_makernote }, \
@@ -35,4 +44,4 @@ gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset,
 
 
 #endif
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */