Ignore:
Timestamp:
2021-02-26T19:39:51+13:00 (3 years ago)
Author:
anupama
Message:

Committing the improvements to EmbeddedMetaPlugin's processing of Keywords vs other metadata fields. Keywords were literally stored as arrays of words rather than phrases in PDFs (at least in Diego's sample PDF), whereas other meta fields like Subjects and Creators stored them as arrays of phrases. To get both to work, Kathy updated EXIF to a newer version, to retrieve the actual EXIF values stored in the PDF. And Kathy and Dr Bainbridge came up with a new option that I added called apply_join_before_split_to_metafields that's a regex which can list the metadata fields to apply the join_before_split to and whcih previously always got applied to all metadata fields. Now it's applied to any *Keywords metafields by default, as that's the metafield we have experience of that behaves differently to the others, as it stores by word instead of phrases. Tested on Diego's sample PDF. Diego has double-checked it to works on his sample PDF too, setting the split char to ; and turning on the join_before_split and leaving apply_join_before_split_to_metafields at its default of .*Keywords. File changes are strings.properties for the tooltip, the plugin introducing the option and working with it and Kathy's EXIF updates affecting cpan/File and cpan/Image.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/cpan/Image/ExifTool/PanasonicRaw.pm

    r24107 r34921  
    77#               2009/05/12 - PH Added RWL file type (same format as RW2)
    88#
    9 # References:   1) CPAN forum post by 'hardloaf' (http://www.cpanforum.com/threads/2183)
     9# References:   1) https://exiftool.org/forum/index.php/topic,1542.0.html
    1010#               2) http://www.cybercom.net/~dcoffin/dcraw/
     11#               3) http://syscall.eu/#pana
     12#               4) Klaus Homeister private communication
     13#              IB) Iliah Borg private communication (LibRaw)
    1114#              JD) Jens Duttke private communication (TZ3,FZ30,FZ50)
    1215#------------------------------------------------------------------------------
    … …  
    1922use Image::ExifTool::Exif;
    2023
    21 $VERSION = '1.02';
     24$VERSION = '1.25';
    2225
    2326sub ProcessJpgFromRaw($$$);
    2427sub WriteJpgFromRaw($$$);
     28sub WriteDistortionInfo($$$);
     29sub ProcessDistortionInfo($$$);
    2530
    2631my %jpgFromRawMap = (
    … …  
    3944);
    4045
     46my %wbTypeInfo = (
     47    PrintConv => \%Image::ExifTool::Exif::lightSource,
     48    SeparateTable => 'EXIF LightSource',
     49);
     50
     51my %panasonicWhiteBalance = ( #forum9396
     52    0 => 'Auto',
     53    1 => 'Daylight',
     54    2 => 'Cloudy',
     55    3 => 'Tungsten',
     56    4 => 'n/a',
     57    5 => 'Flash',
     58    6 => 'n/a',
     59    7 => 'n/a',
     60    8 => 'Custom#1',
     61    9 => 'Custom#2',
     62    10 => 'Custom#3',
     63    11 => 'Custom#4',
     64    12 => 'Shade',
     65    13 => 'Kelvin',
     66    16 => 'AWBc', # GH5 and G9 (Makernotes WB==19)
     67);
     68
    4169# Tags found in Panasonic RAW/RW2/RWL images (ref PH)
    4270%Image::ExifTool::PanasonicRaw::Main = (
    … …  
    5482    0x04 => 'SensorTopBorder', #JD
    5583    0x05 => 'SensorLeftBorder', #JD
    56     0x06 => 'ImageHeight', #1/PH
    57     0x07 => 'ImageWidth', #1/PH
     84    0x06 => 'SensorBottomBorder', #PH
     85    0x07 => 'SensorRightBorder', #PH
    5886    # observed values for unknown tags - PH
    5987    # 0x08: 1
    6088    # 0x09: 1,3,4
    6189    # 0x0a: 12
    62     # 0x0b: 0x860c,0x880a,0x880c
     90    # (IB gave 0x08-0x0a as BlackLevel tags, but Klaus' decoding makes more sense)
     91    0x08 => { Name => 'SamplesPerPixel', Writable => 'int16u', Protected => 1 }, #4
     92    0x09 => { #4
     93        Name => 'CFAPattern',
     94        Writable => 'int16u',
     95        Protected => 1,
     96        PrintConv => {
     97            0 => 'n/a',
     98            1 => '[Red,Green][Green,Blue]', # (CM-1, FZ70)
     99            2 => '[Green,Red][Blue,Green]', # (LX-7)
     100            3 => '[Green,Blue][Red,Green]', # (ZS100, FZ2500, FZ1000, ...)
     101            4 => '[Blue,Green][Green,Red]', # (LC-100, G-7, V-LUX1, ...)
     102        },
     103    },
     104    0x0a => { Name => 'BitsPerSample', Writable => 'int16u', Protected => 1 }, #4
     105    0x0b => { #4
     106        Name => 'Compression',
     107        Writable => 'int16u',
     108        Protected => 1,
     109        PrintConv => {
     110            34316 => 'Panasonic RAW 1', # (most models - RAW/RW2/RWL)
     111            34826 => 'Panasonic RAW 2', # (DIGILUX 2 - RAW)
     112            34828 => 'Panasonic RAW 3', # (D-LUX2,D-LUX3,FZ30,LX1 - RAW)
     113            34830 => 'Panasonic RAW 4', #IB (Leica DIGILUX 3, Panasonic DMC-L1)
     114        },
     115    },
    63116    # 0x0c: 2 (only Leica Digilux 2)
    64117    # 0x0d: 0,1
    65118    # 0x0e,0x0f,0x10: 4095
    66     # 0x18,0x19,0x1a,0x1c,0x1d,0x1e: 0
    67     # 0x1b,0x27,0x29,0x2a,0x2b,0x2c: [binary data]
    68     # 0x2d: 2,3
     119    0x0e => { Name => 'LinearityLimitRed',   Writable => 'int16u' }, #IB
     120    0x0f => { Name => 'LinearityLimitGreen', Writable => 'int16u' }, #IB
     121    0x10 => { Name => 'LinearityLimitBlue',  Writable => 'int16u' }, #IB
    69122    0x11 => { #JD
    70123        Name => 'RedBalance',
    … …  
    80133        ValueConvInv => 'int($val * 256 + 0.5)',
    81134    },
     135    0x13 => { #IB
     136        Name => 'WBInfo',
     137        SubDirectory => { TagTable => 'Image::ExifTool::PanasonicRaw::WBInfo' },
     138    },
    82139    0x17 => { #1
    83140        Name => 'ISO',
    84141        Writable => 'int16u',
    85142    },
     143    # 0x18,0x19,0x1a: 0
     144    0x18 => { #IB
     145        Name => 'HighISOMultiplierRed',
     146        Writable => 'int16u',
     147        ValueConv => '$val / 256',
     148        ValueConvInv => 'int($val * 256 + 0.5)',
     149    },
     150    0x19 => { #IB
     151        Name => 'HighISOMultiplierGreen',
     152        Writable => 'int16u',
     153        ValueConv => '$val / 256',
     154        ValueConvInv => 'int($val * 256 + 0.5)',
     155    },
     156    0x1a => { #IB
     157        Name => 'HighISOMultiplierBlue',
     158        Writable => 'int16u',
     159        ValueConv => '$val / 256',
     160        ValueConvInv => 'int($val * 256 + 0.5)',
     161    },
     162    # 0x1b: [binary data] (something to do with the camera ISO cababilities: int16u count N,
     163    #                      followed by table of  N entries: int16u ISO, int16u[3] RGB gains - ref IB)
     164    0x1c => { Name => 'BlackLevelRed',   Writable => 'int16u' }, #IB
     165    0x1d => { Name => 'BlackLevelGreen', Writable => 'int16u' }, #IB
     166    0x1e => { Name => 'BlackLevelBlue',  Writable => 'int16u' }, #IB
    86167    0x24 => { #2
    87168        Name => 'WBRedLevel',
    … …  
    96177        Writable => 'int16u',
    97178    },
     179    0x27 => { #IB
     180        Name => 'WBInfo2',
     181        SubDirectory => { TagTable => 'Image::ExifTool::PanasonicRaw::WBInfo2' },
     182    },
     183    # 0x27,0x29,0x2a,0x2b,0x2c: [binary data]
     184    0x2d => { #IB
     185        Name => 'RawFormat',
     186        Writable => 'int16u',
     187        Protected => 1,
     188        # 2 - RAW DMC-FZ8/FZ18
     189        # 3 - RAW DMC-L10
     190        # 4 - RW2 for most other models, including G9 in "pixel shift off" mode and YUNEEC CGO4
     191        #     (must add 15 to black levels for RawFormat == 4)
     192        # 5 - RW2 DC-GH5s; G9 in "pixel shift on" mode
     193        # 6 - RW2 DC-S1, DC-S1r in "pixel shift off" mode
     194        # 7 - RW2 DC-S1r (and probably DC-S1, have no raw samples) in "pixel shift on" mode
     195        # not used - DMC-LX1/FZ30/FZ50/L1/LX1/LX2
     196        # (modes 5 and 7 are lossless)
     197    },
    98198    0x2e => { #JD
    99199        Name => 'JpgFromRaw', # (writable directory!)
     200        Groups => { 2 => 'Preview' },
    100201        Writable => 'undef',
    101202        # protect this tag because it contains all the metadata
    … …  
    114215        },
    115216    },
     217    0x2f => { Name => 'CropTop',    Writable => 'int16u' },
     218    0x30 => { Name => 'CropLeft',   Writable => 'int16u' },
     219    0x31 => { Name => 'CropBottom', Writable => 'int16u' },
     220    0x32 => { Name => 'CropRight',  Writable => 'int16u' },
    116221    0x10f => {
    117222        Name => 'Make',
    … …  
    157262    0x118 => {
    158263        Name => 'RawDataOffset', #PH (RW2/RWL)
    159         IsOffset => '$$exifTool{TIFF_TYPE} =~ /^(RW2|RWL)$/', # (invalid in DNG-converted files)
     264        IsOffset => '$$et{TIFF_TYPE} =~ /^(RW2|RWL)$/', # (invalid in DNG-converted files)
    160265        PanasonicHack => 1,
    161266        OffsetPair => 0x117, # (use StripByteCounts as the offset pair)
    162     },
    163     # 0x119 undef[32] - lens distortion data? (http://thinkfat.blogspot.com/2009/02/dissecting-panasonic-rw2-files.html)
     267        NotRealPair => 1,    # (to avoid Validate warning)
     268    },
     269    0x119 => {
     270        Name => 'DistortionInfo',
     271        SubDirectory => { TagTable => 'Image::ExifTool::PanasonicRaw::DistortionInfo' },
     272    },
     273    # 0x11b - chromatic aberration correction (ref 3) (also see forum9366)
     274    0x11c => { #forum9373
     275        Name => 'Gamma',
     276        Writable => 'int16u',
     277        # unfortunately it seems that the scaling factor varies with model...
     278        ValueConv => '$val / ($val >= 1024 ? 1024 : ($val >= 256 ? 256 : 100))',
     279        ValueConvInv => 'int($val * 256 + 0.5)',
     280    },
     281    0x120 => {
     282        Name => 'CameraIFD',
     283        SubDirectory => {
     284            TagTable => 'Image::ExifTool::PanasonicRaw::CameraIFD',
     285            Base => '$start',
     286            ProcessProc => \&Image::ExifTool::ProcessTIFF,
     287        },
     288    },
     289    0x121 => { #forum9295
     290        Name => 'Multishot',
     291        Writable => 'int32u',
     292        PrintConv => {
     293            0 => 'Off',
     294            65536 => 'Pixel Shift',
     295        },
     296    },
     297    # 0x122 - int32u: RAWDataOffset for the GH5s/GX9, or pointer to end of raw data for G9 (forum9295)
    164298    0x2bc => { # PH Extension!!
    165         Name => 'ApplicationNotes',
    166         Writable => 'int8u', # (writable directory!)
     299        Name => 'ApplicationNotes', # (writable directory!)
     300        Writable => 'int8u',
    167301        Format => 'undef',
    168302        Flags => [ 'Binary', 'Protected' ],
    … …  
    170304            DirName => 'XMP',
    171305            TagTable => 'Image::ExifTool::XMP::Main',
     306        },
     307    },
     308    0x001b => { #forum9250
     309        Name => 'NoiseReductionParams',
     310        Writable => 'undef',
     311        Format => 'int16u',
     312        Count => -1,
     313        Flags => 'Protected',
     314        Notes => q{
     315            the camera's default noise reduction setup.  The first number is the number
     316            of entries, then for each entry there are 4 numbers: an ISO speed, and
     317            noise-reduction strengths the R, G and B channels
    172318        },
    173319    },
    … …  
    203349        },
    204350    },
     351    # 0xffff => 'DCSHueShiftValues', #exifprobe (NC)
    205352);
     353
     354# white balance information (ref IB)
     355# (PanasonicRawVersion<200: Digilux 2)
     356%Image::ExifTool::PanasonicRaw::WBInfo = (
     357    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     358    WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
     359    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     360    WRITABLE => 1,
     361    FORMAT => 'int16u',
     362    FIRST_ENTRY => 0,
     363    0 => 'NumWBEntries',
     364    1 => { Name => 'WBType1', %wbTypeInfo },
     365    2 => { Name => 'WB_RBLevels1', Format => 'int16u[2]' },
     366    4 => { Name => 'WBType2', %wbTypeInfo },
     367    5 => { Name => 'WB_RBLevels2', Format => 'int16u[2]' },
     368    7 => { Name => 'WBType3', %wbTypeInfo },
     369    8 => { Name => 'WB_RBLevels3', Format => 'int16u[2]' },
     370    10 => { Name => 'WBType4', %wbTypeInfo },
     371    11 => { Name => 'WB_RBLevels4', Format => 'int16u[2]' },
     372    13 => { Name => 'WBType5', %wbTypeInfo },
     373    14 => { Name => 'WB_RBLevels5', Format => 'int16u[2]' },
     374    16 => { Name => 'WBType6', %wbTypeInfo },
     375    17 => { Name => 'WB_RBLevels6', Format => 'int16u[2]' },
     376    19 => { Name => 'WBType7', %wbTypeInfo },
     377    20 => { Name => 'WB_RBLevels7', Format => 'int16u[2]' },
     378);
     379
     380# white balance information (ref IB)
     381# (PanasonicRawVersion>=200: D-Lux2, D-Lux3, DMC-FZ18/FZ30/LX1/L10)
     382%Image::ExifTool::PanasonicRaw::WBInfo2 = (
     383    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     384    WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
     385    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     386    WRITABLE => 1,
     387    FORMAT => 'int16u',
     388    FIRST_ENTRY => 0,
     389    0 => 'NumWBEntries',
     390    1 => { Name => 'WBType1', %wbTypeInfo },
     391    2 => { Name => 'WB_RGBLevels1', Format => 'int16u[3]' },
     392    5 => { Name => 'WBType2', %wbTypeInfo },
     393    6 => { Name => 'WB_RGBLevels2', Format => 'int16u[3]' },
     394    9 => { Name => 'WBType3', %wbTypeInfo },
     395    10 => { Name => 'WB_RGBLevels3', Format => 'int16u[3]' },
     396    13 => { Name => 'WBType4', %wbTypeInfo },
     397    14 => { Name => 'WB_RGBLevels4', Format => 'int16u[3]' },
     398    17 => { Name => 'WBType5', %wbTypeInfo },
     399    18 => { Name => 'WB_RGBLevels5', Format => 'int16u[3]' },
     400    21 => { Name => 'WBType6', %wbTypeInfo },
     401    22 => { Name => 'WB_RGBLevels6', Format => 'int16u[3]' },
     402    25 => { Name => 'WBType7', %wbTypeInfo },
     403    26 => { Name => 'WB_RGBLevels7', Format => 'int16u[3]' },
     404);
     405
     406# lens distortion information (ref 3)
     407# (distortion correction equation: Ru = scale*(Rd + a*Rd^3 + b*Rd^5 + c*Rd^7), ref 3)
     408%Image::ExifTool::PanasonicRaw::DistortionInfo = (
     409    PROCESS_PROC => \&ProcessDistortionInfo,
     410    WRITE_PROC => \&WriteDistortionInfo,
     411    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     412    # (don't make this family 0 MakerNotes because we don't want it to be a deletable group)
     413    GROUPS => { 0 => 'PanasonicRaw', 1 => 'PanasonicRaw', 2 => 'Image'},
     414    WRITABLE => 1,
     415    FORMAT => 'int16s',
     416    FIRST_ENTRY => 0,
     417    NOTES => 'Lens distortion correction information.',
     418    # 0,1 - checksums
     419    2 => {
     420        Name => 'DistortionParam02',
     421        ValueConv => '$val / 32768',
     422        ValueConvInv => '$val * 32768',
     423    },
     424    # 3 - usually 0, but seen 0x026b when value 5 is non-zero
     425    4 => {
     426        Name => 'DistortionParam04',
     427        ValueConv => '$val / 32768',
     428        ValueConvInv => '$val * 32768',
     429    },
     430    5 => {
     431        Name => 'DistortionScale',
     432        ValueConv => '1 / (1 + $val/32768)',
     433        ValueConvInv => '(1/$val - 1) * 32768',
     434    },
     435    # 6 - seen 0x0000-0x027f
     436    7.1 => {
     437        Name => 'DistortionCorrection',
     438        Mask => 0x0f,
     439        # (have seen the upper 4 bits set for GF5 and GX1, giving a value of -4095 - PH)
     440        PrintConv => { 0 => 'Off', 1 => 'On' },
     441    },
     442    8 => {
     443        Name => 'DistortionParam08',
     444        ValueConv => '$val / 32768',
     445        ValueConvInv => '$val * 32768',
     446    },
     447    9 => {
     448        Name => 'DistortionParam09',
     449        ValueConv => '$val / 32768',
     450        ValueConvInv => '$val * 32768',
     451    },
     452    # 10 - seen 0xfc,0x0101,0x01f4,0x021d,0x0256
     453    11 => {
     454        Name => 'DistortionParam11',
     455        ValueConv => '$val / 32768',
     456        ValueConvInv => '$val * 32768',
     457    },
     458    12 => {
     459        Name => 'DistortionN',
     460        Unknown => 1,
     461    },
     462    # 13 - seen 0x0000,0x01f9-0x02b2
     463    # 14,15 - checksums
     464);
     465
     466# Panasonic RW2 camera IFD written by GH5 (ref PH)
     467# (doesn't seem to be valid for the GF7 or GM5 -- encrypted?)
     468%Image::ExifTool::PanasonicRaw::CameraIFD = (
     469    GROUPS => { 0 => 'PanasonicRaw', 1 => 'CameraIFD', 2 => 'Camera'},
     470    # (don't know what format codes 0x101 and 0x102 are for, so just
     471    #  map them into 4 = int32u for now)
     472    VARS => { MAP_FORMAT => { 0x101 => 4, 0x102 => 4 } },
     473    0x1001 => { #forum9388
     474        Name => 'MultishotOn',
     475        Writable => 'int32u',
     476        PrintConv => { 0 => 'No', 1 => 'Yes' },
     477    },
     478    0x1100 => { #forum9274
     479        Name => 'FocusStepNear',
     480        Writable => 'int16s',
     481    },
     482    0x1101 => { #forum9274 (was forum8484)
     483        Name => 'FocusStepCount',
     484        Writable => 'int16s',
     485    },
     486    0x1102 => { #forum9417
     487        Name => 'FlashFired',
     488        Writable => 'int32u',
     489        PrintConv => { 0 => 'No', 1 => 'Yes' },
     490    },
     491    # 0x1104 - set when camera shoots on lowest possible Extended-ISO (forum9290)
     492    0x1105 => { #forum9392
     493        Name => 'ZoomPosition',
     494        Notes => 'in the range 0-255 for most cameras',
     495        Writable => 'int32u',
     496    },
     497    0x1200 => { #forum9278
     498        Name => 'LensAttached',
     499        Notes => 'many CameraIFD tags are invalid if there is no lens attached',
     500        Writable => 'int32u',
     501        PrintConv => { 0 => 'No', 1 => 'Yes' },
     502    },
     503    # Note: LensTypeMake and LensTypeModel are combined into a Composite LensType tag
     504    # defined in Olympus.pm which has the same values as Olympus:LensType
     505    0x1201 => { #IB
     506        Name => 'LensTypeMake',
     507        Condition => '$format eq "int16u"',
     508        Writable => 'int16u',
     509        # when format is int16u, these values have been observed:
     510        #  0 - Olympus or unknown lens
     511        #  2 - Leica or Lumix lens
     512        # when format is int32u (S models), these values have been observed (ref IB):
     513        #  256 - Leica lens
     514        #  257 - Lumix lens
     515        #  258 - ? (seen once)
     516    },
     517    0x1202 => { #IB
     518        Name => 'LensTypeModel',
     519        Condition => '$format eq "int16u"',
     520        Writable => 'int16u',
     521        RawConv => q{
     522            return undef unless $val;
     523            require Image::ExifTool::Olympus; # (to load Composite LensID)
     524            return $val;
     525        },
     526        ValueConv => '$_=sprintf("%.4x",$val); s/(..)(..)/$2 $1/; $_',
     527        ValueConvInv => '$val =~ s/(..) (..)/$2$1/; hex($val)',
     528    },
     529    0x1203 => { #4
     530        Name => 'FocalLengthIn35mmFormat',
     531        Writable => 'int16u',
     532        PrintConv => '"$val mm"',
     533        PrintConvInv => '$val=~s/\s*mm$//;$val',
     534    },
     535    # 0x1300 - incident light value? (ref forum11395)
     536    0x1301 => { #forum11395
     537        Name => 'ApertureValue',
     538        Writable => 'int16s',
     539        Priority => 0,
     540        ValueConv => '2 ** ($val / 512)',
     541        ValueConvInv => '$val>0 ? 512*log($val)/log(2) : 0',
     542        PrintConv => 'sprintf("%.1f",$val)',
     543        PrintConvInv => '$val',
     544    },
     545    0x1302 => { #forum11395
     546        Name => 'ShutterSpeedValue',
     547        Writable => 'int16s',
     548        Priority => 0,
     549        ValueConv => 'abs($val/256)<100 ? 2**(-$val/256) : 0',
     550        ValueConvInv => '$val>0 ? -256*log($val)/log(2) : -25600',
     551        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
     552        PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
     553    },
     554    0x1303 => { #forum11395
     555        Name => 'SensitivityValue',
     556        Writable => 'int16s',
     557        ValueConv => '$val / 256',
     558        ValueConvInv => 'int($val * 256)',
     559    },
     560    0x1305 => { #forum9384
     561        Name => 'HighISOMode',
     562        Writable => 'int16u',
     563        RawConv => '$val || undef',
     564        PrintConv => { 1 => 'On', 2 => 'Off' },
     565    },
     566    # 0x1306 EV for some models like the GX8 (forum11395)
     567    # 0x140b - scaled overall black level? (ref forum9281)
     568    # 0x1411 - scaled black level per channel difference (ref forum9281)
     569    0x1412 => { #forum11397
     570        Name => 'FacesDetected',
     571        Writable => 'int8u',
     572        PrintConv => { 0 => 'No', 1 => 'Yes' },
     573    },
     574    # 0x2000 - WB tungsten=3, daylight=4 (ref forum9467)
     575    # 0x2009 - scaled black level per channel (ref forum9281)
     576    # 0x3000-0x310b - red/blue balances * 1024 (ref forum9467)
     577    #  0x3000 modifiedTungsten-Red (-2?)
     578    #  0x3001 modifiedTungsten-Blue (-2?)
     579    #  0x3002 modifiedDaylight-Red (-2?)
     580    #  0x3003 modifiedDaylight-Blue (-2?)
     581    #  0x3004 modifiedTungsten-Red (-1?)
     582    #  0x3005 modifiedTungsten-Blue (-1?)
     583    #  0x3006 modifiedDaylight-Red (-1?)
     584    #  0x3007 modifiedDaylight-Blue (-1?)
     585    #  0x3100 DefaultTungsten-Red
     586    #  0x3101 DefaultTungsten-Blue
     587    #  0x3102 DefaultDaylight-Red
     588    #  0x3103 DefaultDaylight-Blue
     589    #  0x3104 modifiedTungsten-Red (+1?)
     590    #  0x3105 modifiedTungsten-Blue (+1?)
     591    #  0x3106 modifiedDaylight-Red (+1?)
     592    #  0x3107 modifiedDaylight-Blue (+1?)
     593    #  0x3108 modifiedTungsten-Red (+2?)
     594    #  0x3109 modifiedTungsten-Blue (+2?)
     595    #  0x310a modifiedDaylight-Red (+2?)
     596    #  0x310b modifiedDaylight-Blue (+2?)
     597    0x3200 => { #forum9275
     598        Name => 'WB_CFA0_LevelDaylight',
     599        Writable => 'int16u',
     600    },
     601    0x3201 => { #forum9275
     602        Name => 'WB_CFA1_LevelDaylight',
     603        Writable => 'int16u',
     604    },
     605    0x3202 => { #forum9275
     606        Name => 'WB_CFA2_LevelDaylight',
     607        Writable => 'int16u',
     608    },
     609    0x3203 => { #forum9275
     610        Name => 'WB_CFA3_LevelDaylight',
     611        Writable => 'int16u',
     612    },
     613    # 0x3204-0x3207 - user multipliers * 1024 ? (ref forum9275)
     614    # 0x320a - scaled maximum value of raw data (scaling = 4x) (ref forum9281)
     615    # 0x3209 - gamma (x256) (ref forum9281)
     616    0x3300 => { #forum9296/9396
     617        Name => 'WhiteBalanceSet',
     618        Writable => 'int8u',
     619        PrintConv => \%panasonicWhiteBalance,
     620        SeparateTable => 'WhiteBalance',
     621    },
     622    0x3420 => { #forum9276
     623        Name => 'WB_RedLevelAuto',
     624        Writable => 'int16u',
     625    },
     626    0x3421 => { #forum9276
     627        Name => 'WB_BlueLevelAuto',
     628        Writable => 'int16u',
     629    },
     630    0x3501 => { #4
     631        Name => 'Orientation',
     632        Writable => 'int8u',
     633        PrintConv => \%Image::ExifTool::Exif::orientation,
     634    },
     635    # 0x3504 = Tag 0x1301+0x1302-0x1303 (Bv = Av+Tv-Sv) (forum11395)
     636    # 0x3505 - same as 0x1300 (forum11395)
     637    0x3600 => { #forum9396
     638        Name => 'WhiteBalanceDetected',
     639        Writable => 'int8u',
     640        PrintConv => \%panasonicWhiteBalance,
     641        SeparateTable => 'WhiteBalance',
     642    },
     643);
     644
     645# PanasonicRaw composite tags
     646%Image::ExifTool::PanasonicRaw::Composite = (
     647    ImageWidth => {
     648        Require => {
     649            0 => 'IFD0:SensorLeftBorder',
     650            1 => 'IFD0:SensorRightBorder',
     651        },
     652        ValueConv => '$val[1] - $val[0]',
     653    },
     654    ImageHeight => {
     655        Require => {
     656            0 => 'IFD0:SensorTopBorder',
     657            1 => 'IFD0:SensorBottomBorder',
     658        },
     659        ValueConv => '$val[1] - $val[0]',
     660    },
     661);
     662
     663# add our composite tags
     664Image::ExifTool::AddCompositeTags('Image::ExifTool::PanasonicRaw');
     665
     666
     667#------------------------------------------------------------------------------
     668# checksum algorithm for lens distortion correction information (ref 3)
     669# Inputs: 0) data ref, 1) start position, 2) number of bytes, 3) incement
     670# Returns: checksum value
     671sub Checksum($$$$)
     672{
     673    my ($dataPt, $start, $num, $inc) = @_;
     674    my $csum = 0;
     675    my $i;
     676    for ($i=0; $i<$num; ++$i) {
     677        $csum = (73 * $csum + Get8u($dataPt, $start + $i * $inc)) % 0xffef;
     678    }
     679    return $csum;
     680}
     681
     682#------------------------------------------------------------------------------
     683# Read lens distortion information
     684# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
     685# Returns: 1 on success
     686sub ProcessDistortionInfo($$$)
     687{
     688    my ($et, $dirInfo, $tagTablePtr) = @_;
     689    my $dataPt = $$dirInfo{DataPt};
     690    my $start = $$dirInfo{DirStart} || 0;
     691    my $size = $$dirInfo{DirLen} || (length($$dataPt) - $start);
     692    if ($size == 32) {
     693        # verify the checksums (ref 3)
     694        my $csum1 = Checksum($dataPt, $start +  4, 12, 1);
     695        my $csum2 = Checksum($dataPt, $start + 16, 12, 1);
     696        my $csum3 = Checksum($dataPt, $start +  2, 14, 2);
     697        my $csum4 = Checksum($dataPt, $start +  3, 14, 2);
     698        my $res = $csum1 ^ Get16u($dataPt, $start + 2) ^
     699                  $csum2 ^ Get16u($dataPt, $start + 28) ^
     700                  $csum3 ^ Get16u($dataPt, $start + 0) ^
     701                  $csum4 ^ Get16u($dataPt, $start + 30);
     702        $et->Warn('Invalid DistortionInfo checksum',1) if $res;
     703    } else {
     704        $et->Warn('Invalid DistortionInfo',1);
     705    }
     706    return $et->ProcessBinaryData($dirInfo, $tagTablePtr);
     707}
     708
     709#------------------------------------------------------------------------------
     710# Write lens distortion information
     711# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
     712# Returns: updated distortion information or undef on error
     713sub WriteDistortionInfo($$$)
     714{
     715    my ($et, $dirInfo, $tagTablePtr) = @_;
     716    $et or return 1;  # (allow dummy access)
     717    my $dat = $et->WriteBinaryData($dirInfo, $tagTablePtr);
     718    if (defined $dat and length($dat) == 32) {
     719        # fix checksums (ref 3)
     720        Set16u(Checksum(\$dat,  4, 12, 1), \$dat,  2);
     721        Set16u(Checksum(\$dat, 16, 12, 1), \$dat, 28);
     722        Set16u(Checksum(\$dat,  2, 14, 2), \$dat,  0);
     723        Set16u(Checksum(\$dat,  3, 14, 2), \$dat, 30);
     724    } else {
     725        $et->Warn('Error wriing DistortionInfo',1);
     726    }
     727    return $dat;
     728}
    206729
    207730#------------------------------------------------------------------------------
    … …  
    261784sub WriteJpgFromRaw($$$)
    262785{
    263     my ($exifTool, $dirInfo, $tagTablePtr) = @_;
     786    my ($et, $dirInfo, $tagTablePtr) = @_;
    264787    my $dataPt = $$dirInfo{DataPt};
    265788    my $byteOrder = GetByteOrder();
    266     my $fileType = $$exifTool{FILE_TYPE};   # RAW, RW2 or RWL
     789    my $fileType = $$et{TIFF_TYPE};   # RAW, RW2 or RWL
    267790    my $dirStart = $$dirInfo{DirStart};
    268791    if ($dirStart) { # DirStart is non-zero in DNG-converted RW2/RWL
    … …  
    277800        OutFile => \$outbuff,
    278801    );
    279     $$exifTool{BASE} = $$dirInfo{DataPos};
    280     $$exifTool{FILE_TYPE} = $$exifTool{TIFF_TYPE} = 'JPEG';
     802    $$et{BASE} = $$dirInfo{DataPos};
     803    $$et{FILE_TYPE} = $$et{TIFF_TYPE} = 'JPEG';
    281804    # use a specialized map so we don't write XMP or IPTC (or other junk) into the JPEG
    282     my $editDirs = $$exifTool{EDIT_DIRS};
    283     my $addDirs = $$exifTool{ADD_DIRS};
    284     $exifTool->InitWriteDirs(\%jpgFromRawMap);
     805    my $editDirs = $$et{EDIT_DIRS};
     806    my $addDirs = $$et{ADD_DIRS};
     807    $et->InitWriteDirs(\%jpgFromRawMap);
    285808    # don't add XMP segment (IPTC won't get added because it is in Photoshop record)
    286     delete $$exifTool{ADD_DIRS}{XMP};
    287     my $result = $exifTool->WriteJPEG(\%dirInfo);
     809    delete $$et{ADD_DIRS}{XMP};
     810    my $result = $et->WriteJPEG(\%dirInfo);
    288811    # restore variables we changed
    289     $$exifTool{BASE} = 0;
    290     $$exifTool{FILE_TYPE} = 'TIFF';
    291     $$exifTool{TIFF_TYPE} = $fileType;
    292     $$exifTool{EDIT_DIRS} = $editDirs;
    293     $$exifTool{ADD_DIRS} = $addDirs;
     812    $$et{BASE} = 0;
     813    $$et{FILE_TYPE} = 'TIFF';
     814    $$et{TIFF_TYPE} = $fileType;
     815    $$et{EDIT_DIRS} = $editDirs;
     816    $$et{ADD_DIRS} = $addDirs;
    294817    SetByteOrder($byteOrder);
    295818    return $result > 0 ? $outbuff : $$dataPt;
    … …  
    302825sub ProcessJpgFromRaw($$$)
    303826{
    304     my ($exifTool, $dirInfo, $tagTablePtr) = @_;
     827    my ($et, $dirInfo, $tagTablePtr) = @_;
    305828    my $dataPt = $$dirInfo{DataPt};
    306829    my $byteOrder = GetByteOrder();
    307     my $fileType = $$exifTool{FILE_TYPE};   # RAW, RW2 or RWL
     830    my $fileType = $$et{TIFF_TYPE};   # RAW, RW2 or RWL
    308831    my $tagInfo = $$dirInfo{TagInfo};
    309     my $verbose = $exifTool->Options('Verbose');
     832    my $verbose = $et->Options('Verbose');
    310833    my ($indent, $out);
    311     $tagInfo or $exifTool->Warn('No tag info for Panasonic JpgFromRaw'), return 0;
     834    $tagInfo or $et->Warn('No tag info for Panasonic JpgFromRaw'), return 0;
    312835    my $dirStart = $$dirInfo{DirStart};
    313836    if ($dirStart) { # DirStart is non-zero in DNG-converted RW2/RWL
    … …  
    316839        $dataPt = \$buff;
    317840    }
    318     $$exifTool{BASE} = $$dirInfo{DataPos} + ($dirStart || 0);
    319     $$exifTool{FILE_TYPE} = $$exifTool{TIFF_TYPE} = 'JPEG';
    320     $$exifTool{DOC_NUM} = 1;
     841    $$et{BASE} = $$dirInfo{DataPos} + ($dirStart || 0);
     842    $$et{FILE_TYPE} = $$et{TIFF_TYPE} = 'JPEG';
     843    $$et{DOC_NUM} = 1;
    321844    # extract information from embedded JPEG
    322845    my %dirInfo = (
    … …  
    325848    );
    326849    if ($verbose) {
    327         my $indent = $$exifTool{INDENT};
    328         $$exifTool{INDENT} = '  ';
    329         $out = $exifTool->Options('TextOut');
     850        my $indent = $$et{INDENT};
     851        $$et{INDENT} = '  ';
     852        $out = $et->Options('TextOut');
    330853        print $out '--- DOC1:JpgFromRaw ',('-'x56),"\n";
    331854    }
    332     my $rtnVal = $exifTool->ProcessJPEG(\%dirInfo);
     855    # fudge HtmlDump base offsets to show as a stand-alone JPEG
     856    $$et{BASE_FUDGE} = $$et{BASE};
     857    my $rtnVal = $et->ProcessJPEG(\%dirInfo);
     858    $$et{BASE_FUDGE} = 0;
    333859    # restore necessary variables for continued RW2/RWL processing
    334     $$exifTool{BASE} = 0;
    335     $$exifTool{FILE_TYPE} = 'TIFF';
    336     $$exifTool{TIFF_TYPE} = $fileType;
    337     delete $$exifTool{DOC_NUM};
     860    $$et{BASE} = 0;
     861    $$et{FILE_TYPE} = 'TIFF';
     862    $$et{TIFF_TYPE} = $fileType;
     863    delete $$et{DOC_NUM};
    338864    SetByteOrder($byteOrder);
    339865    if ($verbose) {
    340         $$exifTool{INDENT} = $indent;
     866        $$et{INDENT} = $indent;
    341867        print $out ('-'x76),"\n";
    342868    }
    … …  
    363889=head1 AUTHOR
    364890
    365 Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
     891Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
    366892
    367893This library is free software; you can redistribute it and/or modify it
Note: See TracChangeset for help on using the changeset viewer.