Author: abrander
Date: 2010-02-13 12:12:18 +0100 (Sat, 13 Feb 2010)
New Revision: 3203

Modified:
   trunk/librawstudio/rs-filetypes.c
   trunk/librawstudio/rs-filetypes.h
   trunk/plugins/load-dcraw/dcrawloader.c
   trunk/plugins/load-gdk/load-gdk.c
   trunk/plugins/load-rawspeed/rawstudio-plugin.c
   trunk/plugins/meta-ciff/ciff-meta.c
   trunk/plugins/meta-mrw/mrw-meta.c
   trunk/plugins/meta-raf/raf-meta.c
   trunk/plugins/meta-tiff/tiff-meta.c
   trunk/plugins/meta-x3f/x3f-meta.c
Log:
[336] Made loading of 8-bit images optional.

Modified: trunk/librawstudio/rs-filetypes.c
===================================================================
--- trunk/librawstudio/rs-filetypes.c   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/librawstudio/rs-filetypes.c   2010-02-13 11:12:18 UTC (rev 3203)
@@ -21,8 +21,8 @@
 #include "rs-metadata.h"
 
 static gint tree_sort(gconstpointer a, gconstpointer b);
-static gpointer filetype_search(GTree *tree, const gchar *filename, gint 
*priority);
-static void filetype_add_to_tree(GTree *tree, const gchar *extension, const 
gchar *description, const gpointer func, const gint priority);
+static gpointer filetype_search(GTree *tree, const gchar *filename, gint 
*priority, const RSLoaderFlags flags);
+static void filetype_add_to_tree(GTree *tree, const gchar *extension, const 
gchar *description, const gpointer func, const gint priority, const 
RSLoaderFlags flags);
 
 static gboolean rs_filetype_is_initialized = FALSE;
 static GStaticMutex lock = G_STATIC_MUTEX_INIT;
@@ -33,12 +33,14 @@
        gchar *extension;
        gchar *description;
        gint priority;
+       RSLoaderFlags flags;
 } RSFiletype;
 
 struct search_needle {
        gchar *extension;
        gint *priority;
        RSFileLoaderFunc *func;
+       RSLoaderFlags flags;
 };
 
 static gint
@@ -66,9 +68,12 @@
        {
                if (type->priority > *(needle->priority))
                {
-                       needle->func = func;
-                       *(needle->priority) = type->priority;
-                       return TRUE;
+                       if (type->flags & needle->flags)
+                       {
+                               needle->func = func;
+                               *(needle->priority) = type->priority;
+                               return TRUE;
+                       }
                }
        }
 
@@ -76,7 +81,7 @@
 }
 
 static gpointer
-filetype_search(GTree *tree, const gchar *filename, gint *priority)
+filetype_search(GTree *tree, const gchar *filename, gint *priority, const 
RSLoaderFlags flags)
 {
        gpointer func = NULL;
        const gchar *extension;
@@ -90,6 +95,7 @@
                needle.extension = g_utf8_strdown(extension, -1);
                needle.priority = priority;
                needle.func = NULL;
+               needle.flags = flags;
 
                g_static_mutex_lock(&lock);
                g_tree_foreach(tree, filetype_search_traverse, &needle);
@@ -103,7 +109,7 @@
 }
 
 static void
