--- scaleomat/scaleomat.pl 2004/11/18 20:15:09 1.5 +++ scaleomat/scaleomat.pl 2004/12/06 10:02:54 1.6 @@ -24,7 +24,7 @@ use MPIWGlib; $| = 1; # unblock IO -my $version = "V0.9.3 (ROC 18.11.2004)"; +my $version = "V0.9.4 (ROC 6.12.2004)"; $debug = 0; @@ -41,7 +41,7 @@ my $overwrite = 0; # overwrite already c # image file extensions and formats my %img_type_ext = ("tif" => "TIFF", "tiff" => "TIFF", "gif" => "GIF", - "jpg" => "JPEG", "png" => "PNG"); + "jpg" => "JPEG", "png" => "PNG", "dcr" => "RAW"); # destination image file extensions my %target_ext_type = ("TIFF" => "jpg", "JPEG" => "jpg"); @@ -637,6 +637,10 @@ sub convert_file { # $pictype = quickident("$srcdir/$filename"); if ($pictype) { + if ($pictype eq "RAW") { + logger('DEBUG', "skipping raw file '$srcdir/$filename'"); + return 0; + } my $newext = $target_ext_type{$pictype}; if ($newext) { $newfn = $filebase . ".$newext"; @@ -653,7 +657,6 @@ sub convert_file { } } else { # quick ident failed -- do it slowly - ($pictype, $picwidth, $picheight, $bitdepth) = identify("$srcdir/$filename"); if ((! $pictype)||($picwidth == 0)||($picheight == 0)) { logger('WARNING', "unknown file type '$srcdir/$filename'");