Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Sigma.pm

Timestamp:

2011-06-01T12:33:42+12:00 (13 years ago)

Author:

sjm84

Message:

Updating the ExifTool perl modules

File:

• main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Sigma.pm (modified) (14 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Sigma.pm

@@ -6 +6 @@
 # Revisions:    04/06/2004 - P. Harvey Created
 #               02/20/2007 - PH added SD14 tags
+#               24/06/2010 - PH decode some SD15 tags
 #
 # Reference:    http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html
@@ -16 +17 @@
 use Image::ExifTool::Exif;
 
-$VERSION = '1.04';
+$VERSION = '1.09';
 
 %Image::ExifTool::Sigma::Main = (
@@ -46 +47 @@
         },
     },
-    0x000a => 'Lens',
+    0x000a => 'LensFocalRange',
     0x000b => 'ColorSpace',
+    # SIGMA PhotoPro writes these tags as strings, but some cameras (at least) write them as rational
     0x000c => [
         {
             Name => 'ExposureCompensation',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Expo:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Expo:%+.1f",$val) : undef',
         },
         { #PH
-            Name => 'UnknownCompensation',
+            Name => 'ExposureAdjust',
             Writable => 'rational64s',
             Unknown => 1,
@@ -64 +66 @@
         {
             Name => 'Contrast',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Cont:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Cont:%+.1f",$val) : undef',
@@ -76 +78 @@
         {
             Name => 'Shadow',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Shad:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Shad:%+.1f",$val) : undef',
@@ -88 +90 @@
         {
             Name => 'Highlight',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/High:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("High:%+.1f",$val) : undef',
@@ -100 +102 @@
         {
             Name => 'Saturation',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Satu:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Satu:%+.1f",$val) : undef',
@@ -112 +114 @@
         {
             Name => 'Sharpness',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Shar:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Shar:%+.1f",$val) : undef',
@@ -124 +126 @@
         {
             Name => 'X3FillLight',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/Fill:\s*//, $val',
             ValueConvInv => 'IsFloat($val) ? sprintf("Fill:%+.1f",$val) : undef',
@@ -136 +138 @@
         {
             Name => 'ColorAdjustment',
-            Condition => '$$self{CameraModel} !~ /SD14$/',
+            Condition => '$format eq "string"',
             ValueConv => '$val =~ s/CC:\s*//, $val',
             ValueConvInv => 'IsInt($val) ? "CC:$val" : undef',
@@ -155 +157 @@
     0x0018 => 'Software',
     0x0019 => 'AutoBracket',
-    # 0x001a - int32u: 1884 to 2016
-    # 0x001b - int32u: 20688 to 45335
-    # 0x001c - int16u[2]: "640 480"
+    0x001a => [ #PH
+        {
+            Name => 'PreviewImageStart',
+            Condition => '$format eq "int32u"',
+            IsOffset => 1,
+            OffsetPair => 0x001b,
+            DataTag => 'PreviewImage',
+            Writable => 'int32u',
+            Protected => 2,
+        },{ # (written by Sigma Photo Pro)
+            Name => 'ChrominanceNoiseReduction',
+            ValueConv => '$val =~ s/Chro:\s*//, $val',
+            ValueConvInv => 'IsFloat($val) ? sprintf("Chro:%+.1f",$val) : undef',
+        },
+    ],
+    0x001b => [ #PH
+        {
+            Name => 'PreviewImageLength',
+            Condition => '$format eq "int32u"',
+            OffsetPair => 0x001a,
+            DataTag => 'PreviewImage',
+            Writable => 'int32u',
+            Protected => 2,
+        },{ # (written by Sigma Photo Pro)
+            Name => 'LuminanceNoiseReduction',
+            ValueConv => '$val =~ s/Luma:\s*//, $val',
+            ValueConvInv => 'IsFloat($val) ? sprintf("Luma:%+.1f",$val) : undef',
+        },
+    ],
+    0x001c => { #PH
+        Name => 'PreviewImageSize',
+        Writable => 'int16u',
+        Count => 2,
+    },
     0x001d => { #PH
         Name => 'MakerNoteVersion',
-        Format => 'undef',
-    },
-    # 0x001e - int16u: 0
-    # 0x001f - string: ""
+        Writable => 'undef',
+    },
+    # 0x001e - int16u: 0, 4, 13 - flash mode?
+    0x001f => { #PH (NC)
+        Name => 'AFPoint',
+        # values: "", "Center", "Center,Center", "Right,Right"
+    },
     # 0x0020-21 - string: " "
-    0x0022 => { #PH
-        Name => 'AdjustmentMode',
-        Priority => 0,
-        Unknown => 1,
-    },
-    # 0x0023 - string: 10, 131, 150, 152, 169
-    # 0x0024-25 - string: ""
-    # 0x0026-2e - int32u: 0
+    0x0022 => { #PH (NC)
+        Name => 'FileFormat',
+        # values: "JPG", "JPG-S" or "X3F"
+    },
+    # 0x0023 - string: "", 10, 83, 131, 145, 150, 152, 169
+    0x0024 => 'Calibration',
+    # 0x0025 - string: "", "0.70", "0.90"
+    # 0x0026-2b - int32u: 0
+    0x002c => { #PH
+        Name => 'ColorMode',
+        Writable => 'int32u',
+        PrintConv => {
+            0 => 'n/a',
+            1 => 'Sepia',
+            2 => 'B&W',
+            3 => 'Standard',
+            4 => 'Vivid',
+            5 => 'Neutral',
+            6 => 'Portrait',
+            7 => 'Landscape',
+        },
+    },
+    # 0x002d - int32u: 0
+    # 0x002e - rational64s: (the negative of FlashExposureComp, but why?)
     # 0x002f - int32u: 0, 1
-    0x0030 => 'LensApertureRange', #PH
+    0x0030 => { #PH
+        Name => 'LensApertureRange',
+        Notes => 'changes with focal length. MaxAperture for some models',
+    },
     0x0031 => { #PH
         Name => 'FNumber',
@@ -185 +240 @@
         Writable => 'rational64u',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
-        PrintConvInv => 'eval $val',
-    },
-    # 0x0033 - string: "3909" to "12337687"
-    # 0x0034 - int32u: 0,1,2,3 or 4 (possibly AFPoint?)
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    0x0033 => { #PH
+        Name => 'ExposureTime2',
+        Writable => 'string',
+        ValueConv => '$val * 1e-6',
+        ValueConvInv => 'int($val * 1e6 + 0.5)',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    0x0034 => { #PH
+        Name => 'BurstShot',
+        Writable => 'int32u',
+    },
+    # 0x0034 - int32u: 0,1,2,3 or 4
     0x0035 => { #PH
         Name => 'ExposureCompensation',
         Writable => 'rational64s',
+        # add a '+' sign to positive values
+        PrintConv => '$val and $val =~ s/^(\d)/\+$1/; $val',
+        PrintConvInv => '$val',
     },
     # 0x0036 - string: "                    "
-    # 0x0037-39 - string: ""
-    0x003a => { #PH (guess!)
+    # 0x0037-38 - string: ""
+    0x0039 => { #PH
+        Name => 'SensorTemperature',
+        # (string format)
+        PrintConv => 'IsInt($val) ? "$val C" : $val',
+        PrintConvInv => '$val=~s/ ?C$//; $val',
+    },
+    0x003a => { #PH
         Name => 'FlashExposureComp',
         Writable => 'rational64s',
@@ -204 +279 @@
     },
     0x003c => 'WhiteBalance', #PH
+    0x003d => { #PH (new for SD15)
+        Name => 'PictureMode',
+        Notes => 'same as ColorMode, but "Standard" when ColorMode is Sepia or B&W',
+    },
 );
 
@@ -225 +304 @@
 =head1 AUTHOR
 
-Copyright 2003-2007, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it