-filetype_add_to_tree(GTree *tree, const gchar *extension, const gchar 
*description, const gpointer func, const gint priority)
+filetype_add_to_tree(GTree *tree, const gchar *extension, const gchar 
*description, const gpointer func, const gint priority, const RSLoaderFlags 
flags)
 {
        RSFiletype *filetype = g_new(RSFiletype, 1);
 
@@ -118,6 +124,7 @@
        filetype->extension = g_strdup(extension);
        filetype->description = g_strdup(description);
        filetype->priority = priority;
+       filetype->flags = flags;
 
        g_static_mutex_lock(&lock);
        g_tree_insert(tree, filetype, func);
@@ -146,11 +153,12 @@
  * @param description A human readable description of the file-format/loader
  * @param loader The loader function
  * @param priority A loader priority, lowest is served first.
+ * @param flags Flags describing the loader
  */
 void
-rs_filetype_register_loader(const gchar *extension, const gchar *description, 
const RSFileLoaderFunc loader, const gint priority)
+rs_filetype_register_loader(const gchar *extension, const gchar *description, 
const RSFileLoaderFunc loader, const gint priority, const RSLoaderFlags flags)
 {
-       filetype_add_to_tree(loaders, extension, description, loader, priority);
+       filetype_add_to_tree(loaders, extension, description, loader, priority, 
flags);
 }
 
 /**
@@ -159,13 +167,17 @@
  * @param description A human readable description of the file-format/loader
  * @param meta_loader The loader function
  * @param priority A loader priority, lowest is served first.
+ * @param flags Flags describing the loader
  */
 void
-rs_filetype_register_meta_loader(const gchar *extension, const gchar 
*description, const RSFileMetaLoaderFunc meta_loader, const gint priority)
+rs_filetype_register_meta_loader(const gchar *extension, const gchar 
*description, const RSFileMetaLoaderFunc meta_loader, const gint priority, 
const RSLoaderFlags flags)
 {
-       filetype_add_to_tree(meta_loaders, extension, description, meta_loader, 
priority);
+       filetype_add_to_tree(meta_loaders, extension, description, meta_loader, 
priority, flags);
 }
 
+/* FIXME: Port conf abstraction to librawstudio */
+extern gboolean rs_conf_get_boolean(const gchar *name, gboolean 
*boolean_value);
+
 /**
  * Check if we support loading a given extension
  * @param filename A filename or extension to look-up
@@ -175,11 +187,17 @@
 {
        gboolean can_load = FALSE;
        gint priority = 0;
-       
+       RSLoaderFlags flags = RS_LOADER_FLAGS_RAW;
+       gboolean load_8bit = FALSE;
+
        g_assert(rs_filetype_is_initialized);
        g_assert(filename != NULL);
 
-       if (filetype_search(loaders, filename, &priority))
+       rs_conf_get_boolean("open_8bit_images", &load_8bit);
+       if (load_8bit)
+               flags |= RS_LOADER_FLAGS_8BIT;
+
+       if (filetype_search(loaders, filename, &priority, flags))
                can_load = TRUE;
 
        return can_load;
@@ -200,7 +218,7 @@
        g_assert(rs_filetype_is_initialized);
        g_assert(filename != NULL);
 
-       while((loader = filetype_search(loaders, filename, &priority)) && 
!image)
+       while((loader = filetype_search(loaders, filename, &priority, 
RS_LOADER_FLAGS_ALL)) && !image)
                image = loader(filename);
 
        return image;
@@ -223,6 +241,6 @@
        g_assert(service != NULL);
        g_assert(RS_IS_METADATA(meta));
 
-       if((loader = filetype_search(meta_loaders, service, &priority)))
+       if((loader = filetype_search(meta_loaders, service, &priority, 
RS_LOADER_FLAGS_ALL)))
                loader(service, rawfile, offset, meta);
 }

Modified: trunk/librawstudio/rs-filetypes.h
===================================================================
--- trunk/librawstudio/rs-filetypes.h   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/librawstudio/rs-filetypes.h   2010-02-13 11:12:18 UTC (rev 3203)
@@ -21,6 +21,12 @@
 
 #include "rs-types.h"
 
+typedef enum {
+       RS_LOADER_FLAGS_RAW  = (1<<0),
+       RS_LOADER_FLAGS_8BIT = (1<<1),
+       RS_LOADER_FLAGS_ALL = 0xffffff,
+} RSLoaderFlags;
+
 typedef RS_IMAGE16 *(*RSFileLoaderFunc)(const gchar *filename);
 typedef void (*RSFileMetaLoaderFunc)(const gchar *service, RAWFILE *rawfile, 
guint offset, RSMetadata *meta);
 
@@ -36,8 +42,9 @@
  * @param description A human readable description of the file-format/loader
  * @param loader The loader function
  * @param priority A loader priority, lowest is served first.
+ * @param flags Flags describing the loader
  */
-extern void rs_filetype_register_loader(const gchar *extension, const gchar 
*description, const RSFileLoaderFunc loader, const gint priority);
+extern void rs_filetype_register_loader(const gchar *extension, const gchar 
*description, const RSFileLoaderFunc loader, const gint priority, const 
RSLoaderFlags flags);
 
 /**
  * Register a new metadata loader
@@ -45,8 +52,9 @@
  * @param description A human readable description of the file-format/loader
  * @param meta_loader The loader function
  * @param priority A loader priority, lowest is served first.
+ * @param flags Flags describing the loader
  */
-extern void rs_filetype_register_meta_loader(const gchar *service, const gchar 
*description, const RSFileMetaLoaderFunc meta_loader, const gint priority);
+extern void rs_filetype_register_meta_loader(const gchar *service, const gchar 
*description, const RSFileMetaLoaderFunc meta_loader, const gint priority, 
const RSLoaderFlags flags);
 
 /**
  * Check if we support loading a given extension

Modified: trunk/plugins/load-dcraw/dcrawloader.c
===================================================================
--- trunk/plugins/load-dcraw/dcrawloader.c      2010-02-13 10:01:50 UTC (rev 
3202)
+++ trunk/plugins/load-dcraw/dcrawloader.c      2010-02-13 11:12:18 UTC (rev 
3203)
@@ -195,25 +195,25 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_loader(".cr2", "Canon CR2", open_dcraw,  10);
-       rs_filetype_register_loader(".crw", "Canon CIFF", open_dcraw, 10);
-       rs_filetype_register_loader(".nef", "Nikon NEF", open_dcraw, 10);
-       rs_filetype_register_loader(".nrw", "Nikon NEF 2", open_dcraw, 10);
-       rs_filetype_register_loader(".mrw", "Minolta raw", open_dcraw, 10);
-       rs_filetype_register_loader(".tif", "Canon TIFF", open_dcraw, 10);
-       rs_filetype_register_loader(".rwl", "Leica", open_dcraw, 10);
-       rs_filetype_register_loader(".arw", "Sony", open_dcraw, 10);
-       rs_filetype_register_loader(".sr2", "Sony", open_dcraw, 10);
-       rs_filetype_register_loader(".srf", "Sony", open_dcraw, 10);
-       rs_filetype_register_loader(".kdc", "Kodak", open_dcraw, 10);
-       rs_filetype_register_loader(".dcr", "Kodak", open_dcraw, 10);
-       rs_filetype_register_loader(".x3f", "Sigma", open_dcraw, 10);
-       rs_filetype_register_loader(".orf", "Olympus", open_dcraw, 10);
-       rs_filetype_register_loader(".raw", "Panasonic raw", open_dcraw, 10);
-       rs_filetype_register_loader(".rw2", "Panasonic raw v.2", open_dcraw, 
10);
-       rs_filetype_register_loader(".pef", "Pentax raw", open_dcraw, 10);
-       rs_filetype_register_loader(".dng", "Adobe Digital negative", 
open_dcraw, 10);
-       rs_filetype_register_loader(".mef", "Mamiya", open_dcraw, 10);
-       rs_filetype_register_loader(".3fr", "Hasselblad", open_dcraw, 10);
-       rs_filetype_register_loader(".erf", "Epson", open_dcraw, 10);
+       rs_filetype_register_loader(".cr2", "Canon CR2", open_dcraw,  10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".crw", "Canon CIFF", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".nef", "Nikon NEF", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".nrw", "Nikon NEF 2", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".mrw", "Minolta raw", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".tif", "Canon TIFF", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".rwl", "Leica", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".arw", "Sony", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".sr2", "Sony", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".srf", "Sony", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".kdc", "Kodak", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".dcr", "Kodak", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".x3f", "Sigma", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".orf", "Olympus", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".raw", "Panasonic raw", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".rw2", "Panasonic raw v.2", open_dcraw, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".pef", "Pentax raw", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".dng", "Adobe Digital negative", 
open_dcraw, 10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".mef", "Mamiya", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".3fr", "Hasselblad", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".erf", "Epson", open_dcraw, 10, 
RS_LOADER_FLAGS_RAW);
 }

Modified: trunk/plugins/load-gdk/load-gdk.c
===================================================================
--- trunk/plugins/load-gdk/load-gdk.c   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/load-gdk/load-gdk.c   2010-02-13 11:12:18 UTC (rev 3203)
@@ -81,12 +81,12 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_loader(".jpg", "JPEG", load_gdk, 10);
-       rs_filetype_register_loader(".png", "JPEG", load_gdk, 10);
-       rs_filetype_register_loader(".tif", "JPEG", load_gdk, 20);
+       rs_filetype_register_loader(".jpg", "JPEG", load_gdk, 10, 
RS_LOADER_FLAGS_8BIT);
+       rs_filetype_register_loader(".png", "JPEG", load_gdk, 10, 
RS_LOADER_FLAGS_8BIT);
+       rs_filetype_register_loader(".tif", "JPEG", load_gdk, 20, 
RS_LOADER_FLAGS_8BIT);
 
        /* Take care of thumbnailing too */
-       rs_filetype_register_meta_loader(".jpg", "Sigma", rs_gdk_load_meta, 10);
-       rs_filetype_register_meta_loader(".png", "Sigma", rs_gdk_load_meta, 10);
-       rs_filetype_register_meta_loader(".tif", "Sigma", rs_gdk_load_meta, 20);
+       rs_filetype_register_meta_loader(".jpg", "Sigma", rs_gdk_load_meta, 10, 
RS_LOADER_FLAGS_8BIT);
+       rs_filetype_register_meta_loader(".png", "Sigma", rs_gdk_load_meta, 10, 
RS_LOADER_FLAGS_8BIT);
+       rs_filetype_register_meta_loader(".tif", "Sigma", rs_gdk_load_meta, 20, 
RS_LOADER_FLAGS_8BIT);
 }

