Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15102
Modified Files:
wb_extract.pl wb_presets.c
Log Message:
Feature Request #310: Update wp_extract.pl and add wb presets for the FUJIFILM
X-Pro1. Thanks goes to Michael Raitza for the patch.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- wb_presets.c 21 Jul 2014 23:45:09 -0000 1.280
+++ wb_presets.c 15 Sep 2014 03:15:12 -0000 1.281
@@ -2113,6 +2113,48 @@
{ "FUJIFILM", "X-E1", "9100K", 0, { 2.688742, 1, 1.135762, 0 } },
{ "FUJIFILM", "X-E1", "10000K", 0, { 2.821192, 1, 1.062914, 0 } },
+ /* FUJIFILM X-Pro1 Firmware Version v3.30 */
+ // The manual calls it "Fine".
+ { "FUJIFILM", "X-Pro1", Daylight, 0, { 1.860927, 1, 1.708609, 0 } },
+ // The manual calls it "Shade", but exiftool shows it as "Cloudy".
+ { "FUJIFILM", "X-Pro1", Shade, 0, { 2.105960, 1, 1.460265, 0 } },
+ { "FUJIFILM", "X-Pro1", DaylightFluorescent, 0, { 2.390728, 1, 1.500000, 0 }
},
+ { "FUJIFILM", "X-Pro1", WarmWhiteFluorescent, 0, { 2.059603, 1, 1.794702, 0
} },
+ { "FUJIFILM", "X-Pro1", CoolWhiteFluorescent, 0, { 1.966887, 1, 2.254967, 0
} },
+ { "FUJIFILM", "X-Pro1", Incandescent, 0, { 1.225166, 1, 2.708609, 0 } },
+ { "FUJIFILM", "X-Pro1", Underwater, 0, { 1.860927, 1, 1.708609, 0 } },
+ { "FUJIFILM", "X-Pro1", "2500K", 0, { 1.009934, 1, 3.423841, 0 } },
+ { "FUJIFILM", "X-Pro1", "2550K", 0, { 1.039735, 1, 3.327815, 0 } },
+ { "FUJIFILM", "X-Pro1", "2650K", 0, { 1.092715, 1, 3.155629, 0 } },
+ { "FUJIFILM", "X-Pro1", "2700K", 0, { 1.115894, 1, 3.079470, 0 } },
+ { "FUJIFILM", "X-Pro1", "2800K", 0, { 1.158940, 1, 2.937086, 0 } },
+ { "FUJIFILM", "X-Pro1", "2850K", 0, { 1.178808, 1, 2.874172, 0 } },
+ { "FUJIFILM", "X-Pro1", "2950K", 0, { 1.218543, 1, 2.758278, 0 } },
+ { "FUJIFILM", "X-Pro1", "3000K", 0, { 1.235099, 1, 2.705298, 0 } },
+ { "FUJIFILM", "X-Pro1", "3100K", 0, { 1.271523, 1, 2.605960, 0 } },
+ { "FUJIFILM", "X-Pro1", "3200K", 0, { 1.307947, 1, 2.519868, 0 } },
+ { "FUJIFILM", "X-Pro1", "3300K", 0, { 1.341060, 1, 2.440397, 0 } },
+ { "FUJIFILM", "X-Pro1", "3400K", 0, { 1.374172, 1, 2.367550, 0 } },
+ { "FUJIFILM", "X-Pro1", "3600K", 0, { 1.437086, 1, 2.238411, 0 } },
+ { "FUJIFILM", "X-Pro1", "3700K", 0, { 1.470199, 1, 2.182119, 0 } },
+ { "FUJIFILM", "X-Pro1", "3800K", 0, { 1.500000, 1, 2.132450, 0 } },
+ { "FUJIFILM", "X-Pro1", "4000K", 0, { 1.562914, 1, 2.036424, 0 } },
+ { "FUJIFILM", "X-Pro1", "4200K", 0, { 1.622517, 1, 1.953642, 0 } },
+ { "FUJIFILM", "X-Pro1", "4300K", 0, { 1.652318, 1, 1.917219, 0 } },
+ { "FUJIFILM", "X-Pro1", "4500K", 0, { 1.711921, 1, 1.847682, 0 } },
+ { "FUJIFILM", "X-Pro1", "4800K", 0, { 1.801325, 1, 1.754967, 0 } },
+ { "FUJIFILM", "X-Pro1", "5000K", 0, { 1.857616, 1, 1.701987, 0 } },
+ { "FUJIFILM", "X-Pro1", "5300K", 0, { 1.940397, 1, 1.629139, 0 } },
+ { "FUJIFILM", "X-Pro1", "5600K", 0, { 2.019868, 1, 1.562914, 0 } },
+ { "FUJIFILM", "X-Pro1", "5900K", 0, { 2.096026, 1, 1.503311, 0 } },
+ { "FUJIFILM", "X-Pro1", "6300K", 0, { 2.192053, 1, 1.433775, 0 } },
+ { "FUJIFILM", "X-Pro1", "6700K", 0, { 2.281457, 1, 1.370861, 0 } },
+ { "FUJIFILM", "X-Pro1", "7100K", 0, { 2.367550, 1, 1.311258, 0 } },
+ { "FUJIFILM", "X-Pro1", "7700K", 0, { 2.486755, 1, 1.238411, 0 } },
+ { "FUJIFILM", "X-Pro1", "8300K", 0, { 2.592715, 1, 1.172185, 0 } },
+ { "FUJIFILM", "X-Pro1", "9100K", 0, { 2.721854, 1, 1.096026, 0 } },
+ { "FUJIFILM", "X-Pro1", "10000K", 0, { 2.847682, 1, 1.023179, 0 } },
+
{ "KODAK", "P850 ZOOM", Daylight, 0, { 1.859375, 1, 1.566406, 0 } },
{ "KODAK", "P850 ZOOM", Cloudy, 0, { 1.960938, 1, 1.570313, 0 } },
{ "KODAK", "P850 ZOOM", Shade, 0, { 2.027344, 1, 1.519531, 0 } },
Index: wb_extract.pl
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_extract.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wb_extract.pl 5 Jan 2014 13:45:10 -0000 1.7
+++ wb_extract.pl 15 Sep 2014 03:15:12 -0000 1.8
@@ -57,7 +57,7 @@
($make, $model) = split(/ +/, $value);
# exiftool's -Make and -Model are correct, but this should not
# cause any regression
- if ($make eq "X-E1") {
+ if ($make eq "X-E1" || $make eq "X-Pro1") {
$model = $make;
$make = "FUJIFILM";
}
@@ -77,7 +77,7 @@
} elsif ($field eq "BlueBalance") { # Field for D70 and X-E1 (blue)
$mulblue = $value;
} elsif ($field eq "WhiteBalance") {
- if ($model eq "X-E1" && $value eq "Unknown (0x600)") {
+ if (($model eq "X-E1" || $model eq "X-Pro1" && $value eq "Unknown
(0x600)") {
$wbname = "Underwater";
} else {
$wbname = $value;
@@ -118,7 +118,7 @@
# Fix names for wb_presets.c
if ($make eq "FUJIFILM") {
- if ($model eq "X-E1") {
+ if ($model eq "X-E1" || $model eq "X-Pro1") {
# The manual calls it "Shade", but exiftool shows it as "Cloudy".
$wbname =~ s/^Cloudy$/Shade/;
}
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
