Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21503
Modified Files:
wb_extract.pl
Log Message:
Update for better output from *.CR2 files. Patch by pini-pini.
Index: wb_extract.pl
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_extract.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wb_extract.pl 22 Jan 2008 12:24:18 -0000 1.4
+++ wb_extract.pl 9 Jan 2013 16:30:07 -0000 1.5
@@ -27,18 +27,30 @@
# debug:
#my ($lastmul1, $lastmul2, $lastmul3) = (0,0,0);
+my($const_WB);
+$const_WB = 0;
+
for my $file (@ARGV) {
- my ($make, $model, $wbname, $wbfinetune, $mulred, $mulgreen, $mulblue);
+ if ($file eq "-const") {
+ $const_WB = 1;
+ next
+ }
+ my ($make, $model, $fw_version, $wbname, $wbfinetune, $wbfinetune_1,
$mulred, $mulgreen, $mulblue);
$mulgreen = 1; # default value for green balance
+ $wbfinetune = $wbfinetune_1 = 0; # avoid warnings about uninitialized vars
- open(EXIFTOOL, "exiftool -s -t -Model -ColorBalance1 -RedBalance
-BlueBalance -WhiteBalance -WhiteBalanceFineTune $file|")
+ open(EXIFTOOL, "exiftool -s -t -Model -CanonModelID -FirmwareVersion
-ColorBalance1 -RedBalance -BlueBalance -WhiteBalance -WBShiftAB
-WBBracketValueAB $file|")
or die "can't open $file: $!";
while (my $line = <EXIFTOOL>) {
$line =~ /([^\t]+)\t(.*)/ or next;
my ($field, $value) = ($1, $2);
if ($field eq "Model") {
($make, $model) = split(/ +/, $value);
+ } elsif ($field eq "CanonModelID") {
+ $model = $value;
+ } elsif ($field eq "FirmwareVersion") {
+ $fw_version = $value;
} elsif ($field eq "ColorBalance1") { # Field for D200
my $mul_unknown;
($mulred, $mulblue, $mulgreen, $mul_unknown) = split(/ +/, $value);
@@ -50,16 +62,28 @@
$wbname = $value;
} elsif ($field eq "WhiteBalanceFineTune") {
$wbfinetune = $value;
+ } elsif ($field eq "WBShiftAB") {
+ $wbfinetune = $value;
+ } elsif ($field eq "WBBracketValueAB") {
+ $wbfinetune_1 = $value;
}
}
close EXIFTOOL;
# Fix names for consistency across Nikon cameras (D70 and D2X use "Direct
sunlight")
$wbname =~ s/^Sunny$/Direct sunlight/;
-
+
+ # printf " /* $make $model Firmware Version $fw_version */\n";
+
# Format and print the line
my $result;
- $result = sprintf " { \"%s\", \"%s\", \"%s\", %d,", $make, $model, $wbname,
$wbfinetune;
+ $result = sprintf " { \"%s\", \"%s\", ", $make, $model;
+ if ($const_WB eq 1) {
+ $result .= sprintf "%s, ", $wbname;
+ } else {
+ $result .= sprintf "\"%s\", ", $wbname;
+ }
+ $result .= sprintf "%d,", $wbfinetune+$wbfinetune_1;
$result .= " " while length($result) < 48;
$result .= "{ $mulred, $mulgreen, $mulblue, 0 } },";
------------------------------------------------------------------------------
Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery
and much more. Keep your Java skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