Modified: trunk/plugins/load-rawspeed/rawstudio-plugin.c
===================================================================
--- trunk/plugins/load-rawspeed/rawstudio-plugin.c      2010-02-13 10:01:50 UTC 
(rev 3202)
+++ trunk/plugins/load-rawspeed/rawstudio-plugin.c      2010-02-13 11:12:18 UTC 
(rev 3203)
@@ -23,11 +23,11 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_loader(".arw", "Sony", load_rawspeed, 5);
-       rs_filetype_register_loader(".cr2", "Canon CR2", load_rawspeed, 5);
-       rs_filetype_register_loader(".dng", "Adobe Digital Negative", 
load_rawspeed, 5);
-       rs_filetype_register_loader(".nef", "Nikon NEF", load_rawspeed, 5);
-       rs_filetype_register_loader(".orf", "Olympus", load_rawspeed, 5);
-       rs_filetype_register_loader(".pef", "Pentax raw", load_rawspeed, 5);
-       rs_filetype_register_loader(".rw2", "Panasonic raw", load_rawspeed, 5);
+       rs_filetype_register_loader(".arw", "Sony", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".cr2", "Canon CR2", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".dng", "Adobe Digital Negative", 
load_rawspeed, 5, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".nef", "Nikon NEF", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".orf", "Olympus", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".pef", "Pentax raw", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_loader(".rw2", "Panasonic raw", load_rawspeed, 5, 
RS_LOADER_FLAGS_RAW);
 }

