[Rawstudio-commit] r2028 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-24 17:35:40 +0200 (Wed, 24 Sep 2008)
New Revision: 2028

Modified:
   trunk/src/rawstudio.c
   trunk/src/rawstudio.h
   trunk/src/tiff-meta.c
Log:
Added support for Epson erf-files.

Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c	2008-09-24 15:34:04 UTC (rev 2027)
+++ trunk/src/rawstudio.c	2008-09-24 15:35:40 UTC (rev 2028)
@@ -113,6 +113,7 @@
 	REGISTER_FILETYPE(".dng", _("Adobe Digital negative"), rs_image16_open_dcraw, rs_tiff_load_meta);
 	REGISTER_FILETYPE(".mef", _("Mamiya"), rs_image16_open_dcraw, rs_tiff_load_meta);
 	REGISTER_FILETYPE(".3fr", _("Hasselblad"), rs_image16_open_dcraw, rs_tiff_load_meta);
+	REGISTER_FILETYPE(".erf", _("Epson"), rs_image16_open_dcraw, rs_tiff_load_meta);
 
 	/* GDK formats */
 	REGISTER_FILETYPE(".jpg", _("JPEG (Joint Photographic Experts Group)"), rs_image16_open_gdk, rs_gdk_load_meta);

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-24 15:34:04 UTC (rev 2027)
+++ trunk/src/rawstudio.h	2008-09-24 15:35:40 UTC (rev 2028)
@@ -72,6 +72,7 @@
 enum {
 	MAKE_UNKNOWN = 0,
 	MAKE_CANON,
+	MAKE_EPSON,
 	MAKE_FUJIFILM,
 	MAKE_KODAK,
 	MAKE_LEICA,

Modified: trunk/src/tiff-meta.c
===================================================================
--- trunk/src/tiff-meta.c	2008-09-24 15:34:04 UTC (rev 2027)
+++ trunk/src/tiff-meta.c	2008-09-24 15:35:40 UTC (rev 2028)
@@ -984,6 +984,8 @@
 						meta->make = MAKE_SONY;
 					else if (raw_strcmp(rawfile, ifd.value_offset, "FUJIFILM", 4))
 						meta->make = MAKE_FUJIFILM;
+					else if (raw_strcmp(rawfile, ifd.value_offset, "SEIKO EPSON", 11))
+						meta->make = MAKE_EPSON;
 				}
 				break;
 			case 0x0110: /* Model */