Author: abrander
Date: 2009-08-10 20:08:57 +0200 (Mon, 10 Aug 2009)
New Revision: 2617
Modified:
trunk/librawstudio/rs-metadata.h
trunk/plugins/meta-tiff/tiff-meta.c
trunk/plugins/meta-x3f/x3f-meta.c
Log:
Added RS_MAKE enums and detection for Casio, Hasselblad, Mamiya, Polaroid and
Ricoh.
Modified: trunk/librawstudio/rs-metadata.h
===================================================================
--- trunk/librawstudio/rs-metadata.h 2009-08-10 17:06:02 UTC (rev 2616)
+++ trunk/librawstudio/rs-metadata.h 2009-08-10 18:08:57 UTC (rev 2617)
@@ -34,16 +34,21 @@
typedef enum {
MAKE_UNKNOWN = 0,
MAKE_CANON,
+ MAKE_CASIO,
MAKE_EPSON,
MAKE_FUJIFILM,
+ MAKE_HASSELBLAD,
MAKE_KODAK,
MAKE_LEICA,
+ MAKE_MAMIYA,
MAKE_MINOLTA,
MAKE_NIKON,
MAKE_OLYMPUS,
MAKE_PANASONIC,
MAKE_PENTAX,
MAKE_PHASEONE,
+ MAKE_POLAROID,
+ MAKE_RICOH,
MAKE_SAMSUNG,
MAKE_SIGMA,
MAKE_SONY,
Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c 2009-08-10 17:06:02 UTC (rev 2616)
+++ trunk/plugins/meta-tiff/tiff-meta.c 2009-08-10 18:08:57 UTC (rev 2617)
@@ -1147,14 +1147,22 @@
meta->make_ascii = raw_strdup(rawfile,
ifd.value_offset, ifd.count);
if (raw_strcmp(rawfile,
ifd.value_offset, "Canon", 5))
meta->make = MAKE_CANON;
+ else if (raw_strcmp(rawfile,
ifd.value_offset, "CASIO", 5))
+ meta->make = MAKE_CASIO;
+ else if (raw_strcmp(rawfile,
ifd.value_offset, "Hasselblad", 10))
+ meta->make = MAKE_HASSELBLAD;
else if (raw_strcmp(rawfile,
ifd.value_offset, "KODAK", 5))
meta->make = MAKE_KODAK;
else if (raw_strcmp(rawfile,
ifd.value_offset, "EASTMAN KODAK", 13))
meta->make = MAKE_KODAK;
+ else if (raw_strcmp(rawfile,
ifd.value_offset, "Leica", 5))
+ meta->make = MAKE_LEICA;
else if (raw_strcmp(rawfile,
ifd.value_offset, "Minolta", 7))
meta->make = MAKE_MINOLTA;
else if (raw_strcmp(rawfile,
ifd.value_offset, "KONICA MINOLTA", 14))
meta->make = MAKE_MINOLTA;
+ else if (raw_strcmp(rawfile,
ifd.value_offset, "Mamiya", 6))
+ meta->make = MAKE_MAMIYA;
else if (raw_strcmp(rawfile,
ifd.value_offset, "NIKON", 5))
meta->make = MAKE_NIKON;
else if (raw_strcmp(rawfile,
ifd.value_offset, "OLYMPUS", 7))
@@ -1165,6 +1173,8 @@
meta->make = MAKE_PENTAX;
else if (raw_strcmp(rawfile,
ifd.value_offset, "Phase One", 9))
meta->make = MAKE_PHASEONE;
+ else if (raw_strcmp(rawfile,
ifd.value_offset, "Ricoh", 5))
+ meta->make = MAKE_RICOH;
else if (raw_strcmp(rawfile,
ifd.value_offset, "SAMSUNG", 7))
meta->make = MAKE_SAMSUNG;
/* Do not detect SONY, we don't want to
call private_sony() unless
Modified: trunk/plugins/meta-x3f/x3f-meta.c
===================================================================
--- trunk/plugins/meta-x3f/x3f-meta.c 2009-08-10 17:06:02 UTC (rev 2616)
+++ trunk/plugins/meta-x3f/x3f-meta.c 2009-08-10 18:08:57 UTC (rev 2617)
@@ -240,6 +240,8 @@
meta->make_ascii =
g_strdup(value);
if
(g_str_equal(meta->make_ascii, "SIGMA"))
meta->make =
MAKE_SIGMA;
+ else if
(g_str_equal(meta->make_ascii, "Polaroid"))
+ meta->make =
MAKE_POLAROID;
}
else if (g_str_equal(name,
"CAMMODEL"))
meta->model_ascii =
g_strdup(value);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