Modified: trunk/plugins/meta-ciff/ciff-meta.c
===================================================================
--- trunk/plugins/meta-ciff/ciff-meta.c 2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/meta-ciff/ciff-meta.c 2010-02-13 11:12:18 UTC (rev 3203)
@@ -270,5 +270,5 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_meta_loader(".crw", "Canon raw", ciff_load_meta, 
10);
+       rs_filetype_register_meta_loader(".crw", "Canon raw", ciff_load_meta, 
10, RS_LOADER_FLAGS_RAW);
 }

Modified: trunk/plugins/meta-mrw/mrw-meta.c
===================================================================
--- trunk/plugins/meta-mrw/mrw-meta.c   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/meta-mrw/mrw-meta.c   2010-02-13 11:12:18 UTC (rev 3203)
@@ -132,5 +132,5 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_meta_loader(".mrw", "Minolta raw", mrw_load_meta, 
10);
+       rs_filetype_register_meta_loader(".mrw", "Minolta raw", mrw_load_meta, 
10, RS_LOADER_FLAGS_RAW);
 }

Modified: trunk/plugins/meta-raf/raf-meta.c
===================================================================
--- trunk/plugins/meta-raf/raf-meta.c   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/meta-raf/raf-meta.c   2010-02-13 11:12:18 UTC (rev 3203)
@@ -106,5 +106,5 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_meta_loader(".raf", "Fujifilm", rs_raf_load_meta, 
10);
+       rs_filetype_register_meta_loader(".raf", "Fujifilm", rs_raf_load_meta, 
10, RS_LOADER_FLAGS_RAW);
 }

Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c 2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/meta-tiff/tiff-meta.c 2010-02-13 11:12:18 UTC (rev 3203)
@@ -1676,26 +1676,26 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_meta_loader(".cr2", "Canon CR2", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".nef", "Nikon NEF", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".nrw", "Nikon NEF 2", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".tif", "Canon TIFF", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".rwl", "Leica", tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".arw", "Sony", sony_load_meta, 10);
-       rs_filetype_register_meta_loader(".sr2", "Sony", sony_load_meta, 10);
-       rs_filetype_register_meta_loader(".srf", "Sony", sony_load_meta, 10);
-       rs_filetype_register_meta_loader(".kdc", "Kodak", tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".dcr", "Kodak", tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".orf", "Olympus", tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".raw", "Panasonic raw", 
tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".rw2", "Panasonic raw 2", 
tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".pef", "Pentax raw", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".dng", "Adobe Digital negative", 
tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".mef", "Mamiya", tif_load_meta, 10);
-       rs_filetype_register_meta_loader(".3fr", "Hasselblad", tif_load_meta, 
10);
-       rs_filetype_register_meta_loader(".erf", "Epson", tif_load_meta, 10);
+       rs_filetype_register_meta_loader(".cr2", "Canon CR2", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".nef", "Nikon NEF", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".nrw", "Nikon NEF 2", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".tif", "Canon TIFF", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".rwl", "Leica", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".arw", "Sony", sony_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".sr2", "Sony", sony_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".srf", "Sony", sony_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".kdc", "Kodak", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".dcr", "Kodak", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".orf", "Olympus", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".raw", "Panasonic raw", 
tif_load_meta, 10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".rw2", "Panasonic raw 2", 
tif_load_meta, 10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".pef", "Pentax raw", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".dng", "Adobe Digital negative", 
tif_load_meta, 10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".mef", "Mamiya", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".3fr", "Hasselblad", tif_load_meta, 
10, RS_LOADER_FLAGS_RAW);
+       rs_filetype_register_meta_loader(".erf", "Epson", tif_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
 
-       rs_filetype_register_meta_loader(".tiff", "Generic TIFF meta loader", 
tiff_load_meta, 10);
+       rs_filetype_register_meta_loader(".tiff", "Generic TIFF meta loader", 
tiff_load_meta, 10, RS_LOADER_FLAGS_RAW);
 }
 
 void generate_lens_identifier(RSMetadata *meta)

Modified: trunk/plugins/meta-x3f/x3f-meta.c
===================================================================
--- trunk/plugins/meta-x3f/x3f-meta.c   2010-02-13 10:01:50 UTC (rev 3202)
+++ trunk/plugins/meta-x3f/x3f-meta.c   2010-02-13 11:12:18 UTC (rev 3203)
@@ -296,5 +296,5 @@
 G_MODULE_EXPORT void
 rs_plugin_load(RSPlugin *plugin)
 {
-       rs_filetype_register_meta_loader(".x3f", "Sigma", x3f_load_meta, 10);
+       rs_filetype_register_meta_loader(".x3f", "Sigma", x3f_load_meta, 10, 
RS_LOADER_FLAGS_RAW);
 }


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to