Move open_archive() to separate module

[geeqie.git] / src / format-raw.h

diff --git a/src/format-raw.h b/src/format-raw.h
index a1300bc..b866b87 100644 (file)
--- a/src/format-raw.h
+++ b/src/format-raw.h
@@ -25,43 +25,39 @@
 #include "exif-int.h"
 
 
-typedef enum {
+enum FormatRawMatchType {
        FORMAT_RAW_MATCH_MAGIC,
        FORMAT_RAW_MATCH_TIFF_MAKE
-} FormatRawMatchType;
+};
 
-typedef enum {
+enum FormatRawExifType {
        FORMAT_RAW_EXIF_NONE,
        FORMAT_RAW_EXIF_TIFF,
        FORMAT_RAW_EXIF_JPEG,
        FORMAT_RAW_EXIF_IFD_II,
        FORMAT_RAW_EXIF_IFD_MM,
        FORMAT_RAW_EXIF_PROPRIETARY
-} FormatRawExifType;
+};
 
-typedef gboolean (* FormatRawParseFunc)(guchar *data, const guint len,
-                                       guint *image_offset, guint *exif_offset);
-
-typedef gboolean (* FormatRawExifParseFunc)(guchar *data, const guint len,
-                                           ExifData *exif);
+using FormatRawParseFunc = gboolean (*)(guchar *, const guint, guint *, guint *);
+using FormatRawExifParseFunc = gboolean (*)(guchar *, const guint, ExifData *);
 
-gboolean format_raw_img_exif_offsets(guchar *data, const guint len,
+gboolean format_raw_img_exif_offsets(guchar *data, guint len,
                                     guint *image_offset, guint *exif_offset);
 gboolean format_raw_img_exif_offsets_fd(gint fd, const gchar *path,
-                                       guchar *header_data, const guint header_len,
+                                       guchar *header_data, guint header_len,
                                        guint *image_offset, guint *exif_offset);
 
-FormatRawExifType format_raw_exif_offset(guchar *data, const guint len, guint *exif_offset,
+FormatRawExifType format_raw_exif_offset(guchar *data, guint len, guint *exif_offset,
                                         FormatRawExifParseFunc *exif_parse_func);
 
 
-typedef enum {
+enum FormatExifMatchType {
        FORMAT_EXIF_MATCH_MAKE,
        FORMAT_EXIF_MATCH_MAKERNOTE
-} FormatExifMatchType;
+};
 
-typedef gint (* FormatExifParseFunc)(ExifData *exif, guchar *tiff, guint offset,
-                                    guint size, ExifByteOrder bo);
+using FormatExifParseFunc = gint (*)(ExifData *, guchar *, guint, guint, ExifByteOrder);
 
 gboolean format_exif_makernote_parse(ExifData *exif, guchar *tiff, guint offset,
                                     guint size, ExifByteOrder bo);