exiftool_vendored 10.04.0 → 10.23.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of exiftool_vendored might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/bin/Image-ExifTool-10.23/Changes +7480 -0
- data/bin/Image-ExifTool-10.23/MANIFEST +977 -0
- data/bin/Image-ExifTool-10.23/META.yml +28 -0
- data/bin/Image-ExifTool-10.23/Makefile.PL +46 -0
- data/bin/Image-ExifTool-10.23/README +236 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/exif2iptc.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/exif2xmp.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/gps2xmp.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/iptc2exif.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/iptc2xmp.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/iptcCore.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/pdf2xmp.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/xmp2exif.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/xmp2gps.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/xmp2iptc.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/arg_files/xmp2pdf.args +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/config_files/convert_regions.config +0 -0
- data/bin/Image-ExifTool-10.23/config_files/example.config +343 -0
- data/bin/Image-ExifTool-10.23/config_files/gps2utm.config +256 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/config_files/photoshop_paths.config +0 -0
- data/bin/Image-ExifTool-10.23/config_files/picasa_faces.config +382 -0
- data/bin/Image-ExifTool-10.23/exiftool +6311 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/fmt_files/gpx.fmt +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/fmt_files/gpx_wpt.fmt +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/fmt_files/kml.fmt +0 -0
- data/bin/Image-ExifTool-10.23/html/ExifTool.html +2093 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/MIE1.1-20070121.pdf +0 -0
- data/bin/Image-ExifTool-10.23/html/Shift.html +173 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/AFCP.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/AIFF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/APE.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/APP12.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/ASF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Apple.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Audible.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/BMP.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/BPG.html +118 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Canon.html +9534 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/CanonCustom.html +2141 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/CanonRaw.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/CanonVRD.html +2020 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Casio.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Composite.html +736 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/DICOM.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/DNG.html +293 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/DPX.html +229 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/DV.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/DarwinCore.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/DjVu.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/EXE.html +741 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/EXIF.html +3394 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Extra.html +469 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/FLAC.html +183 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/FLIR.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Flash.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/FlashPix.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Font.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/FotoStation.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/FujiFilm.html +824 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/GE.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/GIF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/GIMP.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/GPS.html +230 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/GeoTiff.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/H264.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/HP.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/HTML.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/ICC_Profile.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/ID3.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/IPTC.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/ISO.html +159 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/ITC.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/JFIF.html +62 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/JPEG.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/JVC.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Jpeg2000.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Kodak.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/KyoceraRaw.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/LNK.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Leaf.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Lytro.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/M2TS.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MIE.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MIFF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MNG.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MOI.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MPC.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MPEG.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MPF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MWG.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MXF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Matroska.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Microsoft.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Minolta.html +2625 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/MinoltaRaw.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Motorola.html +32 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Nikon.html +5907 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/NikonCapture.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/NikonCustom.html +6590 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Nintendo.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/OOXML.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Ogg.html +49 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Olympus.html +3649 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/OpenEXR.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Opus.html +62 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PDF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PGF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PICT.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PLIST.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/PLUS.html +2613 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PNG.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PSP.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Palm.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Panasonic.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PanasonicRaw.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Pentax.html +4770 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/PhaseOne.html +253 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PhotoCD.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PhotoMechanic.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Photoshop.html +739 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PostScript.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/PrintIM.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Qualcomm.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/QuickTime.html +6060 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/RIFF.html +1382 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/RSRC.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/RTF.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Radiance.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Rawzor.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Real.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Reconyx.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Ricoh.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Samsung.html +616 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Sanyo.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Scalado.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Shortcuts.html +279 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Sigma.html +528 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/SigmaRaw.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Sony.html +10264 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/SonyIDC.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Stim.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Theora.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Torrent.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/Unknown.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/VCard.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/Vorbis.html +243 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/XMP.html +8945 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/ZIP.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/iWork.html +0 -0
- data/bin/Image-ExifTool-10.23/html/TagNames/index.html +217 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/TagNames/style.css +0 -0
- data/bin/Image-ExifTool-10.23/html/ancient_history.html +8209 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/canon_raw.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/commentary.html +0 -0
- data/bin/Image-ExifTool-10.23/html/config.html +355 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/data_members.html +0 -0
- data/bin/Image-ExifTool-10.23/html/exiftool_pod.html +2535 -0
- data/bin/Image-ExifTool-10.23/html/faq.html +1566 -0
- data/bin/Image-ExifTool-10.23/html/filename.html +352 -0
- data/bin/Image-ExifTool-10.23/html/geotag.html +659 -0
- data/bin/Image-ExifTool-10.23/html/history.html +243 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/htmldump.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/idiosyncracies.html +0 -0
- data/bin/Image-ExifTool-10.23/html/index.html +1341 -0
- data/bin/Image-ExifTool-10.23/html/install.html +261 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/metafiles.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/overview.png +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/standards.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/struct.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/style.css +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/under.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/verbose.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/html/writing.html +0 -0
- data/bin/Image-ExifTool-10.23/lib/File/RandomAccess.pm +378 -0
- data/bin/Image-ExifTool-10.23/lib/File/RandomAccess.pod +231 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool.pm +7747 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool.pod +2542 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/AES.pm +501 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/AFCP.pm +286 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/AIFF.pm +289 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/APE.pm +282 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/APP12.pm +322 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ASF.pm +885 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Apple.pm +129 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Audible.pm +317 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/BMP.pm +179 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/BPG.pm +251 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/BZZ.pm +472 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/BigTIFF.pm +282 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/BuildTagLookup.pm +2527 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Canon.pm +8734 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/CanonCustom.pm +2667 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/CanonRaw.pm +910 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/CanonVRD.pm +2273 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/CaptureOne.pm +235 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Casio.pm +2058 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Charset.pm +423 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Arabic.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Baltic.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Cyrillic.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Greek.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Hebrew.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/JIS.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Latin.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Latin2.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacArabic.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacChineseCN.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacChineseTW.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacCroatian.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacCyrillic.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacGreek.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacHebrew.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacIceland.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacJapanese.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacKorean.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacLatin2.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacRSymbol.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacRoman.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacRomanian.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacThai.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/MacTurkish.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/PDFDoc.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/ShiftJIS.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Symbol.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Thai.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Turkish.pm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/lib/Image/ExifTool/Charset/Vietnam.pm +0 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DICOM.pm +3874 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DNG.pm +835 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DPX.pm +182 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DV.pm +319 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DarwinCore.pm +322 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/DjVu.pm +376 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/EXE.pm +1401 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Exif.pm +5863 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/FLAC.pm +297 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/FLIR.pm +1533 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Fixup.pm +366 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Flash.pm +755 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/FlashPix.pm +1935 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Font.pm +647 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/FotoStation.pm +261 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/FujiFilm.pm +1232 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/GE.pm +81 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/GIF.pm +542 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/GIMP.pm +258 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/GPS.pm +558 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/GeoTiff.pm +2263 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Geotag.pm +1241 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/H264.pm +1110 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/HP.pm +263 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/HTML.pm +576 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/HtmlDump.pm +897 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ICC_Profile.pm +1000 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ID3.pm +1570 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/IPTC.pm +1264 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ISO.pm +206 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ITC.pm +215 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Import.pm +329 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/InDesign.pm +277 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/JPEG.pm +605 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/JPEGDigest.pm +2616 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/JVC.pm +130 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Jpeg2000.pm +882 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Kodak.pm +2096 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/KyoceraRaw.pm +173 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/LNK.pm +723 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/cs.pm +1588 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/de.pm +8692 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/en_ca.pm +934 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/en_gb.pm +977 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/es.pm +4019 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/fi.pm +2854 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/fr.pm +4758 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/it.pm +7918 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/ja.pm +5835 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/ko.pm +2330 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/nl.pm +3222 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/pl.pm +1276 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/ru.pm +768 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/sv.pm +638 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/tr.pm +544 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/zh_cn.pm +1330 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lang/zh_tw.pm +801 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Leaf.pm +516 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Lytro.pm +217 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/M2TS.pm +729 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MIE.pm +2564 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MIEUnits.pod +377 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MIFF.pm +279 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MNG.pm +684 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MOI.pm +158 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MPC.pm +156 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MPEG.pm +736 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MPF.pm +292 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MWG.pm +753 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MXF.pm +3031 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MakerNotes.pm +1736 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Matroska.pm +892 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Microsoft.pm +904 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Minolta.pm +2981 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/MinoltaRaw.pm +534 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Motorola.pm +62 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Nikon.pm +7970 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/NikonCapture.pm +940 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/NikonCustom.pm +7361 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Nintendo.pm +128 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/OOXML.pm +409 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Ogg.pm +240 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Olympus.pm +3985 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/OpenEXR.pm +323 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Opus.pm +98 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PDF.pm +2367 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PGF.pm +143 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PICT.pm +1260 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PLIST.pm +448 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PLUS.pm +2607 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PNG.pm +1227 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PPM.pm +169 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PSP.pm +306 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Palm.pm +403 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Panasonic.pm +2374 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PanasonicRaw.pm +643 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Pentax.pm +6063 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PhaseOne.pm +707 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PhotoCD.pm +507 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PhotoMechanic.pm +256 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Photoshop.pm +939 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PostScript.pm +699 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/PrintIM.pm +125 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Qualcomm.pm +1344 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/QuickTime.pm +6601 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/README +994 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/RIFF.pm +1587 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/RSRC.pm +241 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/RTF.pm +383 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Radiance.pm +144 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Rawzor.pm +189 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Real.pm +739 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Reconyx.pm +190 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Ricoh.pm +1148 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Samsung.pm +1177 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Sanyo.pm +440 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Scalado.pm +141 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Shift.pl +596 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Shortcuts.pm +337 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Sigma.pm +754 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/SigmaRaw.pm +670 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Sony.pm +9623 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/SonyIDC.pm +332 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Stim.pm +196 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/TagInfoXML.pm +827 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/TagLookup.pm +9250 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/TagNames.pod +29842 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Theora.pm +145 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Torrent.pm +317 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Unknown.pm +66 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/VCard.pm +405 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Vorbis.pm +255 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WriteCanonRaw.pl +637 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WriteExif.pl +2466 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WriteIPTC.pl +706 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WritePDF.pl +771 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WritePNG.pl +390 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WritePhotoshop.pl +266 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WritePostScript.pl +772 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WriteQuickTime.pl +358 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/WriteXMP.pl +1380 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/Writer.pl +6220 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/XMP.pm +4071 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/XMP2.pl +1284 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/XMPStruct.pl +843 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/ZIP.pm +667 -0
- data/bin/Image-ExifTool-10.23/lib/Image/ExifTool/iWork.pm +223 -0
- data/bin/Image-ExifTool-10.23/perl-Image-ExifTool.spec +113 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/AFCP.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/AFCP_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/AFCP_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/AIFF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/AIFF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/APE.t +0 -0
- data/bin/Image-ExifTool-10.23/t/APE_2.out +30 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/APE_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ASF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ASF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Audible.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Audible_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/BMP.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/BMP_2.out +0 -0
- data/bin/Image-ExifTool-10.23/t/BPG.t +28 -0
- data/bin/Image-ExifTool-10.23/t/BPG_2.out +92 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/BigTIFF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/BigTIFF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Canon.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonRaw.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonRaw_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonRaw_4.out +0 -0
- data/bin/Image-ExifTool-10.23/t/CanonRaw_5.out +209 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonRaw_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonRaw_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_11.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_12.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_13.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_14.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_15.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_16.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_17.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_18.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_19.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_20.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_21.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/CanonVRD_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Canon_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Canon_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Casio_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DICOM.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DICOM_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DNG.t +0 -0
- data/bin/Image-ExifTool-10.23/t/DNG_2.out +329 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DNG_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DPX.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DPX_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DV.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DV_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DjVu.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/DjVu_2.out +0 -0
- data/bin/Image-ExifTool-10.23/t/EXE.t +31 -0
- data/bin/Image-ExifTool-10.23/t/EXE_2.out +34 -0
- data/bin/Image-ExifTool-10.23/t/EXE_3.out +10 -0
- data/bin/Image-ExifTool-10.23/t/EXE_4.out +8 -0
- data/bin/Image-ExifTool-10.23/t/EXE_5.out +9 -0
- data/bin/Image-ExifTool-10.23/t/EXE_6.out +8 -0
- data/bin/Image-ExifTool-10.23/t/EXE_7.out +10 -0
- data/bin/Image-ExifTool-10.23/t/ExifTool.t +328 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_16.out +0 -0
- data/bin/Image-ExifTool-10.23/t/ExifTool_17.out +598 -0
- data/bin/Image-ExifTool-10.23/t/ExifTool_2.out +427 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_20.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_21.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_22.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_23.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_24.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_25.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_26.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_27.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_28.out +0 -0
- data/bin/Image-ExifTool-10.23/t/ExifTool_29.out +426 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_3.out +0 -0
- data/bin/Image-ExifTool-10.23/t/ExifTool_30.out +2 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ExifTool_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FLAC.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FLAC_2.out +0 -0
- data/bin/Image-ExifTool-10.23/t/FLAC_3.out +20 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FLIR.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FLIR_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FLIR_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Flash.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FlashPix.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FlashPix_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Flash_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Flash_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Font_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FotoStation.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FotoStation_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FotoStation_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FujiFilm.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FujiFilm_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FujiFilm_3.out +0 -0
- data/bin/Image-ExifTool-10.23/t/FujiFilm_4.out +143 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/FujiFilm_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GE.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GE_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GE_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIF_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIF_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIMP.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GIMP_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GPS.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GPS_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GPS_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GeoTiff.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GeoTiff_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GeoTiff_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/GeoTiff_4.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Geotag.t +201 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_10.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Geotag_11.out +3 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Geotag_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/HTML.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/HTML_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/IPTC.t +0 -0
- data/bin/Image-ExifTool-10.23/t/IPTC_2.out +69 -0
- data/bin/Image-ExifTool-10.23/t/IPTC_4.out +67 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/IPTC_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/IPTC_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/IPTC_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/IPTC_8.out +0 -0
- data/bin/Image-ExifTool-10.23/t/ISO.t +28 -0
- data/bin/Image-ExifTool-10.23/t/ISO_2.out +19 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ITC.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ITC_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/InDesign.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/InDesign_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/InDesign_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/InDesign_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/JVC.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/JVC_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/JVC_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Jpeg2000.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Jpeg2000_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Jpeg2000_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Jpeg2000_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Kodak.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Kodak_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Kodak_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/KyoceraRaw.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/KyoceraRaw_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/LNK.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/LNK_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_1.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_10.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_11.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_12.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_13.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_14.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_15.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_16.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_17.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_18.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lang_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lytro.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Lytro_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/M2TS.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/M2TS_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIE.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIE_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIE_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIE_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIE_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MIFF.t +0 -0
- data/bin/Image-ExifTool-10.23/t/MIFF_2.out +114 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MOI.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MOI_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MP3.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MP3_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MWG_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MXF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/MXF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Matroska.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Matroska_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Minolta.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Minolta_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Minolta_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Minolta_4.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Motorola.t +29 -0
- data/bin/Image-ExifTool-10.23/t/Motorola_2.out +97 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Nikon_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Olympus.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Olympus_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Olympus_3.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Olympus_4.out +194 -0
- data/bin/Image-ExifTool-10.23/t/Olympus_5.out +266 -0
- data/bin/Image-ExifTool-10.23/t/Olympus_6.out +153 -0
- data/bin/Image-ExifTool-10.23/t/Olympus_7.out +483 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Olympus_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/OpenEXR.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/OpenEXR_2.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Opus.t +27 -0
- data/bin/Image-ExifTool-10.23/t/Opus_2.out +26 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_10.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_11.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_12.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_14.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_15.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_16.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_17.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_18.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_19.out +0 -0
- data/bin/Image-ExifTool-10.23/t/PDF_2.out +127 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_20.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_22.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PDF_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PGF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PGF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PICT.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PICT_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PLIST.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PLIST_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PLIST_3.out +0 -0
- data/bin/Image-ExifTool-10.23/t/PLUS.t +45 -0
- data/bin/Image-ExifTool-10.23/t/PLUS_2.out +31 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PNG.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PNG_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PNG_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PNG_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PNG_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PPM.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PPM_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PPM_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PSP.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PSP_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Palm.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Palm_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Panasonic.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Panasonic_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Panasonic_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Panasonic_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Panasonic_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Pentax.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Pentax_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Pentax_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Pentax_4.out +0 -0
- data/bin/Image-ExifTool-10.23/t/PhaseOne.t +38 -0
- data/bin/Image-ExifTool-10.23/t/PhaseOne_2.out +99 -0
- data/bin/Image-ExifTool-10.23/t/PhaseOne_3.out +170 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PhotoCD.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PhotoCD_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PhotoMechanic.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PhotoMechanic_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PhotoMechanic_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Photoshop.t +0 -0
- data/bin/Image-ExifTool-10.23/t/Photoshop_2.out +109 -0
- data/bin/Image-ExifTool-10.23/t/Photoshop_3.out +117 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PostScript.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PostScript_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/PostScript_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/QuickTime.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/QuickTime_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/QuickTime_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/QuickTime_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/QuickTime_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RIFF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RIFF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RIFF_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RIFF_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RTF.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/RTF_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Radiance.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Radiance_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Real.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Real_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Real_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Real_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Ricoh.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Ricoh_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Ricoh_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Ricoh_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sanyo.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sanyo_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sanyo_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sigma.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sigma_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sigma_3.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Sigma_4.out +65 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sigma_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sony.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sony_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sony_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Sony_5.out +0 -0
- data/bin/Image-ExifTool-10.23/t/TestLib.pm +431 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Torrent.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Torrent_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Unknown.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Unknown_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Unknown_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/VCard.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/VCard_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/VCard_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Vorbis.t +0 -0
- data/bin/Image-ExifTool-10.23/t/Vorbis_2.out +29 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_10.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_11.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_13.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_14.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_15.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_16.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_17.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_18.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_19.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_22.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_24.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_25.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_26.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_27.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_28.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_29.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_30.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Writer_31.out +108 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_32.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_33.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_34.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_35.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_36.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_37.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_38.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_39.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_40.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_41.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_42.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_43.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_44.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_45.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_46.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_47.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_48.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_50.out +0 -0
- data/bin/Image-ExifTool-10.23/t/Writer_51.out +414 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_52.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_53.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_54.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_55.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_56.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/Writer_9.out +0 -0
- data/bin/Image-ExifTool-10.23/t/XMP.t +570 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_10.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_11.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_12.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_13.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_14.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_15.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_16.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_17.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_18.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_19.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_20.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_21.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_22.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_23.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_24.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_25.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_26.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_27.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_28.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_29.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_30.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_31.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_32.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_34.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_36.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_37.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_39.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_40.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_41.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_42.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_43.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_44.out +0 -0
- data/bin/Image-ExifTool-10.23/t/XMP_45.out +23 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_8.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/XMP_9.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP.t +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_2.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_3.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_4.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_5.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_6.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/ZIP_7.out +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/AFCP.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/AIFF.aif +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/APE.ape +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/APE.mpc +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ASF.wmv +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Audible.aa +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/BMP.bmp +0 -0
- data/bin/Image-ExifTool-10.23/t/images/BPG.bpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/BigTIFF.btf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Canon.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Canon1DmkIII.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CanonRaw.cr2 +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CanonRaw.crw +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CanonVRD.dr4 +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CanonVRD.vrd +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CaptureOne.eip +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Casio.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Casio2.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/CasioQVCI.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/DICOM.dcm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/DNG.dng +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/DPX.dpx +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/DV.dv +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/DjVu.djvu +0 -0
- data/bin/Image-ExifTool-10.23/t/images/EXE.a +0 -0
- data/bin/Image-ExifTool-10.23/t/images/EXE.dylib +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/EXE.elf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/EXE.exe +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/EXE.macho +0 -0
- data/bin/Image-ExifTool-10.23/t/images/EXE.so +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ExifTool.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ExifTool.tif +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ExtendedXMP.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FLAC.flac +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FLAC.ogg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FLIR.fpf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FLIR.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Flash.flv +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Flash.swf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FlashPix.ppt +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.afm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.dfont +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.pfa +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.pfb +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.pfm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Font.ttf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FotoStation.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FujiFilm.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/FujiFilm.raf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/GE.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/GIF.gif +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/GIMP.xcf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/GPS.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/GeoTiff.tif +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag.gpx +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag.igc +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag.kml +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag.log +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag.xml +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag2.log +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Geotag3.log +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/HTML.html +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/IPTC.jpg +0 -0
- data/bin/Image-ExifTool-10.23/t/images/ISO.iso +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ITC.itc +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/InDesign.indd +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/JVC.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/JVC2.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Jpeg2000.j2c +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Jpeg2000.jp2 +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Kodak.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/KyoceraRaw.raw +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/LNK.lnk +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Lytro.lfp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/M2TS.mts +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MIE.mie +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MIFF.miff +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MOI.moi +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MP3.mp3 +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MWG.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/MXF.mxf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Matroska.mkv +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Minolta.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Minolta.mrw +0 -0
- data/bin/Image-ExifTool-10.23/t/images/Motorola.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Nikon.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Nikon.nef +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/NikonD2Hs.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/NikonD70.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/OOXML.docx +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Olympus.dss +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Olympus.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Olympus2.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/OlympusE1.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/OpenDoc.ods +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/OpenEXR.exr +0 -0
- data/bin/Image-ExifTool-10.23/t/images/Opus.opus +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PDF.pdf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PDF2.pdf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PGF.pgf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PICT.pict +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PLIST-bin.plist +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PLIST-xml.plist +0 -0
- data/bin/Image-ExifTool-10.23/t/images/PLUS.xmp +127 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PNG.png +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PPM.ppm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PSP.psp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Palm.mobi +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Panasonic.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Panasonic.rw2 +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Pentax.avi +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Pentax.jpg +0 -0
- data/bin/Image-ExifTool-10.23/t/images/PhaseOne.iiq +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PhotoCD.pcd +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PhotoMechanic.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Photoshop.psd +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/PostScript.eps +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/QuickTime.m4a +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/QuickTime.mov +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/RIFF.avi +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/RIFF.wav +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/RIFF.webp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/RTF.rtf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Radiance.hdr +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Real.ra +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Real.ram +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Real.rm +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Ricoh.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Ricoh2.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Sanyo.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Sigma.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Sigma.x3f +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/SigmaDP2.x3f +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Sony.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Sony.pmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Torrent.torrent +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Unknown.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/VCard.ics +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/VCard.vcf +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Vorbis.ogg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/Writer.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP.inx +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP.jpg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP.svg +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP.xml +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP2.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP3.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP4.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP5.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/XMP6.xmp +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ZIP.gz +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/ZIP.zip +0 -0
- data/bin/{Image-ExifTool-10.04 → Image-ExifTool-10.23}/t/images/iWork.numbers +0 -0
- data/lib/exiftool_vendored/version.rb +1 -1
- metadata +980 -941
- data/bin/Image-ExifTool-10.04/Changes +0 -7227
- data/bin/Image-ExifTool-10.04/MANIFEST +0 -937
- data/bin/Image-ExifTool-10.04/META.yml +0 -27
- data/bin/Image-ExifTool-10.04/Makefile.PL +0 -41
- data/bin/Image-ExifTool-10.04/README +0 -233
- data/bin/Image-ExifTool-10.04/config_files/example.config +0 -343
- data/bin/Image-ExifTool-10.04/config_files/picasa_faces.config +0 -370
- data/bin/Image-ExifTool-10.04/exiftool +0 -6260
- data/bin/Image-ExifTool-10.04/html/ExifTool.html +0 -2070
- data/bin/Image-ExifTool-10.04/html/Shift.html +0 -173
- data/bin/Image-ExifTool-10.04/html/TagNames/Canon.html +0 -9344
- data/bin/Image-ExifTool-10.04/html/TagNames/CanonCustom.html +0 -2081
- data/bin/Image-ExifTool-10.04/html/TagNames/CanonVRD.html +0 -1958
- data/bin/Image-ExifTool-10.04/html/TagNames/Composite.html +0 -705
- data/bin/Image-ExifTool-10.04/html/TagNames/DNG.html +0 -291
- data/bin/Image-ExifTool-10.04/html/TagNames/DPX.html +0 -224
- data/bin/Image-ExifTool-10.04/html/TagNames/EXE.html +0 -697
- data/bin/Image-ExifTool-10.04/html/TagNames/EXIF.html +0 -3383
- data/bin/Image-ExifTool-10.04/html/TagNames/Extra.html +0 -437
- data/bin/Image-ExifTool-10.04/html/TagNames/FLAC.html +0 -183
- data/bin/Image-ExifTool-10.04/html/TagNames/FujiFilm.html +0 -813
- data/bin/Image-ExifTool-10.04/html/TagNames/GPS.html +0 -230
- data/bin/Image-ExifTool-10.04/html/TagNames/JFIF.html +0 -61
- data/bin/Image-ExifTool-10.04/html/TagNames/Minolta.html +0 -2614
- data/bin/Image-ExifTool-10.04/html/TagNames/Nikon.html +0 -4836
- data/bin/Image-ExifTool-10.04/html/TagNames/NikonCustom.html +0 -5633
- data/bin/Image-ExifTool-10.04/html/TagNames/Ogg.html +0 -44
- data/bin/Image-ExifTool-10.04/html/TagNames/Olympus.html +0 -3534
- data/bin/Image-ExifTool-10.04/html/TagNames/Pentax.html +0 -4693
- data/bin/Image-ExifTool-10.04/html/TagNames/PhaseOne.html +0 -253
- data/bin/Image-ExifTool-10.04/html/TagNames/Photoshop.html +0 -575
- data/bin/Image-ExifTool-10.04/html/TagNames/QuickTime.html +0 -6040
- data/bin/Image-ExifTool-10.04/html/TagNames/RIFF.html +0 -1344
- data/bin/Image-ExifTool-10.04/html/TagNames/Samsung.html +0 -604
- data/bin/Image-ExifTool-10.04/html/TagNames/Shortcuts.html +0 -277
- data/bin/Image-ExifTool-10.04/html/TagNames/Sigma.html +0 -469
- data/bin/Image-ExifTool-10.04/html/TagNames/Sony.html +0 -8781
- data/bin/Image-ExifTool-10.04/html/TagNames/Vorbis.html +0 -228
- data/bin/Image-ExifTool-10.04/html/TagNames/XMP.html +0 -9175
- data/bin/Image-ExifTool-10.04/html/TagNames/index.html +0 -211
- data/bin/Image-ExifTool-10.04/html/ancient_history.html +0 -7903
- data/bin/Image-ExifTool-10.04/html/config.html +0 -355
- data/bin/Image-ExifTool-10.04/html/exiftool_pod.html +0 -2514
- data/bin/Image-ExifTool-10.04/html/faq.html +0 -1534
- data/bin/Image-ExifTool-10.04/html/filename.html +0 -352
- data/bin/Image-ExifTool-10.04/html/geotag.html +0 -654
- data/bin/Image-ExifTool-10.04/html/history.html +0 -263
- data/bin/Image-ExifTool-10.04/html/index.html +0 -1331
- data/bin/Image-ExifTool-10.04/html/install.html +0 -255
- data/bin/Image-ExifTool-10.04/lib/File/RandomAccess.pm +0 -378
- data/bin/Image-ExifTool-10.04/lib/File/RandomAccess.pod +0 -231
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool.pm +0 -7499
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool.pod +0 -2504
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/AES.pm +0 -501
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/AFCP.pm +0 -286
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/AIFF.pm +0 -289
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/APE.pm +0 -264
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/APP12.pm +0 -322
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/ASF.pm +0 -885
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Apple.pm +0 -128
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Audible.pm +0 -317
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/BMP.pm +0 -179
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/BZZ.pm +0 -472
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/BigTIFF.pm +0 -282
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/BuildTagLookup.pm +0 -2513
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Canon.pm +0 -8482
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/CanonCustom.pm +0 -2582
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/CanonRaw.pm +0 -910
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/CanonVRD.pm +0 -2240
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/CaptureOne.pm +0 -235
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Casio.pm +0 -2058
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Charset.pm +0 -396
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DICOM.pm +0 -3874
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DNG.pm +0 -835
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DPX.pm +0 -181
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DV.pm +0 -319
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DarwinCore.pm +0 -322
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/DjVu.pm +0 -376
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/EXE.pm +0 -1253
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Exif.pm +0 -4687
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/FLAC.pm +0 -297
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/FLIR.pm +0 -1533
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Fixup.pm +0 -354
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Flash.pm +0 -755
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/FlashPix.pm +0 -1935
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Font.pm +0 -647
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/FotoStation.pm +0 -261
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/FujiFilm.pm +0 -1196
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/GE.pm +0 -81
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/GIF.pm +0 -542
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/GIMP.pm +0 -258
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/GPS.pm +0 -558
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/GeoTiff.pm +0 -2263
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Geotag.pm +0 -1221
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/H264.pm +0 -1112
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/HP.pm +0 -263
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/HTML.pm +0 -576
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/HtmlDump.pm +0 -895
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/ICC_Profile.pm +0 -1000
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/ID3.pm +0 -1569
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/IPTC.pm +0 -1264
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/ITC.pm +0 -215
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Import.pm +0 -329
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/InDesign.pm +0 -277
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/JPEG.pm +0 -605
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/JPEGDigest.pm +0 -2511
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/JVC.pm +0 -130
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Jpeg2000.pm +0 -882
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Kodak.pm +0 -2096
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/KyoceraRaw.pm +0 -173
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/LNK.pm +0 -723
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/cs.pm +0 -1588
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/de.pm +0 -8692
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/en_ca.pm +0 -848
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/en_gb.pm +0 -863
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/es.pm +0 -4019
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/fi.pm +0 -2854
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/fr.pm +0 -4758
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/it.pm +0 -7918
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/ja.pm +0 -5835
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/ko.pm +0 -2330
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/nl.pm +0 -3222
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/pl.pm +0 -1276
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/ru.pm +0 -768
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/sv.pm +0 -638
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/tr.pm +0 -544
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/zh_cn.pm +0 -1330
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lang/zh_tw.pm +0 -801
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Leaf.pm +0 -516
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Lytro.pm +0 -217
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/M2TS.pm +0 -725
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MIE.pm +0 -2564
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MIEUnits.pod +0 -377
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MIFF.pm +0 -279
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MNG.pm +0 -684
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MOI.pm +0 -158
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MPC.pm +0 -156
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MPEG.pm +0 -736
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MPF.pm +0 -292
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MWG.pm +0 -753
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MXF.pm +0 -3031
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MakerNotes.pm +0 -1725
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Matroska.pm +0 -892
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Microsoft.pm +0 -904
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Minolta.pm +0 -2961
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/MinoltaRaw.pm +0 -534
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Nikon.pm +0 -6751
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/NikonCapture.pm +0 -940
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/NikonCustom.pm +0 -6331
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Nintendo.pm +0 -128
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/OOXML.pm +0 -409
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Ogg.pm +0 -237
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Olympus.pm +0 -3797
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/OpenEXR.pm +0 -324
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PDF.pm +0 -2328
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PGF.pm +0 -143
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PICT.pm +0 -1260
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PLIST.pm +0 -453
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PNG.pm +0 -1227
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PPM.pm +0 -169
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PSP.pm +0 -306
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Palm.pm +0 -403
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Panasonic.pm +0 -2374
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PanasonicRaw.pm +0 -643
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Pentax.pm +0 -5973
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PhaseOne.pm +0 -551
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PhotoCD.pm +0 -507
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PhotoMechanic.pm +0 -256
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Photoshop.pm +0 -650
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PostScript.pm +0 -696
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/PrintIM.pm +0 -125
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Qualcomm.pm +0 -1344
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/QuickTime.pm +0 -6576
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/README +0 -981
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/RIFF.pm +0 -1530
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/RSRC.pm +0 -241
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/RTF.pm +0 -383
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Radiance.pm +0 -144
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Rawzor.pm +0 -189
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Real.pm +0 -739
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Reconyx.pm +0 -190
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Ricoh.pm +0 -1148
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Samsung.pm +0 -1168
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Sanyo.pm +0 -440
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Scalado.pm +0 -141
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Shift.pl +0 -596
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Shortcuts.pm +0 -336
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Sigma.pm +0 -684
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/SigmaRaw.pm +0 -668
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Sony.pm +0 -9219
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/SonyIDC.pm +0 -331
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Stim.pm +0 -196
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/TagInfoXML.pm +0 -827
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/TagLookup.pm +0 -8948
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/TagNames.pod +0 -29199
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Theora.pm +0 -145
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Torrent.pm +0 -317
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Unknown.pm +0 -66
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/VCard.pm +0 -405
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Vorbis.pm +0 -238
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WriteCanonRaw.pl +0 -637
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WriteExif.pl +0 -3741
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WriteIPTC.pl +0 -706
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WritePDF.pl +0 -768
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WritePNG.pl +0 -390
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WritePhotoshop.pl +0 -266
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WritePostScript.pl +0 -772
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WriteQuickTime.pl +0 -358
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/WriteXMP.pl +0 -1367
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/Writer.pl +0 -6165
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/XMP.pm +0 -4034
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/XMP2.pl +0 -1579
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/XMPStruct.pl +0 -828
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/ZIP.pm +0 -667
- data/bin/Image-ExifTool-10.04/lib/Image/ExifTool/iWork.pm +0 -223
- data/bin/Image-ExifTool-10.04/perl-Image-ExifTool.spec +0 -112
- data/bin/Image-ExifTool-10.04/t/APE_2.out +0 -29
- data/bin/Image-ExifTool-10.04/t/CanonRaw_5.out +0 -209
- data/bin/Image-ExifTool-10.04/t/DNG_2.out +0 -328
- data/bin/Image-ExifTool-10.04/t/EXE.t +0 -31
- data/bin/Image-ExifTool-10.04/t/EXE_2.out +0 -41
- data/bin/Image-ExifTool-10.04/t/EXE_3.out +0 -16
- data/bin/Image-ExifTool-10.04/t/EXE_4.out +0 -15
- data/bin/Image-ExifTool-10.04/t/ExifTool.t +0 -304
- data/bin/Image-ExifTool-10.04/t/ExifTool_17.out +0 -598
- data/bin/Image-ExifTool-10.04/t/ExifTool_2.out +0 -418
- data/bin/Image-ExifTool-10.04/t/FLAC_3.out +0 -20
- data/bin/Image-ExifTool-10.04/t/FujiFilm_4.out +0 -141
- data/bin/Image-ExifTool-10.04/t/Geotag.t +0 -185
- data/bin/Image-ExifTool-10.04/t/IPTC_2.out +0 -60
- data/bin/Image-ExifTool-10.04/t/IPTC_4.out +0 -58
- data/bin/Image-ExifTool-10.04/t/MIFF_2.out +0 -110
- data/bin/Image-ExifTool-10.04/t/Olympus_4.out +0 -194
- data/bin/Image-ExifTool-10.04/t/Olympus_5.out +0 -266
- data/bin/Image-ExifTool-10.04/t/Olympus_6.out +0 -153
- data/bin/Image-ExifTool-10.04/t/Olympus_7.out +0 -483
- data/bin/Image-ExifTool-10.04/t/PDF_2.out +0 -118
- data/bin/Image-ExifTool-10.04/t/Photoshop_2.out +0 -98
- data/bin/Image-ExifTool-10.04/t/Photoshop_3.out +0 -110
- data/bin/Image-ExifTool-10.04/t/Sigma_4.out +0 -65
- data/bin/Image-ExifTool-10.04/t/TestLib.pm +0 -427
- data/bin/Image-ExifTool-10.04/t/Vorbis_2.out +0 -29
- data/bin/Image-ExifTool-10.04/t/Writer_31.out +0 -99
- data/bin/Image-ExifTool-10.04/t/Writer_51.out +0 -405
- data/bin/Image-ExifTool-10.04/t/XMP.t +0 -557
@@ -0,0 +1,2466 @@
|
|
1
|
+
#------------------------------------------------------------------------------
|
2
|
+
# File: WriteExif.pl
|
3
|
+
#
|
4
|
+
# Description: Write EXIF meta information
|
5
|
+
#
|
6
|
+
# Revisions: 12/13/2004 - P. Harvey Created
|
7
|
+
#------------------------------------------------------------------------------
|
8
|
+
|
9
|
+
package Image::ExifTool::Exif;
|
10
|
+
|
11
|
+
use strict;
|
12
|
+
use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber
|
13
|
+
%compression %photometricInterpretation %orientation);
|
14
|
+
|
15
|
+
use Image::ExifTool::Fixup;
|
16
|
+
|
17
|
+
# some information may be stored in different IFD's with the same meaning.
|
18
|
+
# Use this lookup to decide when we should delete information that is stored
|
19
|
+
# in another IFD when we write it to the preferred IFD.
|
20
|
+
my %crossDelete = (
|
21
|
+
ExifIFD => 'IFD0',
|
22
|
+
IFD0 => 'ExifIFD',
|
23
|
+
);
|
24
|
+
|
25
|
+
# mandatory tag default values
|
26
|
+
my %mandatory = (
|
27
|
+
IFD0 => {
|
28
|
+
0x011a => 72, # XResolution
|
29
|
+
0x011b => 72, # YResolution
|
30
|
+
0x0128 => 2, # ResolutionUnit (inches)
|
31
|
+
0x0213 => 1, # YCbCrPositioning (centered)
|
32
|
+
# 0x8769 => ????, # ExifOffset
|
33
|
+
},
|
34
|
+
IFD1 => {
|
35
|
+
0x0103 => 6, # Compression (JPEG)
|
36
|
+
0x011a => 72, # XResolution
|
37
|
+
0x011b => 72, # YResolution
|
38
|
+
0x0128 => 2, # ResolutionUnit (inches)
|
39
|
+
},
|
40
|
+
ExifIFD => {
|
41
|
+
0x9000 => '0230', # ExifVersion
|
42
|
+
0x9101 => "1 2 3 0",# ComponentsConfiguration
|
43
|
+
0xa000 => '0100', # FlashpixVersion
|
44
|
+
0xa001 => 0xffff, # ColorSpace (uncalibrated)
|
45
|
+
# 0xa002 => ????, # ExifImageWidth
|
46
|
+
# 0xa003 => ????, # ExifImageHeight
|
47
|
+
},
|
48
|
+
GPS => {
|
49
|
+
0x0000 => '2 3 0 0',# GPSVersionID
|
50
|
+
},
|
51
|
+
InteropIFD => {
|
52
|
+
0x0002 => '0100', # InteropVersion
|
53
|
+
},
|
54
|
+
);
|
55
|
+
|
56
|
+
#------------------------------------------------------------------------------
|
57
|
+
# Inverse print conversion for LensInfo
|
58
|
+
# Inputs: 0) lens info string
|
59
|
+
# Returns: PrintConvInv of string
|
60
|
+
sub ConvertLensInfo($)
|
61
|
+
{
|
62
|
+
my $val = shift;
|
63
|
+
my @a = GetLensInfo($val, 1); # (allow unknown "?" values)
|
64
|
+
return @a ? join(' ', @a) : $val;
|
65
|
+
}
|
66
|
+
|
67
|
+
#------------------------------------------------------------------------------
|
68
|
+
# Get binary CFA Pattern from a text string
|
69
|
+
# Inputs: Print-converted CFA pattern (eg. '[Blue,Green][Green,Red]')
|
70
|
+
# Returns: CFA pattern as a string of numbers
|
71
|
+
sub GetCFAPattern($)
|
72
|
+
{
|
73
|
+
my $val = shift;
|
74
|
+
my @rows = split /\]\s*\[/, $val;
|
75
|
+
@rows or warn("Rows not properly bracketed by '[]'\n"), return undef;
|
76
|
+
my @cols = split /,/, $rows[0];
|
77
|
+
@cols or warn("Colors not separated by ','\n"), return undef;
|
78
|
+
my $ny = @cols;
|
79
|
+
my @a = (scalar(@rows), scalar(@cols));
|
80
|
+
my %cfaLookup = (red=>0, green=>1, blue=>2, cyan=>3, magenta=>4, yellow=>5, white=>6);
|
81
|
+
my $row;
|
82
|
+
foreach $row (@rows) {
|
83
|
+
@cols = split /,/, $row;
|
84
|
+
@cols == $ny or warn("Inconsistent number of colors in each row\n"), return undef;
|
85
|
+
foreach (@cols) {
|
86
|
+
tr/ \]\[//d; # remove remaining brackets and any spaces
|
87
|
+
my $c = $cfaLookup{lc($_)};
|
88
|
+
defined $c or warn("Unknown color '$_'\n"), return undef;
|
89
|
+
push @a, $c;
|
90
|
+
}
|
91
|
+
}
|
92
|
+
return "@a";
|
93
|
+
}
|
94
|
+
|
95
|
+
#------------------------------------------------------------------------------
|
96
|
+
# validate raw values for writing
|
97
|
+
# Inputs: 0) ExifTool ref, 1) tagInfo hash ref, 2) raw value ref
|
98
|
+
# Returns: error string or undef (and possibly changes value) on success
|
99
|
+
sub CheckExif($$$)
|
100
|
+
{
|
101
|
+
my ($et, $tagInfo, $valPtr) = @_;
|
102
|
+
my $format = $$tagInfo{Format} || $$tagInfo{Writable} || $$tagInfo{Table}{WRITABLE};
|
103
|
+
if (not $format or $format eq '1') {
|
104
|
+
if ($$tagInfo{Groups}{0} eq 'MakerNotes') {
|
105
|
+
return undef; # OK to have no format for makernotes
|
106
|
+
} else {
|
107
|
+
return 'No writable format';
|
108
|
+
}
|
109
|
+
}
|
110
|
+
return Image::ExifTool::CheckValue($valPtr, $format, $$tagInfo{Count});
|
111
|
+
}
|
112
|
+
|
113
|
+
#------------------------------------------------------------------------------
|
114
|
+
# encode exif ASCII/Unicode text from UTF8 or Latin
|
115
|
+
# Inputs: 0) ExifTool ref, 1) text string
|
116
|
+
# Returns: encoded string
|
117
|
+
# Note: MUST be called Raw conversion time so the EXIF byte order is known!
|
118
|
+
sub EncodeExifText($$)
|
119
|
+
{
|
120
|
+
my ($et, $val) = @_;
|
121
|
+
# does the string contain special characters?
|
122
|
+
if ($val =~ /[\x80-\xff]/) {
|
123
|
+
my $order = $et->GetNewValue('ExifUnicodeByteOrder');
|
124
|
+
return "UNICODE\0" . $et->Encode($val,'UTF16',$order);
|
125
|
+
} else {
|
126
|
+
return "ASCII\0\0\0$val";
|
127
|
+
}
|
128
|
+
}
|
129
|
+
|
130
|
+
#------------------------------------------------------------------------------
|
131
|
+
# rebuild maker notes to properly contain all value data
|
132
|
+
# (some manufacturers put value data outside maker notes!!)
|
133
|
+
# Inputs: 0) ExifTool object ref, 1) tag table ref, 2) dirInfo ref
|
134
|
+
# Returns: new maker note data (and creates MAKER_NOTE_FIXUP), or undef on error
|
135
|
+
sub RebuildMakerNotes($$$)
|
136
|
+
{
|
137
|
+
my ($et, $tagTablePtr, $dirInfo) = @_;
|
138
|
+
my $dirStart = $$dirInfo{DirStart};
|
139
|
+
my $dirLen = $$dirInfo{DirLen};
|
140
|
+
my $dataPt = $$dirInfo{DataPt};
|
141
|
+
my $dataPos = $$dirInfo{DataPos} || 0;
|
142
|
+
my $rtnValue;
|
143
|
+
my %subdirInfo = %$dirInfo;
|
144
|
+
|
145
|
+
delete $$et{MAKER_NOTE_FIXUP};
|
146
|
+
|
147
|
+
# don't need to rebuild text, BinaryData or PreviewImage maker notes
|
148
|
+
my $tagInfo = $$dirInfo{TagInfo};
|
149
|
+
my $subdir = $$tagInfo{SubDirectory};
|
150
|
+
my $proc = $$subdir{ProcessProc} || $$tagTablePtr{PROCESS_PROC} || \&ProcessExif;
|
151
|
+
if (($proc ne \&ProcessExif and $$tagInfo{Name} =~ /Text/) or
|
152
|
+
$proc eq \&Image::ExifTool::ProcessBinaryData or
|
153
|
+
($$tagInfo{PossiblePreview} and $dirLen > 6 and
|
154
|
+
substr($$dataPt, $dirStart, 3) eq "\xff\xd8\xff"))
|
155
|
+
{
|
156
|
+
return substr($$dataPt, $dirStart, $dirLen);
|
157
|
+
}
|
158
|
+
my $saveOrder = GetByteOrder();
|
159
|
+
my $loc = Image::ExifTool::MakerNotes::LocateIFD($et,\%subdirInfo);
|
160
|
+
if (defined $loc) {
|
161
|
+
my $makerFixup = $subdirInfo{Fixup} = new Image::ExifTool::Fixup;
|
162
|
+
# create new exiftool object to rewrite the directory without changing it
|
163
|
+
my $newTool = new Image::ExifTool;
|
164
|
+
$newTool->Options(
|
165
|
+
IgnoreMinorErrors => $$et{OPTIONS}{IgnoreMinorErrors},
|
166
|
+
FixBase => $$et{OPTIONS}{FixBase},
|
167
|
+
);
|
168
|
+
$newTool->Init(); # must do this before calling WriteDirectory()!
|
169
|
+
# don't copy over preview image
|
170
|
+
$newTool->SetNewValue(PreviewImage => '');
|
171
|
+
# copy all transient members over in case they are used for writing
|
172
|
+
# (Make, Model, etc)
|
173
|
+
foreach (grep /[a-z]/, keys %$et) {
|
174
|
+
$$newTool{$_} = $$et{$_};
|
175
|
+
}
|
176
|
+
# fix base offsets if specified
|
177
|
+
$newTool->Options(FixBase => $et->Options('FixBase'));
|
178
|
+
# set GENERATE_PREVIEW_INFO flag so PREVIEW_INFO will be generated
|
179
|
+
$$newTool{GENERATE_PREVIEW_INFO} = 1;
|
180
|
+
# drop any large tags
|
181
|
+
$$newTool{DROP_TAGS} = 1;
|
182
|
+
# initialize other necessary data members
|
183
|
+
$$newTool{FILE_TYPE} = $$et{FILE_TYPE};
|
184
|
+
$$newTool{TIFF_TYPE} = $$et{TIFF_TYPE};
|
185
|
+
# rewrite maker notes
|
186
|
+
$rtnValue = $newTool->WriteDirectory(\%subdirInfo, $tagTablePtr);
|
187
|
+
if (defined $rtnValue and length $rtnValue) {
|
188
|
+
# add the dummy/empty preview image if necessary
|
189
|
+
if ($$newTool{PREVIEW_INFO}) {
|
190
|
+
$makerFixup->SetMarkerPointers(\$rtnValue, 'PreviewImage', length($rtnValue));
|
191
|
+
$rtnValue .= $$newTool{PREVIEW_INFO}{Data};
|
192
|
+
delete $$newTool{PREVIEW_INFO};
|
193
|
+
}
|
194
|
+
# add makernote header
|
195
|
+
if ($loc) {
|
196
|
+
my $hdr = substr($$dataPt, $dirStart, $loc);
|
197
|
+
# special case: convert Pentax/Samsung DNG maker notes to JPEG style
|
198
|
+
# (in JPEG, Pentax makernotes are absolute and start with "AOC\0" for some
|
199
|
+
# models, but in DNG images they are stored in tag 0xc634 of IFD0 and
|
200
|
+
# start with either "PENTAX \0" or "SAMSUNG\0")
|
201
|
+
if ($$dirInfo{Parent} eq 'IFD0' and $hdr =~ /^(PENTAX |SAMSUNG)\0/) {
|
202
|
+
# convert to JPEG-style AOC maker notes if used by this model
|
203
|
+
# (Note: this expression also appears in Exif.pm)
|
204
|
+
if ($$et{Model} =~ /\b(K(-[57mrx]|(10|20|100|110|200)D|2000)|GX(10|20))\b/) {
|
205
|
+
$hdr =~ s/^(PENTAX |SAMSUNG)\0/AOC\0/;
|
206
|
+
# save fixup because AOC maker notes have absolute offsets
|
207
|
+
$$et{MAKER_NOTE_FIXUP} = $makerFixup;
|
208
|
+
}
|
209
|
+
}
|
210
|
+
$rtnValue = $hdr . $rtnValue;
|
211
|
+
# adjust fixup for shift in start position
|
212
|
+
$$makerFixup{Start} += length $hdr;
|
213
|
+
}
|
214
|
+
# shift offsets according to original position of maker notes,
|
215
|
+
# and relative to the makernotes Base
|
216
|
+
$$makerFixup{Shift} += $dataPos + $dirStart +
|
217
|
+
$$dirInfo{Base} - $subdirInfo{Base};
|
218
|
+
# repair incorrect offsets if offsets were fixed
|
219
|
+
$$makerFixup{Shift} += $subdirInfo{FixedBy} || 0;
|
220
|
+
# fix up pointers to the specified offset
|
221
|
+
$makerFixup->ApplyFixup(\$rtnValue);
|
222
|
+
# save fixup information unless offsets were relative
|
223
|
+
unless ($subdirInfo{Relative}) {
|
224
|
+
# set shift so offsets are all relative to start of maker notes
|
225
|
+
$$makerFixup{Shift} -= $dataPos + $dirStart;
|
226
|
+
$$et{MAKER_NOTE_FIXUP} = $makerFixup; # save fixup for later
|
227
|
+
}
|
228
|
+
}
|
229
|
+
}
|
230
|
+
SetByteOrder($saveOrder);
|
231
|
+
|
232
|
+
return $rtnValue;
|
233
|
+
}
|
234
|
+
|
235
|
+
#------------------------------------------------------------------------------
|
236
|
+
# Sort IFD directory entries
|
237
|
+
# Inputs: 0) data reference, 1) directory start, 2) number of entries,
|
238
|
+
# 3) flag to treat 0 as a valid tag ID (as opposed to an empty IFD entry)
|
239
|
+
sub SortIFD($$$;$)
|
240
|
+
{
|
241
|
+
my ($dataPt, $dirStart, $numEntries, $allowZero) = @_;
|
242
|
+
my ($index, %entries);
|
243
|
+
# split the directory into separate entries
|
244
|
+
for ($index=0; $index<$numEntries; ++$index) {
|
245
|
+
my $entry = $dirStart + 2 + 12 * $index;
|
246
|
+
my $tagID = Get16u($dataPt, $entry);
|
247
|
+
my $entryData = substr($$dataPt, $entry, 12);
|
248
|
+
# silly software can pad directories with zero entries -- put these at the end
|
249
|
+
$tagID = 0x10000 unless $tagID or $index == 0 or $allowZero;
|
250
|
+
# add new entry (allow for duplicate tag ID's, which shouldn't normally happen)
|
251
|
+
if ($entries{$tagID}) {
|
252
|
+
$entries{$tagID} .= $entryData;
|
253
|
+
} else {
|
254
|
+
$entries{$tagID} = $entryData;
|
255
|
+
}
|
256
|
+
}
|
257
|
+
# sort the directory entries
|
258
|
+
my @sortedTags = sort { $a <=> $b } keys %entries;
|
259
|
+
# generate the sorted IFD
|
260
|
+
my $newDir = '';
|
261
|
+
foreach (@sortedTags) {
|
262
|
+
$newDir .= $entries{$_};
|
263
|
+
}
|
264
|
+
# replace original directory with new, sorted one
|
265
|
+
substr($$dataPt, $dirStart + 2, 12 * $numEntries) = $newDir;
|
266
|
+
}
|
267
|
+
|
268
|
+
#------------------------------------------------------------------------------
|
269
|
+
# Validate IFD entries (strict validation to test possible chained IFD's)
|
270
|
+
# Inputs: 0) dirInfo ref (must have RAF set), 1) optional DirStart
|
271
|
+
# Returns: true if IFD looks OK
|
272
|
+
sub ValidateIFD($;$)
|
273
|
+
{
|
274
|
+
my ($dirInfo, $dirStart) = @_;
|
275
|
+
my $raf = $$dirInfo{RAF} or return 0;
|
276
|
+
my $base = $$dirInfo{Base};
|
277
|
+
$dirStart = $$dirInfo{DirStart} || 0 unless defined $dirStart;
|
278
|
+
my $offset = $dirStart + ($$dirInfo{DataPos} || 0);
|
279
|
+
my ($buff, $index);
|
280
|
+
$raf->Seek($offset + $base, 0) and $raf->Read($buff,2) == 2 or return 0;
|
281
|
+
my $numEntries = Get16u(\$buff,0);
|
282
|
+
$numEntries > 1 and $numEntries < 64 or return 0;
|
283
|
+
my $len = 12 * $numEntries;
|
284
|
+
$raf->Read($buff, $len) == $len or return 0;
|
285
|
+
my $lastID = -1;
|
286
|
+
for ($index=0; $index<$numEntries; ++$index) {
|
287
|
+
my $entry = 12 * $index;
|
288
|
+
my $tagID = Get16u(\$buff, $entry);
|
289
|
+
$tagID > $lastID or $$dirInfo{AllowOutOfOrderTags} or return 0;
|
290
|
+
my $format = Get16u(\$buff, $entry+2);
|
291
|
+
$format > 0 and $format <= 13 or return 0;
|
292
|
+
my $count = Get32u(\$buff, $entry+4);
|
293
|
+
$count > 0 or return 0;
|
294
|
+
$lastID = $tagID;
|
295
|
+
}
|
296
|
+
return 1;
|
297
|
+
}
|
298
|
+
|
299
|
+
#------------------------------------------------------------------------------
|
300
|
+
# Get sorted list of offsets used in IFD
|
301
|
+
# Inputs: 0) data ref, 1) directory start, 2) dataPos, 3) IFD entries, 4) tag table ref
|
302
|
+
# Returns: 0) sorted list of offsets (only offsets after the end of the IFD)
|
303
|
+
# 1) hash of list indices keyed by offset value
|
304
|
+
# Notes: This is used in a patch to fix the count for tags in Kodak SubIFD3
|
305
|
+
sub GetOffList($$$$$)
|
306
|
+
{
|
307
|
+
my ($dataPt, $dirStart, $dataPos, $numEntries, $tagTablePtr) = @_;
|
308
|
+
my $ifdEnd = $dirStart + 2 + 12 * $numEntries + $dataPos;
|
309
|
+
my ($index, $offset, %offHash);
|
310
|
+
for ($index=0; $index<$numEntries; ++$index) {
|
311
|
+
my $entry = $dirStart + 2 + 12 * $index;
|
312
|
+
my $format = Get16u($dataPt, $entry + 2);
|
313
|
+
next if $format < 1 or $format > 13;
|
314
|
+
my $count = Get16u($dataPt, $entry + 4);
|
315
|
+
my $size = $formatSize[$format] * $count;
|
316
|
+
if ($size <= 4) {
|
317
|
+
my $tagID = Get16u($dataPt, $entry);
|
318
|
+
next unless ref $$tagTablePtr{$tagID} eq 'HASH' and $$tagTablePtr{$tagID}{FixCount};
|
319
|
+
}
|
320
|
+
my $offset = Get16u($dataPt, $entry + 8);
|
321
|
+
$offHash{$offset} = 1 if $offset >= $ifdEnd;
|
322
|
+
}
|
323
|
+
# set offset hash values to indices in list
|
324
|
+
my @offList = sort keys %offHash;
|
325
|
+
$index = 0;
|
326
|
+
foreach $offset (@offList) {
|
327
|
+
$offHash{$offset} = $index++;
|
328
|
+
}
|
329
|
+
return(\@offList, \%offHash);
|
330
|
+
}
|
331
|
+
|
332
|
+
#------------------------------------------------------------------------------
|
333
|
+
# Update TIFF_END member if defined
|
334
|
+
# Inputs: 0) ExifTool ref, 1) end of valid TIFF data
|
335
|
+
sub UpdateTiffEnd($$)
|
336
|
+
{
|
337
|
+
my ($et, $end) = @_;
|
338
|
+
if (defined $$et{TIFF_END} and
|
339
|
+
$$et{TIFF_END} < $end)
|
340
|
+
{
|
341
|
+
$$et{TIFF_END} = $end;
|
342
|
+
}
|
343
|
+
}
|
344
|
+
|
345
|
+
#------------------------------------------------------------------------------
|
346
|
+
# Handle error while writing EXIF
|
347
|
+
# Inputs: 0) ExifTool ref, 1) error string, 2) tag table ref
|
348
|
+
# Returns: undef on fatal error, or '' if minor error is ignored
|
349
|
+
sub ExifErr($$$)
|
350
|
+
{
|
351
|
+
my ($et, $errStr, $tagTablePtr) = @_;
|
352
|
+
# MakerNote errors are minor by default
|
353
|
+
my $minor = ($$tagTablePtr{GROUPS}{0} eq 'MakerNotes');
|
354
|
+
if ($$tagTablePtr{VARS} and $$tagTablePtr{VARS}{MINOR_ERRORS}) {
|
355
|
+
$et->Warn("$errStr. IFD dropped.") and return '' if $minor;
|
356
|
+
$minor = 1;
|
357
|
+
}
|
358
|
+
return undef if $et->Error($errStr, $minor);
|
359
|
+
return '';
|
360
|
+
}
|
361
|
+
|
362
|
+
#------------------------------------------------------------------------------
|
363
|
+
# Read/Write IFD with TIFF-like header (used by DNG 1.2)
|
364
|
+
# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
|
365
|
+
# Returns: Reading: 1 on success, otherwise returns 0 and sets a Warning
|
366
|
+
# Writing: new data block or undef on error
|
367
|
+
sub ProcessTiffIFD($$$)
|
368
|
+
{
|
369
|
+
my ($et, $dirInfo, $tagTablePtr) = @_;
|
370
|
+
$et or return 1; # allow dummy access
|
371
|
+
my $raf = $$dirInfo{RAF};
|
372
|
+
my $base = $$dirInfo{Base} || 0;
|
373
|
+
my $dirName = $$dirInfo{DirName};
|
374
|
+
my $magic = $$dirInfo{Subdir}{Magic} || 0x002a;
|
375
|
+
my $buff;
|
376
|
+
|
377
|
+
# structured with a TIFF-like header and relative offsets
|
378
|
+
$raf->Seek($base, 0) and $raf->Read($buff, 8) == 8 or return 0;
|
379
|
+
unless (SetByteOrder(substr($buff,0,2)) and Get16u(\$buff, 2) == $magic) {
|
380
|
+
my $msg = "Invalid $dirName header";
|
381
|
+
if ($$dirInfo{IsWriting}) {
|
382
|
+
$et->Error($msg);
|
383
|
+
return undef;
|
384
|
+
} else {
|
385
|
+
$et->Warn($msg);
|
386
|
+
return 0;
|
387
|
+
}
|
388
|
+
}
|
389
|
+
my $offset = Get32u(\$buff, 4);
|
390
|
+
my %dirInfo = (
|
391
|
+
DirName => $$dirInfo{DirName},
|
392
|
+
Parent => $$dirInfo{Parent},
|
393
|
+
Base => $base,
|
394
|
+
DataPt => \$buff,
|
395
|
+
DataLen => length $buff,
|
396
|
+
DataPos => 0,
|
397
|
+
DirStart => $offset,
|
398
|
+
DirLen => length($buff) - $offset,
|
399
|
+
RAF => $raf,
|
400
|
+
NewDataPos => 8,
|
401
|
+
);
|
402
|
+
if ($$dirInfo{IsWriting}) {
|
403
|
+
# rewrite the Camera Profile IFD
|
404
|
+
my $newDir = WriteExif($et, \%dirInfo, $tagTablePtr);
|
405
|
+
# don't add header if error writing directory ($newDir is undef)
|
406
|
+
# or if directory is being deleted ($newDir is empty)
|
407
|
+
return $newDir unless $newDir;
|
408
|
+
# return directory with TIFF-like header
|
409
|
+
return GetByteOrder() . Set16u($magic) . Set32u(8) . $newDir;
|
410
|
+
}
|
411
|
+
if ($$et{HTML_DUMP}) {
|
412
|
+
my $tip = sprintf("Byte order: %s endian\nIdentifier: 0x%.4x\n%s offset: 0x%.4x",
|
413
|
+
(GetByteOrder() eq 'II') ? 'Little' : 'Big', $magic, $dirName, $offset);
|
414
|
+
$et->HDump($base, 8, "$dirName header", $tip, 0);
|
415
|
+
}
|
416
|
+
return ProcessExif($et, \%dirInfo, $tagTablePtr);
|
417
|
+
}
|
418
|
+
|
419
|
+
#------------------------------------------------------------------------------
|
420
|
+
# Write EXIF directory
|
421
|
+
# Inputs: 0) ExifTool object ref, 1) source dirInfo ref, 2) tag table ref
|
422
|
+
# Returns: Exif data block (may be empty if no Exif data) or undef on error
|
423
|
+
# Notes: Increments ExifTool CHANGED flag for each tag changed. Also updates
|
424
|
+
# TIFF_END if defined with location of end of original TIFF image.
|
425
|
+
# Returns IFD data in the following order:
|
426
|
+
# 1. IFD0 directory followed by its data
|
427
|
+
# 2. SubIFD directory followed by its data, thumbnail and image
|
428
|
+
# 3. GlobalParameters, EXIF, GPS, Interop IFD's each with their data
|
429
|
+
# 4. IFD1,IFD2,... directories each followed by their data
|
430
|
+
# 5. Thumbnail and/or image data for each IFD, with IFD0 image last
|
431
|
+
sub WriteExif($$$)
|
432
|
+
{
|
433
|
+
my ($et, $dirInfo, $tagTablePtr) = @_;
|
434
|
+
$et or return 1; # allow dummy access to autoload this package
|
435
|
+
my $origDirInfo = $dirInfo; # save original dirInfo
|
436
|
+
my $dataPt = $$dirInfo{DataPt};
|
437
|
+
unless ($dataPt) {
|
438
|
+
my $emptyData = '';
|
439
|
+
$dataPt = \$emptyData;
|
440
|
+
}
|
441
|
+
my $dataPos = $$dirInfo{DataPos} || 0;
|
442
|
+
my $dirStart = $$dirInfo{DirStart} || 0;
|
443
|
+
my $dataLen = $$dirInfo{DataLen} || length($$dataPt);
|
444
|
+
my $dirLen = $$dirInfo{DirLen} || ($dataLen - $dirStart);
|
445
|
+
my $base = $$dirInfo{Base} || 0;
|
446
|
+
my $firstBase = $base;
|
447
|
+
my $raf = $$dirInfo{RAF};
|
448
|
+
my $dirName = $$dirInfo{DirName} || 'unknown';
|
449
|
+
my $fixup = $$dirInfo{Fixup} || new Image::ExifTool::Fixup;
|
450
|
+
my $imageDataFlag = $$dirInfo{ImageData} || '';
|
451
|
+
my $verbose = $et->Options('Verbose');
|
452
|
+
my $out = $et->Options('TextOut');
|
453
|
+
my ($nextIfdPos, %offsetData, $inMakerNotes);
|
454
|
+
my (@offsetInfo, %xDelete, $strEnc);
|
455
|
+
my $deleteAll = 0;
|
456
|
+
my $newData = ''; # initialize buffer to receive new directory data
|
457
|
+
my @imageData; # image data blocks to copy later if requested
|
458
|
+
my $name = $$dirInfo{Name};
|
459
|
+
$name = $dirName unless $name and $dirName eq 'MakerNotes' and $name !~ /^MakerNote/;
|
460
|
+
|
461
|
+
# set encoding for strings
|
462
|
+
$strEnc = $et->Options('CharsetEXIF') if $$tagTablePtr{GROUPS}{0} eq 'EXIF';
|
463
|
+
|
464
|
+
# allow multiple IFD's in IFD0-IFD1-IFD2... chain
|
465
|
+
$$dirInfo{Multi} = 1 if $dirName =~ /^(IFD0|SubIFD)$/ and not defined $$dirInfo{Multi};
|
466
|
+
$inMakerNotes = 1 if $$tagTablePtr{GROUPS}{0} eq 'MakerNotes';
|
467
|
+
my $ifd;
|
468
|
+
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
469
|
+
# loop through each IFD
|
470
|
+
#
|
471
|
+
for ($ifd=0; ; ++$ifd) { # loop through multiple IFD's
|
472
|
+
|
473
|
+
# save pointer to start of this IFD within the newData
|
474
|
+
my $newStart = length($newData);
|
475
|
+
my @subdirs; # list of subdirectory data and tag table pointers
|
476
|
+
# determine if directory is contained within our data
|
477
|
+
my $mustRead;
|
478
|
+
if ($dirStart < 0 or $dirStart > $dataLen-2) {
|
479
|
+
$mustRead = 1;
|
480
|
+
} elsif ($dirLen > 2) {
|
481
|
+
my $len = 2 + 12 * Get16u($dataPt, $dirStart);
|
482
|
+
$mustRead = 1 if $dirStart + $len > $dataLen;
|
483
|
+
}
|
484
|
+
# read IFD from file if necessary
|
485
|
+
if ($mustRead) {
|
486
|
+
if ($raf) {
|
487
|
+
# read the count of entries in this IFD
|
488
|
+
my $offset = $dirStart + $dataPos;
|
489
|
+
my ($buff, $buf2);
|
490
|
+
unless ($raf->Seek($offset + $base, 0) and $raf->Read($buff,2) == 2) {
|
491
|
+
return ExifErr($et, "Bad IFD or truncated file in $name", $tagTablePtr);
|
492
|
+
}
|
493
|
+
my $len = 12 * Get16u(\$buff,0);
|
494
|
+
# (also read next IFD pointer if available)
|
495
|
+
unless ($raf->Read($buf2, $len+4) >= $len) {
|
496
|
+
return ExifErr($et, "Error reading $name", $tagTablePtr);
|
497
|
+
}
|
498
|
+
$buff .= $buf2;
|
499
|
+
# make copy of dirInfo since we're going to modify it
|
500
|
+
my %newDirInfo = %$dirInfo;
|
501
|
+
$dirInfo = \%newDirInfo;
|
502
|
+
# update directory parameters for the newly loaded IFD
|
503
|
+
$dataPt = $$dirInfo{DataPt} = \$buff;
|
504
|
+
$dirStart = $$dirInfo{DirStart} = 0;
|
505
|
+
$dataPos = $$dirInfo{DataPos} = $offset;
|
506
|
+
$dataLen = $$dirInfo{DataLen} = length $buff;
|
507
|
+
$dirLen = $$dirInfo{DirLen} = $dataLen;
|
508
|
+
# only account for nextIFD pointer if we are going to use it
|
509
|
+
$len += 4 if $dataLen==$len+6 and ($$dirInfo{Multi} or $buff =~ /\0{4}$/);
|
510
|
+
UpdateTiffEnd($et, $offset+$base+2+$len);
|
511
|
+
} elsif ($dirLen) {
|
512
|
+
# error if we can't load IFD (unless we are creating
|
513
|
+
# from scratch, in which case dirLen will be zero)
|
514
|
+
my $str = $et->Options('IgnoreMinorErrors') ? 'Deleted bad' : 'Bad';
|
515
|
+
$et->Error("$str $name directory", 1);
|
516
|
+
}
|
517
|
+
}
|
518
|
+
my ($index, $dirEnd, $numEntries);
|
519
|
+
if ($dirStart + 4 < $dataLen) {
|
520
|
+
$numEntries = Get16u($dataPt, $dirStart);
|
521
|
+
$dirEnd = $dirStart + 2 + 12 * $numEntries;
|
522
|
+
if ($dirEnd > $dataLen) {
|
523
|
+
return ExifErr($et, "Truncated $name directory", $tagTablePtr);
|
524
|
+
}
|
525
|
+
# sort entries if necessary (but not in maker notes IFDs)
|
526
|
+
unless ($inMakerNotes) {
|
527
|
+
my $lastID = -1;
|
528
|
+
for ($index=0; $index<$numEntries; ++$index) {
|
529
|
+
my $tagID = Get16u($dataPt, $dirStart + 2 + 12 * $index);
|
530
|
+
# check for proper sequence (but ignore null entries at end)
|
531
|
+
if ($tagID < $lastID and ($tagID or $$tagTablePtr{0})) {
|
532
|
+
SortIFD($dataPt, $dirStart, $numEntries, $$tagTablePtr{0});
|
533
|
+
$et->Warn("Entries in $name were out of sequence. Fixed.",1);
|
534
|
+
last;
|
535
|
+
}
|
536
|
+
$lastID = $tagID;
|
537
|
+
}
|
538
|
+
}
|
539
|
+
} else {
|
540
|
+
$numEntries = 0;
|
541
|
+
$dirEnd = $dirStart;
|
542
|
+
}
|
543
|
+
|
544
|
+
# loop through new values and accumulate all information for this IFD
|
545
|
+
my (%set, %mayDelete, $tagInfo);
|
546
|
+
my $wrongDir = $crossDelete{$dirName};
|
547
|
+
foreach $tagInfo ($et->GetNewTagInfoList($tagTablePtr)) {
|
548
|
+
my $tagID = $$tagInfo{TagID};
|
549
|
+
# evaluate conditional lists now if necessary
|
550
|
+
if (ref $$tagTablePtr{$tagID} eq 'ARRAY' or $$tagInfo{Condition}) {
|
551
|
+
my $curInfo = $et->GetTagInfo($tagTablePtr, $tagID);
|
552
|
+
if (defined $curInfo and not $curInfo) {
|
553
|
+
# need value to evaluate the condition
|
554
|
+
my $val = $et->GetNewValue($tagInfo);
|
555
|
+
# must convert to binary for evaluating in Condition
|
556
|
+
if ($$tagInfo{Format} and defined $val) {
|
557
|
+
$val = WriteValue($val, $$tagInfo{Format}, $$tagInfo{Count});
|
558
|
+
}
|
559
|
+
if (defined $val) {
|
560
|
+
my $fmt = $$tagInfo{Writable} || $$tagInfo{Format} || 'undef';
|
561
|
+
my $cnt = $$tagInfo{Count} || 1;
|
562
|
+
# always use old format/count for Condition in maker notes
|
563
|
+
if ($inMakerNotes) {
|
564
|
+
for ($index=0; $index<$numEntries; ++$index) {
|
565
|
+
my $entry = $dirStart + 2 + 12 * $index;
|
566
|
+
my $id = Get16u($dataPt, $entry);
|
567
|
+
if ($id eq $tagID) {
|
568
|
+
my $f = Get16u($dataPt, $entry + 2);
|
569
|
+
if ($formatName[$f]) {
|
570
|
+
$fmt = $formatName[$f];
|
571
|
+
$cnt = Get32u($dataPt, $entry + 4);
|
572
|
+
}
|
573
|
+
last;
|
574
|
+
}
|
575
|
+
}
|
576
|
+
}
|
577
|
+
$curInfo = $et->GetTagInfo($tagTablePtr, $tagID, \$val, $fmt, $cnt);
|
578
|
+
} else {
|
579
|
+
# may want to delete this, but we need to see the value first
|
580
|
+
$mayDelete{$tagID} = 1;
|
581
|
+
}
|
582
|
+
}
|
583
|
+
# don't set this tag unless valid for the current condition
|
584
|
+
next unless defined $curInfo and $curInfo eq $tagInfo;
|
585
|
+
}
|
586
|
+
if ($$tagInfo{WriteCondition}) {
|
587
|
+
my $self = $et; # set $self to be used in eval
|
588
|
+
#### eval WriteCondition ($self)
|
589
|
+
unless (eval $$tagInfo{WriteCondition}) {
|
590
|
+
$@ and warn $@;
|
591
|
+
next;
|
592
|
+
}
|
593
|
+
}
|
594
|
+
my $nvHash = $et->GetNewValueHash($tagInfo, $dirName);
|
595
|
+
unless ($nvHash) {
|
596
|
+
next unless $wrongDir;
|
597
|
+
# delete stuff from the wrong directory if setting somewhere else
|
598
|
+
$nvHash = $et->GetNewValueHash($tagInfo, $wrongDir);
|
599
|
+
# don't cross delete if not overwriting
|
600
|
+
next unless $et->IsOverwriting($nvHash);
|
601
|
+
# don't cross delete if specifically deleting from the other directory
|
602
|
+
# (Note: don't call GetValue() here because it shouldn't be called
|
603
|
+
# if IsOverwriting returns < 0 -- eg. when shifting)
|
604
|
+
next if not defined $$nvHash{Value} and $$nvHash{WantGroup} and
|
605
|
+
lc($$nvHash{WantGroup}) eq lc($wrongDir);
|
606
|
+
# remove this tag if found in this IFD
|
607
|
+
$xDelete{$tagID} = 1;
|
608
|
+
}
|
609
|
+
if ($set{$tagID}) {
|
610
|
+
# this tag is being set twice, which can happen if two Condition's
|
611
|
+
# were true for this tag. Hopefully the only case where this can
|
612
|
+
# happen is the MakerNotes tag since it may store two very different
|
613
|
+
# types of information (MakerNotes and PreviewImage), but we want
|
614
|
+
# to store the MakerNotes if both are available
|
615
|
+
if ($tagID == 0x927c and $dirName =~ /^(ExifIFD|IFD0)$/) {
|
616
|
+
next if $$tagInfo{Name} eq 'PreviewImage';
|
617
|
+
} else {
|
618
|
+
$et->Warn(sprintf("Multiple new values for $name tag 0x%.4x",$tagID));
|
619
|
+
}
|
620
|
+
}
|
621
|
+
$set{$tagID} = $tagInfo;
|
622
|
+
}
|
623
|
+
|
624
|
+
# fix base offsets (some cameras incorrectly write maker notes in IFD0)
|
625
|
+
if ($dirName eq 'MakerNotes' and $$dirInfo{Parent} =~ /^(ExifIFD|IFD0)$/ and
|
626
|
+
$$et{TIFF_TYPE} !~ /^(ARW|SR2)$/ and not $$et{LeicaTrailerPos} and
|
627
|
+
Image::ExifTool::MakerNotes::FixBase($et, $dirInfo))
|
628
|
+
{
|
629
|
+
# update local variables from fixed values
|
630
|
+
$base = $$dirInfo{Base};
|
631
|
+
$dataPos = $$dirInfo{DataPos};
|
632
|
+
}
|
633
|
+
|
634
|
+
# initialize variables to handle mandatory tags
|
635
|
+
my $mandatory = $mandatory{$dirName};
|
636
|
+
my ($allMandatory, $addMandatory);
|
637
|
+
if ($mandatory) {
|
638
|
+
# use X/Y resolution values from JFIF if available
|
639
|
+
if ($dirName eq 'IFD0' and defined $$et{JFIFYResolution}) {
|
640
|
+
my %ifd0Vals = %$mandatory;
|
641
|
+
$ifd0Vals{0x011a} = $$et{JFIFXResolution};
|
642
|
+
$ifd0Vals{0x011b} = $$et{JFIFYResolution};
|
643
|
+
$ifd0Vals{0x0128} = $$et{JFIFResolutionUnit} + 1;
|
644
|
+
$mandatory = \%ifd0Vals;
|
645
|
+
}
|
646
|
+
$allMandatory = $addMandatory = 0; # initialize to zero
|
647
|
+
# add mandatory tags if creating a new directory
|
648
|
+
unless ($numEntries) {
|
649
|
+
foreach (keys %$mandatory) {
|
650
|
+
$set{$_} or $set{$_} = $$tagTablePtr{$_};
|
651
|
+
}
|
652
|
+
}
|
653
|
+
} else {
|
654
|
+
undef $deleteAll; # don't remove directory (no mandatory entries)
|
655
|
+
}
|
656
|
+
my ($addDirs, @newTags);
|
657
|
+
if ($inMakerNotes) {
|
658
|
+
$addDirs = { }; # can't currently add new directories in MakerNotes
|
659
|
+
# allow non-permanent makernotes tags to be added
|
660
|
+
# (note: we may get into trouble if there are too many of these
|
661
|
+
# because we allow out-of-order tags in MakerNote IFD's but our
|
662
|
+
# logic to add new tags relies on ordered entries)
|
663
|
+
foreach (keys %set) {
|
664
|
+
my $perm = $set{$_}{Permanent};
|
665
|
+
push @newTags, $_ if defined $perm and not $perm;
|
666
|
+
}
|
667
|
+
@newTags = sort { $a <=> $b } @newTags if @newTags > 1;
|
668
|
+
} else {
|
669
|
+
# get a hash of directories we will be writing in this one
|
670
|
+
$addDirs = $et->GetAddDirHash($tagTablePtr, $dirName);
|
671
|
+
# make a union of tags & dirs (can set whole dirs, like MakerNotes)
|
672
|
+
my %allTags = ( %set, %$addDirs );
|
673
|
+
# make sorted list of new tags to be added
|
674
|
+
@newTags = sort { $a <=> $b } keys(%allTags);
|
675
|
+
}
|
676
|
+
my $dirBuff = ''; # buffer for directory data
|
677
|
+
my $valBuff = ''; # buffer for value data
|
678
|
+
my @valFixups; # list of fixups for offsets in valBuff
|
679
|
+
# fixup for offsets in dirBuff
|
680
|
+
my $dirFixup = new Image::ExifTool::Fixup;
|
681
|
+
my $entryBasedFixup;
|
682
|
+
my $lastTagID = -1;
|
683
|
+
my ($oldInfo, $oldFormat, $oldFormName, $oldCount, $oldSize, $oldValue, $oldImageData);
|
684
|
+
my ($readFormat, $readFormName, $readCount); # format for reading old value(s)
|
685
|
+
my ($entry, $valueDataPt, $valueDataPos, $valueDataLen, $valuePtr, $valEnd);
|
686
|
+
my ($offList, $offHash, $ignoreCount, $fixCount);
|
687
|
+
my $oldID = -1;
|
688
|
+
my $newID = -1;
|
689
|
+
|
690
|
+
# patch for Canon EOS 40D firmware 1.0.4 bug (incorrect directory counts)
|
691
|
+
if ($inMakerNotes and $$et{Model} eq 'Canon EOS 40D') {
|
692
|
+
my $fmt = Get16u($dataPt, $dirStart + 2 + 12 * ($numEntries - 1) + 2);
|
693
|
+
if ($fmt < 1 or $fmt > 13) {
|
694
|
+
# adjust the number of directory entries
|
695
|
+
--$numEntries;
|
696
|
+
$dirEnd -= 12;
|
697
|
+
$ignoreCount = 1;
|
698
|
+
}
|
699
|
+
}
|
700
|
+
#..............................................................................
|
701
|
+
# loop through entries in new directory
|
702
|
+
#
|
703
|
+
$index = 0;
|
704
|
+
Entry: for (;;) {
|
705
|
+
|
706
|
+
if (defined $oldID and $oldID == $newID) {
|
707
|
+
#
|
708
|
+
# read next entry from existing directory
|
709
|
+
#
|
710
|
+
if ($index < $numEntries) {
|
711
|
+
$entry = $dirStart + 2 + 12 * $index;
|
712
|
+
$oldID = Get16u($dataPt, $entry);
|
713
|
+
$readFormat = $oldFormat = Get16u($dataPt, $entry+2);
|
714
|
+
$readCount = $oldCount = Get32u($dataPt, $entry+4);
|
715
|
+
undef $oldImageData;
|
716
|
+
if ($oldFormat < 1 or $oldFormat > 13) {
|
717
|
+
my $msg = "Bad format ($oldFormat) for $name entry $index";
|
718
|
+
# patch to preserve invalid directory entries in SubIFD3 of
|
719
|
+
# various Kodak Z-series cameras (Z812, Z1085IS, Z1275)
|
720
|
+
# and some Sony cameras such as the DSC-P10
|
721
|
+
if ($dirName eq 'MakerNotes' and (($$et{Make}=~/KODAK/i and
|
722
|
+
$$dirInfo{Name} and $$dirInfo{Name} eq 'SubIFD3') or
|
723
|
+
($numEntries == 12 and $$et{Make} eq 'SONY' and $index >= 8)))
|
724
|
+
{
|
725
|
+
$dirBuff .= substr($$dataPt, $entry, 12);
|
726
|
+
++$index;
|
727
|
+
$newID = $oldID; # we wrote this
|
728
|
+
$et->Warn($msg, 1);
|
729
|
+
next;
|
730
|
+
}
|
731
|
+
# don't write out null directory entry
|
732
|
+
if ($oldFormat==0 and $index and $oldCount==0) {
|
733
|
+
$ignoreCount = ($ignoreCount || 0) + 1;
|
734
|
+
# must keep same directory size to avoid messing up our fixed offsets
|
735
|
+
$dirBuff .= ("\0" x 12) if $$dirInfo{FixBase};
|
736
|
+
++$index;
|
737
|
+
$newID = $oldID; # pretend we wrote this
|
738
|
+
next;
|
739
|
+
}
|
740
|
+
return ExifErr($et, $msg, $tagTablePtr);
|
741
|
+
}
|
742
|
+
$readFormName = $oldFormName = $formatName[$oldFormat];
|
743
|
+
$valueDataPt = $dataPt;
|
744
|
+
$valueDataPos = $dataPos;
|
745
|
+
$valueDataLen = $dataLen;
|
746
|
+
$valuePtr = $entry + 8;
|
747
|
+
# try direct method first for speed
|
748
|
+
$oldInfo = $$tagTablePtr{$oldID};
|
749
|
+
if (ref $oldInfo ne 'HASH' or $$oldInfo{Condition}) {
|
750
|
+
# must get unknown tags too
|
751
|
+
# (necessary so we don't miss a tag we want to Drop)
|
752
|
+
my $unk = $et->Options(Unknown => 1);
|
753
|
+
$oldInfo = $et->GetTagInfo($tagTablePtr, $oldID);
|
754
|
+
$et->Options(Unknown => $unk);
|
755
|
+
}
|
756
|
+
# patch incorrect count in Kodak SubIFD3 tags
|
757
|
+
if ($oldCount < 2 and $oldInfo and $$oldInfo{FixCount}) {
|
758
|
+
$offList or ($offList, $offHash) = GetOffList($dataPt, $dirStart, $dataPos,
|
759
|
+
$numEntries, $tagTablePtr);
|
760
|
+
my $i = $$offHash{Get32u($dataPt, $valuePtr)};
|
761
|
+
if (defined $i and $i < $#$offList) {
|
762
|
+
$oldCount = int(($$offList[$i+1] - $$offList[$i]) / $formatSize[$oldFormat]);
|
763
|
+
$fixCount = ($fixCount || 0) + 1 if $oldCount != $readCount;
|
764
|
+
}
|
765
|
+
}
|
766
|
+
$oldSize = $oldCount * $formatSize[$oldFormat];
|
767
|
+
my $readFromFile;
|
768
|
+
if ($oldSize > 4) {
|
769
|
+
$valuePtr = Get32u($dataPt, $valuePtr);
|
770
|
+
# fix valuePtr if necessary
|
771
|
+
if ($$dirInfo{FixOffsets}) {
|
772
|
+
$valEnd or $valEnd = $dataPos + $dirStart + 2 + 12 * $numEntries + 4;
|
773
|
+
my ($tagID, $size, $wFlag) = ($oldID, $oldSize, 1);
|
774
|
+
#### eval FixOffsets ($valuePtr, $valEnd, $size, $tagID, $wFlag)
|
775
|
+
eval $$dirInfo{FixOffsets};
|
776
|
+
unless (defined $valuePtr) {
|
777
|
+
unless ($$et{DROP_TAGS}) {
|
778
|
+
my $tagStr = $oldInfo ? $$oldInfo{Name} : sprintf("tag 0x%.4x",$oldID);
|
779
|
+
return undef if $et->Error("Bad $name offset for $tagStr", $inMakerNotes);
|
780
|
+
}
|
781
|
+
++$index; $oldID = $newID; next; # drop this tag
|
782
|
+
}
|
783
|
+
}
|
784
|
+
# offset shouldn't point into TIFF or IFD header
|
785
|
+
my $suspect = ($valuePtr < 8);
|
786
|
+
# convert offset to pointer in $$dataPt
|
787
|
+
if ($$dirInfo{EntryBased} or (ref $$tagTablePtr{$oldID} eq 'HASH' and
|
788
|
+
$$tagTablePtr{$oldID}{EntryBased}))
|
789
|
+
{
|
790
|
+
$valuePtr += $entry;
|
791
|
+
} else {
|
792
|
+
$valuePtr -= $dataPos;
|
793
|
+
}
|
794
|
+
# value shouldn't overlap our directory
|
795
|
+
$suspect = 1 if $valuePtr < $dirEnd and $valuePtr+$oldSize > $dirStart;
|
796
|
+
# get value by seeking in file if we are allowed
|
797
|
+
if ($valuePtr < 0 or $valuePtr+$oldSize > $dataLen) {
|
798
|
+
my ($pos, $tagStr, $invalidPreview, $tmpInfo, $leicaTrailer);
|
799
|
+
if ($oldInfo) {
|
800
|
+
$tagStr = $$oldInfo{Name};
|
801
|
+
$leicaTrailer = $$oldInfo{LeicaTrailer};
|
802
|
+
} elsif (defined $oldInfo) {
|
803
|
+
$tmpInfo = $et->GetTagInfo($tagTablePtr, $oldID, \ '', $oldFormName, $oldCount);
|
804
|
+
if ($tmpInfo) {
|
805
|
+
$tagStr = $$tmpInfo{Name};
|
806
|
+
$leicaTrailer = $$tmpInfo{LeicaTrailer};
|
807
|
+
}
|
808
|
+
}
|
809
|
+
$tagStr or $tagStr = sprintf("tag 0x%.4x",$oldID);
|
810
|
+
# allow PreviewImage to run outside EXIF segment in JPEG images
|
811
|
+
if (not $raf) {
|
812
|
+
if ($tagStr eq 'PreviewImage') {
|
813
|
+
$raf = $$et{RAF};
|
814
|
+
if ($raf) {
|
815
|
+
$pos = $raf->Tell();
|
816
|
+
if ($oldInfo and $$oldInfo{ChangeBase}) {
|
817
|
+
# adjust base offset for this tag only
|
818
|
+
#### eval ChangeBase ($dirStart,$dataPos)
|
819
|
+
my $newBase = eval $$oldInfo{ChangeBase};
|
820
|
+
$valuePtr += $newBase;
|
821
|
+
}
|
822
|
+
} else {
|
823
|
+
$invalidPreview = 1;
|
824
|
+
}
|
825
|
+
} elsif ($leicaTrailer) {
|
826
|
+
# save information about Leica makernote trailer
|
827
|
+
$$et{LeicaTrailer} = {
|
828
|
+
TagInfo => $oldInfo || $tmpInfo,
|
829
|
+
Offset => $base + $valuePtr + $dataPos,
|
830
|
+
Size => $oldSize,
|
831
|
+
Fixup => new Image::ExifTool::Fixup,
|
832
|
+
},
|
833
|
+
$invalidPreview = 2;
|
834
|
+
# remove SubDirectory to prevent processing (for now)
|
835
|
+
my %copy = %{$oldInfo || $tmpInfo};
|
836
|
+
delete $copy{SubDirectory};
|
837
|
+
delete $copy{MakerNotes};
|
838
|
+
$oldInfo = \%copy;
|
839
|
+
}
|
840
|
+
}
|
841
|
+
if ($oldSize > BINARY_DATA_LIMIT and $$origDirInfo{ImageData} and
|
842
|
+
(not defined $oldInfo or ($oldInfo and not $$oldInfo{SubDirectory})))
|
843
|
+
{
|
844
|
+
# copy huge data blocks later instead of loading into memory
|
845
|
+
$oldValue = ''; # dummy empty value
|
846
|
+
# copy this value later unless writing a new value
|
847
|
+
unless ($set{$oldID}) {
|
848
|
+
my $pad = $oldSize & 0x01 ? 1 : 0;
|
849
|
+
# save block information to copy later (set directory offset later)
|
850
|
+
$oldImageData = [$base+$valuePtr+$dataPos, $oldSize, $pad];
|
851
|
+
}
|
852
|
+
} elsif ($raf) {
|
853
|
+
my $success = ($raf->Seek($base+$valuePtr+$dataPos, 0) and
|
854
|
+
$raf->Read($oldValue, $oldSize) == $oldSize);
|
855
|
+
if (defined $pos) {
|
856
|
+
$raf->Seek($pos, 0);
|
857
|
+
undef $raf;
|
858
|
+
# (sony A700 has 32-byte header on PreviewImage)
|
859
|
+
unless ($success and $oldValue =~ /^(\xff\xd8\xff|(.|.{33})\xd8\xff\xdb)/s) {
|
860
|
+
$invalidPreview = 1;
|
861
|
+
$success = 1; # continue writing directory anyway
|
862
|
+
}
|
863
|
+
}
|
864
|
+
unless ($success) {
|
865
|
+
return undef if $et->Error("Error reading value for $name entry $index", $inMakerNotes);
|
866
|
+
++$index; $oldID = $newID; next; # drop this tag
|
867
|
+
}
|
868
|
+
} elsif (not $invalidPreview) {
|
869
|
+
return undef if $et->Error("Bad $name offset for $tagStr", $inMakerNotes);
|
870
|
+
++$index; $oldID = $newID; next; # drop this tag
|
871
|
+
}
|
872
|
+
if ($invalidPreview) {
|
873
|
+
# set value for invalid preview
|
874
|
+
if ($$et{FILE_TYPE} eq 'JPEG') {
|
875
|
+
# define dummy value for preview (or Leica MakerNote) to write later
|
876
|
+
# (value must be larger than 4 bytes to generate PREVIEW_INFO,
|
877
|
+
# and an even number of bytes so it won't be padded)
|
878
|
+
$oldValue = 'LOAD_PREVIEW';
|
879
|
+
} else {
|
880
|
+
$oldValue = 'none';
|
881
|
+
$oldSize = length $oldValue;
|
882
|
+
}
|
883
|
+
$valuePtr = 0;
|
884
|
+
} else {
|
885
|
+
UpdateTiffEnd($et, $base+$valuePtr+$dataPos+$oldSize);
|
886
|
+
}
|
887
|
+
# update pointers for value just read from file
|
888
|
+
$valueDataPt = \$oldValue;
|
889
|
+
$valueDataPos = $valuePtr + $dataPos;
|
890
|
+
$valueDataLen = $oldSize;
|
891
|
+
$valuePtr = 0;
|
892
|
+
$readFromFile = 1;
|
893
|
+
}
|
894
|
+
if ($suspect) {
|
895
|
+
my $tagStr = $oldInfo ? $$oldInfo{Name} : sprintf('tag 0x%.4x', $oldID);
|
896
|
+
my $str = "Suspicious $name offset for $tagStr";
|
897
|
+
if ($inMakerNotes) {
|
898
|
+
$et->Warn($str, 1);
|
899
|
+
} else {
|
900
|
+
return undef if $et->Error($str, 1);
|
901
|
+
}
|
902
|
+
}
|
903
|
+
}
|
904
|
+
# read value if we haven't already
|
905
|
+
$oldValue = substr($$valueDataPt, $valuePtr, $oldSize) unless $readFromFile;
|
906
|
+
# get tagInfo using value if necessary
|
907
|
+
if (defined $oldInfo and not $oldInfo) {
|
908
|
+
my $unk = $et->Options(Unknown => 1);
|
909
|
+
$oldInfo = $et->GetTagInfo($tagTablePtr, $oldID, \$oldValue, $oldFormName, $oldCount);
|
910
|
+
$et->Options(Unknown => $unk);
|
911
|
+
# now that we have the value, we can resolve the Condition to finally
|
912
|
+
# determine whether we want to delete this tag or not
|
913
|
+
if ($mayDelete{$oldID} and $oldInfo and (not @newTags or $newTags[0] != $oldID)) {
|
914
|
+
my $nvHash = $et->GetNewValueHash($oldInfo, $dirName);
|
915
|
+
if (not $nvHash and $wrongDir) {
|
916
|
+
# delete from wrong directory if necessary
|
917
|
+
$nvHash = $et->GetNewValueHash($oldInfo, $wrongDir);
|
918
|
+
$nvHash and $xDelete{$oldID} = 1;
|
919
|
+
}
|
920
|
+
if ($nvHash) {
|
921
|
+
# we want to delete this tag after all, so insert it into our list
|
922
|
+
$set{$oldID} = $oldInfo;
|
923
|
+
unshift @newTags, $oldID;
|
924
|
+
}
|
925
|
+
}
|
926
|
+
}
|
927
|
+
# make sure we are handling the 'ifd' format properly
|
928
|
+
if (($oldFormat == 13 or $oldFormat == 18) and
|
929
|
+
(not $oldInfo or not $$oldInfo{SubIFD}))
|
930
|
+
{
|
931
|
+
my $str = sprintf('%s tag 0x%.4x IFD format not handled', $name, $oldID);
|
932
|
+
$et->Error($str, $inMakerNotes);
|
933
|
+
}
|
934
|
+
# override format we use to read the value if specified
|
935
|
+
if ($oldInfo) {
|
936
|
+
# check for tags which must be integers
|
937
|
+
if (($$oldInfo{IsOffset} or $$oldInfo{SubIFD}) and
|
938
|
+
not $intFormat{$oldFormName})
|
939
|
+
{
|
940
|
+
$et->Error("Invalid format ($oldFormName) for $name $$oldInfo{Name}", $inMakerNotes);
|
941
|
+
++$index; $oldID = $newID; next; # drop this tag
|
942
|
+
}
|
943
|
+
if ($$oldInfo{Drop} and $$et{DROP_TAGS} and
|
944
|
+
($$oldInfo{Drop} == 1 or $$oldInfo{Drop} < $oldSize))
|
945
|
+
{
|
946
|
+
++$index; $oldID = $newID; next; # drop this tag
|
947
|
+
}
|
948
|
+
if ($$oldInfo{Format}) {
|
949
|
+
$readFormName = $$oldInfo{Format};
|
950
|
+
$readFormat = $formatNumber{$readFormName};
|
951
|
+
unless ($readFormat) {
|
952
|
+
# we aren't reading in a standard EXIF format, so rewrite in old format
|
953
|
+
$readFormName = $oldFormName;
|
954
|
+
$readFormat = $oldFormat;
|
955
|
+
}
|
956
|
+
# adjust number of items to read if format size changed
|
957
|
+
$readCount = $oldSize / $formatSize[$readFormat];
|
958
|
+
}
|
959
|
+
}
|
960
|
+
if ($oldID <= $lastTagID and not $inMakerNotes) {
|
961
|
+
my $str = $oldInfo ? "$$oldInfo{Name} tag" : sprintf('tag 0x%x',$oldID);
|
962
|
+
if ($oldID == $lastTagID) {
|
963
|
+
$et->Warn("Duplicate $str in $name");;
|
964
|
+
} else {
|
965
|
+
$et->Warn("\u$str out of sequence in $name");
|
966
|
+
}
|
967
|
+
}
|
968
|
+
$lastTagID = $oldID;
|
969
|
+
++$index; # increment index for next time
|
970
|
+
} else {
|
971
|
+
undef $oldID; # no more existing entries
|
972
|
+
}
|
973
|
+
}
|
974
|
+
#
|
975
|
+
# write out all new tags, up to and including this one
|
976
|
+
#
|
977
|
+
$newID = $newTags[0];
|
978
|
+
my $isNew; # -1=tag is old, 0=tag same as existing, 1=tag is new
|
979
|
+
if (not defined $oldID) {
|
980
|
+
last unless defined $newID;
|
981
|
+
$isNew = 1;
|
982
|
+
} elsif (not defined $newID) {
|
983
|
+
# maker notes will have no new tags defined
|
984
|
+
if ($set{$oldID}) {
|
985
|
+
$newID = $oldID;
|
986
|
+
$isNew = 0;
|
987
|
+
} else {
|
988
|
+
$isNew = -1;
|
989
|
+
}
|
990
|
+
} else {
|
991
|
+
$isNew = $oldID <=> $newID;
|
992
|
+
}
|
993
|
+
my $newInfo = $oldInfo;
|
994
|
+
my $newFormat = $oldFormat;
|
995
|
+
my $newFormName = $oldFormName;
|
996
|
+
my $newCount = $oldCount;
|
997
|
+
my $ifdFormName;
|
998
|
+
my $newValue;
|
999
|
+
my $newValuePt = $isNew >= 0 ? \$newValue : \$oldValue;
|
1000
|
+
my $isOverwriting;
|
1001
|
+
|
1002
|
+
if ($isNew >= 0) {
|
1003
|
+
# add, edit or delete this tag
|
1004
|
+
shift @newTags; # remove from list
|
1005
|
+
if ($set{$newID}) {
|
1006
|
+
#
|
1007
|
+
# set the new tag value (or 'next' if deleting tag)
|
1008
|
+
#
|
1009
|
+
$newInfo = $set{$newID};
|
1010
|
+
$newCount = $$newInfo{Count};
|
1011
|
+
my ($val, $newVal, $n);
|
1012
|
+
my $nvHash = $et->GetNewValueHash($newInfo, $dirName);
|
1013
|
+
if ($isNew > 0) {
|
1014
|
+
# don't create new entry unless requested
|
1015
|
+
if ($nvHash) {
|
1016
|
+
next unless $$nvHash{IsCreating};
|
1017
|
+
if ($$newInfo{IsOverwriting}) {
|
1018
|
+
my $proc = $$newInfo{IsOverwriting};
|
1019
|
+
$isOverwriting = &$proc($et, $nvHash, $val, \$newVal);
|
1020
|
+
} else {
|
1021
|
+
$isOverwriting = $et->IsOverwriting($nvHash);
|
1022
|
+
}
|
1023
|
+
} else {
|
1024
|
+
next if $xDelete{$newID}; # don't create if cross deleting
|
1025
|
+
$newVal = $$mandatory{$newID}; # get value for mandatory tag
|
1026
|
+
$isOverwriting = 1;
|
1027
|
+
}
|
1028
|
+
# convert using new format
|
1029
|
+
if ($$newInfo{Format}) {
|
1030
|
+
$newFormName = $$newInfo{Format};
|
1031
|
+
# use Writable flag to specify IFD format code
|
1032
|
+
$ifdFormName = $$newInfo{Writable};
|
1033
|
+
} else {
|
1034
|
+
$newFormName = $$newInfo{Writable};
|
1035
|
+
unless ($newFormName) {
|
1036
|
+
warn("No format for $name $$newInfo{Name}\n");
|
1037
|
+
next;
|
1038
|
+
}
|
1039
|
+
}
|
1040
|
+
$newFormat = $formatNumber{$newFormName};
|
1041
|
+
} elsif ($nvHash or $xDelete{$newID}) {
|
1042
|
+
unless ($nvHash) {
|
1043
|
+
$nvHash = $et->GetNewValueHash($newInfo, $wrongDir);
|
1044
|
+
}
|
1045
|
+
# read value
|
1046
|
+
if (length $oldValue >= $oldSize) {
|
1047
|
+
$val = ReadValue(\$oldValue, 0, $readFormName, $readCount, $oldSize);
|
1048
|
+
} else {
|
1049
|
+
$val = '';
|
1050
|
+
}
|
1051
|
+
# determine write format (by default, use 'Writable' format)
|
1052
|
+
my $writable = $$newInfo{Writable};
|
1053
|
+
# (or use existing format if 'Writable' not specified)
|
1054
|
+
$writable = $oldFormName unless $writable and $writable ne '1';
|
1055
|
+
# (and override write format with 'Format' if specified)
|
1056
|
+
my $writeForm = $$newInfo{Format} || $writable;
|
1057
|
+
if ($writeForm ne $newFormName) {
|
1058
|
+
# write in specified format
|
1059
|
+
$newFormName = $writeForm;
|
1060
|
+
$newFormat = $formatNumber{$newFormName};
|
1061
|
+
# use different IFD format code if necessary
|
1062
|
+
if ($inMakerNotes) {
|
1063
|
+
# always preserve IFD format in maker notes
|
1064
|
+
$ifdFormName = $oldFormName;
|
1065
|
+
} elsif ($writable ne $newFormName) {
|
1066
|
+
# use specified IFD format
|
1067
|
+
$ifdFormName = $writable;
|
1068
|
+
}
|
1069
|
+
}
|
1070
|
+
if ($inMakerNotes and $readFormName ne 'string' and $readFormName ne 'undef') {
|
1071
|
+
# keep same size in maker notes unless string or binary
|
1072
|
+
$newCount = $oldCount * $formatSize[$oldFormat] / $formatSize[$newFormat];
|
1073
|
+
}
|
1074
|
+
if ($$newInfo{IsOverwriting}) {
|
1075
|
+
my $proc = $$newInfo{IsOverwriting};
|
1076
|
+
$isOverwriting = &$proc($et, $nvHash, $val, \$newVal);
|
1077
|
+
} else {
|
1078
|
+
$isOverwriting = $et->IsOverwriting($nvHash, $val);
|
1079
|
+
}
|
1080
|
+
}
|
1081
|
+
if ($isOverwriting) {
|
1082
|
+
$newVal = $et->GetNewValue($nvHash) unless defined $newVal;
|
1083
|
+
# value undefined if deleting this tag
|
1084
|
+
# (also delete tag if cross-deleting and this isn't a date/time shift)
|
1085
|
+
if (not defined $newVal or ($xDelete{$newID} and not defined $$nvHash{Shift})) {
|
1086
|
+
if ($$newInfo{RawConvInv} and defined $$nvHash{Value}) {
|
1087
|
+
# error in RawConvInv, so rewrite existing tag
|
1088
|
+
goto NoOverwrite; # GOTO!
|
1089
|
+
}
|
1090
|
+
unless ($isNew) {
|
1091
|
+
++$$et{CHANGED};
|
1092
|
+
$et->VerboseValue("- $dirName:$$newInfo{Name}", $val);
|
1093
|
+
}
|
1094
|
+
next;
|
1095
|
+
}
|
1096
|
+
if ($newCount and $newCount < 0) {
|
1097
|
+
# set count to number of values if variable
|
1098
|
+
my @vals = split ' ',$newVal;
|
1099
|
+
$newCount = @vals;
|
1100
|
+
}
|
1101
|
+
# convert to binary format
|
1102
|
+
$newValue = WriteValue($newVal, $newFormName, $newCount);
|
1103
|
+
unless (defined $newValue) {
|
1104
|
+
$et->Warn("Invalid value for $dirName:$$newInfo{Name}");
|
1105
|
+
goto NoOverwrite; # GOTO!
|
1106
|
+
}
|
1107
|
+
if (length $newValue) {
|
1108
|
+
# limit maximum value length in JPEG images
|
1109
|
+
# (max segment size is 65533 bytes and the min EXIF size is 96 incl an additional IFD entry)
|
1110
|
+
if ($$et{FILE_TYPE} eq 'JPEG' and length($newValue) > 65436 and
|
1111
|
+
$$newInfo{Name} ne 'PreviewImage')
|
1112
|
+
{
|
1113
|
+
my $name = $$newInfo{MakerNotes} ? 'MakerNotes' : $$newInfo{Name};
|
1114
|
+
$et->Warn("$name too large to write in JPEG segment");
|
1115
|
+
goto NoOverwrite; # GOTO!
|
1116
|
+
}
|
1117
|
+
# re-code if necessary
|
1118
|
+
if ($strEnc and $newFormName eq 'string') {
|
1119
|
+
$newValue = $et->Encode($newValue, $strEnc);
|
1120
|
+
}
|
1121
|
+
} else {
|
1122
|
+
$et->Warn("Can't write zero length $$newInfo{Name} in $$tagTablePtr{GROUPS}{1}");
|
1123
|
+
goto NoOverwrite; # GOTO!
|
1124
|
+
}
|
1125
|
+
if ($isNew >= 0) {
|
1126
|
+
$newCount = length($newValue) / $formatSize[$newFormat];
|
1127
|
+
++$$et{CHANGED};
|
1128
|
+
if (defined $allMandatory) {
|
1129
|
+
# not all mandatory if we are writing any tag specifically
|
1130
|
+
if ($nvHash) {
|
1131
|
+
undef $allMandatory;
|
1132
|
+
undef $deleteAll;
|
1133
|
+
} else {
|
1134
|
+
++$addMandatory; # count mandatory tags that we added
|
1135
|
+
}
|
1136
|
+
}
|
1137
|
+
if ($verbose > 1) {
|
1138
|
+
$et->VerboseValue("- $dirName:$$newInfo{Name}", $val) unless $isNew;
|
1139
|
+
my $str = $nvHash ? '' : ' (mandatory)';
|
1140
|
+
$et->VerboseValue("+ $dirName:$$newInfo{Name}", $newVal, $str);
|
1141
|
+
}
|
1142
|
+
}
|
1143
|
+
} else {
|
1144
|
+
NoOverwrite: next if $isNew > 0;
|
1145
|
+
$isNew = -1; # rewrite existing tag
|
1146
|
+
}
|
1147
|
+
# set format for EXIF IFD if different than conversion format
|
1148
|
+
if ($ifdFormName) {
|
1149
|
+
$newFormName = $ifdFormName;
|
1150
|
+
$newFormat = $formatNumber{$newFormName};
|
1151
|
+
}
|
1152
|
+
|
1153
|
+
} elsif ($isNew > 0) {
|
1154
|
+
#
|
1155
|
+
# create new subdirectory
|
1156
|
+
#
|
1157
|
+
# newInfo may not be defined if we try to add a mandatory tag
|
1158
|
+
# to a directory that doesn't support it (eg. IFD1 in RW2 images)
|
1159
|
+
$newInfo = $$addDirs{$newID} or next;
|
1160
|
+
# make sure we don't try to generate a new MakerNotes directory
|
1161
|
+
# or a SubIFD
|
1162
|
+
next if $$newInfo{MakerNotes} or $$newInfo{Name} eq 'SubIFD';
|
1163
|
+
my $subTable;
|
1164
|
+
if ($$newInfo{SubDirectory}{TagTable}) {
|
1165
|
+
$subTable = Image::ExifTool::GetTagTable($$newInfo{SubDirectory}{TagTable});
|
1166
|
+
} else {
|
1167
|
+
$subTable = $tagTablePtr;
|
1168
|
+
}
|
1169
|
+
# create empty source directory
|
1170
|
+
my %sourceDir = (
|
1171
|
+
Parent => $dirName,
|
1172
|
+
Fixup => new Image::ExifTool::Fixup,
|
1173
|
+
);
|
1174
|
+
$sourceDir{DirName} = $$newInfo{Groups}{1} if $$newInfo{SubIFD};
|
1175
|
+
$newValue = $et->WriteDirectory(\%sourceDir, $subTable);
|
1176
|
+
# only add new directory if it isn't empty
|
1177
|
+
next unless defined $newValue and length($newValue);
|
1178
|
+
# set the fixup start location
|
1179
|
+
if ($$newInfo{SubIFD}) {
|
1180
|
+
# subdirectory is referenced by an offset in value buffer
|
1181
|
+
my $subdir = $newValue;
|
1182
|
+
$newValue = Set32u(0xfeedf00d);
|
1183
|
+
push @subdirs, {
|
1184
|
+
DataPt => \$subdir,
|
1185
|
+
Table => $subTable,
|
1186
|
+
Fixup => $sourceDir{Fixup},
|
1187
|
+
Offset => length($dirBuff) + 8,
|
1188
|
+
Where => 'dirBuff',
|
1189
|
+
};
|
1190
|
+
$newFormName = 'int32u';
|
1191
|
+
$newFormat = $formatNumber{$newFormName};
|
1192
|
+
} else {
|
1193
|
+
# subdirectory goes directly into value buffer
|
1194
|
+
$sourceDir{Fixup}{Start} += length($valBuff);
|
1195
|
+
# use Writable to set format, otherwise 'undef'
|
1196
|
+
$newFormName = $$newInfo{Writable};
|
1197
|
+
unless ($newFormName and $formatNumber{$newFormName}) {
|
1198
|
+
$newFormName = 'undef';
|
1199
|
+
}
|
1200
|
+
$newFormat = $formatNumber{$newFormName};
|
1201
|
+
push @valFixups, $sourceDir{Fixup};
|
1202
|
+
}
|
1203
|
+
} elsif ($$newInfo{Format} and $$newInfo{Writable} and $$newInfo{Writable} ne '1') {
|
1204
|
+
# use specified write format
|
1205
|
+
$newFormName = $$newInfo{Writable};
|
1206
|
+
$newFormat = $formatNumber{$newFormName};
|
1207
|
+
} elsif ($$addDirs{$newID} and $newInfo ne $$addDirs{$newID}) {
|
1208
|
+
# this can happen if we are trying to add a directory that doesn't exist
|
1209
|
+
# in this type of file (eg. try adding a SubIFD tag to an A100 image)
|
1210
|
+
$isNew = -1;
|
1211
|
+
}
|
1212
|
+
}
|
1213
|
+
if ($isNew < 0) {
|
1214
|
+
# just rewrite existing tag
|
1215
|
+
$newID = $oldID;
|
1216
|
+
$newValue = $oldValue;
|
1217
|
+
$newFormat = $oldFormat; # (just in case it changed)
|
1218
|
+
$newFormName = $oldFormName;
|
1219
|
+
# set offset of this entry in the directory so we can update the pointer
|
1220
|
+
# and save block information to copy this large block later
|
1221
|
+
if ($oldImageData) {
|
1222
|
+
$$oldImageData[3] = $newStart + length($dirBuff) + 2;
|
1223
|
+
push @imageData, $oldImageData;
|
1224
|
+
$$origDirInfo{ImageData} = \@imageData;
|
1225
|
+
}
|
1226
|
+
}
|
1227
|
+
if ($newInfo) {
|
1228
|
+
#
|
1229
|
+
# load necessary data for this tag (thumbnail image, etc)
|
1230
|
+
#
|
1231
|
+
if ($$newInfo{DataTag} and $isNew >= 0) {
|
1232
|
+
my $dataTag = $$newInfo{DataTag};
|
1233
|
+
# load data for this tag
|
1234
|
+
unless (defined $offsetData{$dataTag} or $dataTag eq 'LeicaTrailer') {
|
1235
|
+
# prefer tag from Composite table if it exists (otherwise
|
1236
|
+
# PreviewImage data would be taken from Extra tag)
|
1237
|
+
my $compInfo = $Image::ExifTool::Composite{$dataTag};
|
1238
|
+
$offsetData{$dataTag} = $et->GetNewValue($compInfo || $dataTag);
|
1239
|
+
my $err;
|
1240
|
+
if (defined $offsetData{$dataTag}) {
|
1241
|
+
my $len = length $offsetData{$dataTag};
|
1242
|
+
if ($dataTag eq 'PreviewImage') {
|
1243
|
+
# must set DEL_PREVIEW flag now if preview fit into IFD
|
1244
|
+
$$et{DEL_PREVIEW} = 1 if $len <= 4;
|
1245
|
+
} elsif ($$et{FILE_TYPE} eq 'JPEG' and $len > 60000) {
|
1246
|
+
delete $offsetData{$dataTag};
|
1247
|
+
$err = "$dataTag not written (too large for JPEG segment)";
|
1248
|
+
}
|
1249
|
+
} else {
|
1250
|
+
$err = "$dataTag not found";
|
1251
|
+
}
|
1252
|
+
if ($err) {
|
1253
|
+
$et->Warn($err) if $$newInfo{IsOffset};
|
1254
|
+
delete $set{$newID}; # remove from list of tags we are setting
|
1255
|
+
next;
|
1256
|
+
}
|
1257
|
+
}
|
1258
|
+
}
|
1259
|
+
#
|
1260
|
+
# write maker notes
|
1261
|
+
#
|
1262
|
+
if ($$newInfo{MakerNotes}) {
|
1263
|
+
# don't write new makernotes if we are deleting this group
|
1264
|
+
if ($$et{DEL_GROUP}{MakerNotes} and
|
1265
|
+
($$et{DEL_GROUP}{MakerNotes} != 2 or $isNew <= 0))
|
1266
|
+
{
|
1267
|
+
if ($isNew <= 0) {
|
1268
|
+
++$$et{CHANGED};
|
1269
|
+
$verbose and print $out " Deleting MakerNotes\n";
|
1270
|
+
}
|
1271
|
+
next;
|
1272
|
+
}
|
1273
|
+
my $saveOrder = GetByteOrder();
|
1274
|
+
if ($isNew >= 0 and $set{$newID}) {
|
1275
|
+
# we are writing a whole new maker note block
|
1276
|
+
# --> add fixup information if necessary
|
1277
|
+
my $nvHash = $et->GetNewValueHash($newInfo, $dirName);
|
1278
|
+
if ($nvHash and $$nvHash{MAKER_NOTE_FIXUP}) {
|
1279
|
+
# must clone fixup because we will be shifting it
|
1280
|
+
my $makerFixup = $$nvHash{MAKER_NOTE_FIXUP}->Clone();
|
1281
|
+
my $valLen = length($valBuff);
|
1282
|
+
$$makerFixup{Start} += $valLen;
|
1283
|
+
push @valFixups, $makerFixup;
|
1284
|
+
}
|
1285
|
+
} else {
|
1286
|
+
# update maker notes if possible
|
1287
|
+
my %subdirInfo = (
|
1288
|
+
Base => $base,
|
1289
|
+
DataPt => $valueDataPt,
|
1290
|
+
DataPos => $valueDataPos,
|
1291
|
+
DataLen => $valueDataLen,
|
1292
|
+
DirStart => $valuePtr,
|
1293
|
+
DirLen => $oldSize,
|
1294
|
+
DirName => 'MakerNotes',
|
1295
|
+
Name => $$newInfo{Name},
|
1296
|
+
Parent => $dirName,
|
1297
|
+
TagInfo => $newInfo,
|
1298
|
+
RAF => $raf,
|
1299
|
+
);
|
1300
|
+
my ($subTable, $subdir, $loc, $writeProc, $notIFD);
|
1301
|
+
if ($$newInfo{SubDirectory}) {
|
1302
|
+
my $sub = $$newInfo{SubDirectory};
|
1303
|
+
$subdirInfo{FixBase} = 1 if $$sub{FixBase};
|
1304
|
+
$subdirInfo{FixOffsets} = $$sub{FixOffsets};
|
1305
|
+
$subdirInfo{EntryBased} = $$sub{EntryBased};
|
1306
|
+
$subdirInfo{NoFixBase} = 1 if defined $$sub{Base};
|
1307
|
+
$subdirInfo{AutoFix} = $$sub{AutoFix};
|
1308
|
+
}
|
1309
|
+
# get the proper tag table for these maker notes
|
1310
|
+
if ($oldInfo and $$oldInfo{SubDirectory}) {
|
1311
|
+
$subTable = $$oldInfo{SubDirectory}{TagTable};
|
1312
|
+
$subTable and $subTable = Image::ExifTool::GetTagTable($subTable);
|
1313
|
+
$writeProc = $$oldInfo{SubDirectory}{WriteProc};
|
1314
|
+
$notIFD = $$oldInfo{NotIFD};
|
1315
|
+
} else {
|
1316
|
+
$et->Warn('Internal problem getting maker notes tag table');
|
1317
|
+
}
|
1318
|
+
$writeProc or $writeProc = $$subTable{WRITE_PROC} if $subTable;
|
1319
|
+
$subTable or $subTable = $tagTablePtr;
|
1320
|
+
if ($writeProc and
|
1321
|
+
$writeProc eq \&Image::ExifTool::MakerNotes::WriteUnknownOrPreview and
|
1322
|
+
$oldValue =~ /^\xff\xd8\xff/)
|
1323
|
+
{
|
1324
|
+
$loc = 0;
|
1325
|
+
} elsif (not $notIFD) {
|
1326
|
+
# look for IFD-style maker notes
|
1327
|
+
$loc = Image::ExifTool::MakerNotes::LocateIFD($et,\%subdirInfo);
|
1328
|
+
}
|
1329
|
+
if (defined $loc) {
|
1330
|
+
# we need fixup data for this subdirectory
|
1331
|
+
$subdirInfo{Fixup} = new Image::ExifTool::Fixup;
|
1332
|
+
# rewrite maker notes
|
1333
|
+
my $changed = $$et{CHANGED};
|
1334
|
+
$subdir = $et->WriteDirectory(\%subdirInfo, $subTable, $writeProc);
|
1335
|
+
if ($changed == $$et{CHANGED} and $subdirInfo{Fixup}->IsEmpty()) {
|
1336
|
+
# return original data if nothing changed and no fixups
|
1337
|
+
undef $subdir;
|
1338
|
+
}
|
1339
|
+
} elsif ($$subTable{PROCESS_PROC} and
|
1340
|
+
$$subTable{PROCESS_PROC} eq \&Image::ExifTool::ProcessBinaryData)
|
1341
|
+
{
|
1342
|
+
my $sub = $$oldInfo{SubDirectory};
|
1343
|
+
if (defined $$sub{Start}) {
|
1344
|
+
#### eval Start ($valuePtr)
|
1345
|
+
my $start = eval $$sub{Start};
|
1346
|
+
$loc = $start - $valuePtr;
|
1347
|
+
$subdirInfo{DirStart} = $start;
|
1348
|
+
$subdirInfo{DirLen} -= $loc;
|
1349
|
+
} else {
|
1350
|
+
$loc = 0;
|
1351
|
+
}
|
1352
|
+
# rewrite maker notes
|
1353
|
+
$subdir = $et->WriteDirectory(\%subdirInfo, $subTable);
|
1354
|
+
} elsif ($notIFD) {
|
1355
|
+
if ($writeProc) {
|
1356
|
+
$loc = 0;
|
1357
|
+
$subdir = $et->WriteDirectory(\%subdirInfo, $subTable);
|
1358
|
+
}
|
1359
|
+
} else {
|
1360
|
+
my $msg = 'Maker notes could not be parsed';
|
1361
|
+
if ($$et{FILE_TYPE} eq 'JPEG') {
|
1362
|
+
$et->Warn($msg, 1);
|
1363
|
+
} else {
|
1364
|
+
$et->Error($msg, 1);
|
1365
|
+
}
|
1366
|
+
}
|
1367
|
+
if (defined $subdir) {
|
1368
|
+
next unless length $subdir;
|
1369
|
+
my $valLen = length($valBuff);
|
1370
|
+
# restore existing header and substitute the new
|
1371
|
+
# maker notes for the old value
|
1372
|
+
$newValue = substr($oldValue, 0, $loc) . $subdir;
|
1373
|
+
my $makerFixup = $subdirInfo{Fixup};
|
1374
|
+
my $previewInfo = $$et{PREVIEW_INFO};
|
1375
|
+
if ($subdirInfo{Relative}) {
|
1376
|
+
# apply a one-time fixup to $loc since offsets are relative
|
1377
|
+
$$makerFixup{Start} += $loc;
|
1378
|
+
# shift all offsets to be relative to new base
|
1379
|
+
my $baseShift = $valueDataPos + $valuePtr + $base - $subdirInfo{Base};
|
1380
|
+
$$makerFixup{Shift} += $baseShift;
|
1381
|
+
$makerFixup->ApplyFixup(\$newValue);
|
1382
|
+
if ($previewInfo) {
|
1383
|
+
# remove all but PreviewImage fixup (since others shouldn't change)
|
1384
|
+
foreach (keys %{$$makerFixup{Pointers}}) {
|
1385
|
+
/_PreviewImage$/ or delete $$makerFixup{Pointers}{$_};
|
1386
|
+
}
|
1387
|
+
# zero pointer so we can see how it gets shifted later
|
1388
|
+
$makerFixup->SetMarkerPointers(\$newValue, 'PreviewImage', 0);
|
1389
|
+
# set the pointer to the start of the EXIF information
|
1390
|
+
# add preview image fixup to list of value fixups
|
1391
|
+
$$makerFixup{Start} += $valLen;
|
1392
|
+
push @valFixups, $makerFixup;
|
1393
|
+
$$previewInfo{BaseShift} = $baseShift;
|
1394
|
+
$$previewInfo{Relative} = 1;
|
1395
|
+
}
|
1396
|
+
# don't shift anything if relative flag set to zero (Pentax patch)
|
1397
|
+
} elsif (not defined $subdirInfo{Relative}) {
|
1398
|
+
# shift offset base if shifted in the original image or if FixBase
|
1399
|
+
# was used, but be careful of automatic FixBase with negative shifts
|
1400
|
+
# since they may lead to negative (invalid) offsets (casio_edit_problem.jpg)
|
1401
|
+
my $baseShift = $base - $subdirInfo{Base};
|
1402
|
+
if ($subdirInfo{AutoFix}) {
|
1403
|
+
$baseShift = 0;
|
1404
|
+
} elsif ($subdirInfo{FixBase} and $baseShift < 0 and
|
1405
|
+
# allow negative base shift if offsets are bigger (PentaxOptioWP.jpg)
|
1406
|
+
(not $subdirInfo{MinOffset} or $subdirInfo{MinOffset} + $baseShift < 0))
|
1407
|
+
{
|
1408
|
+
my $fixBase = $et->Options('FixBase');
|
1409
|
+
if (not defined $fixBase) {
|
1410
|
+
my $str = $et->Options('IgnoreMinorErrors') ? 'ignored' : 'fix or ignore?';
|
1411
|
+
$et->Error("MakerNotes offsets may be incorrect ($str)", 1);
|
1412
|
+
} elsif ($fixBase eq '') {
|
1413
|
+
$et->Warn('Fixed incorrect MakerNotes offsets');
|
1414
|
+
$baseShift = 0;
|
1415
|
+
}
|
1416
|
+
}
|
1417
|
+
$$makerFixup{Start} += $valLen + $loc;
|
1418
|
+
$$makerFixup{Shift} += $baseShift;
|
1419
|
+
# permanently fix makernote offset errors
|
1420
|
+
$$makerFixup{Shift} += $subdirInfo{FixedBy} || 0;
|
1421
|
+
push @valFixups, $makerFixup;
|
1422
|
+
if ($previewInfo and not $$previewInfo{NoBaseShift}) {
|
1423
|
+
$$previewInfo{BaseShift} = $baseShift;
|
1424
|
+
}
|
1425
|
+
}
|
1426
|
+
$newValuePt = \$newValue; # write new value
|
1427
|
+
}
|
1428
|
+
}
|
1429
|
+
SetByteOrder($saveOrder);
|
1430
|
+
|
1431
|
+
# process existing subdirectory unless we are overwriting it entirely
|
1432
|
+
} elsif ($$newInfo{SubDirectory} and $isNew <= 0 and not $isOverwriting
|
1433
|
+
# don't edit directory if Writable is set to 0
|
1434
|
+
and (not defined $$newInfo{Writable} or $$newInfo{Writable}))
|
1435
|
+
{
|
1436
|
+
|
1437
|
+
my $subdir = $$newInfo{SubDirectory};
|
1438
|
+
if ($$newInfo{SubIFD}) {
|
1439
|
+
#
|
1440
|
+
# rewrite existing sub IFD's
|
1441
|
+
#
|
1442
|
+
my $subTable = $tagTablePtr;
|
1443
|
+
if ($$subdir{TagTable}) {
|
1444
|
+
$subTable = Image::ExifTool::GetTagTable($$subdir{TagTable});
|
1445
|
+
}
|
1446
|
+
# determine directory name for this IFD
|
1447
|
+
my $subdirName = $$newInfo{Groups}{1} || $$newInfo{Name};
|
1448
|
+
# all makernotes directory names must be 'MakerNotes'
|
1449
|
+
$subdirName = 'MakerNotes' if $$subTable{GROUPS}{0} eq 'MakerNotes';
|
1450
|
+
# must handle sub-IFD's specially since the values
|
1451
|
+
# are actually offsets to subdirectories
|
1452
|
+
unless ($readCount) { # can't have zero count
|
1453
|
+
return undef if $et->Error("$name entry $index has zero count", 2);
|
1454
|
+
next;
|
1455
|
+
}
|
1456
|
+
my $writeCount = 0;
|
1457
|
+
my $i;
|
1458
|
+
$newValue = ''; # reset value because we regenerate it below
|
1459
|
+
for ($i=0; $i<$readCount; ++$i) {
|
1460
|
+
my $off = $i * $formatSize[$readFormat];
|
1461
|
+
my $val = ReadValue($valueDataPt, $valuePtr + $off,
|
1462
|
+
$readFormName, 1, $oldSize - $off);
|
1463
|
+
my $subdirStart = $val - $dataPos;
|
1464
|
+
my $subdirBase = $base;
|
1465
|
+
my $hdrLen;
|
1466
|
+
if (defined $$subdir{Start}) {
|
1467
|
+
#### eval Start ($val)
|
1468
|
+
my $newStart = eval $$subdir{Start};
|
1469
|
+
unless (Image::ExifTool::IsInt($newStart)) {
|
1470
|
+
$et->Error("Bad subdirectory start for $$newInfo{Name}");
|
1471
|
+
next;
|
1472
|
+
}
|
1473
|
+
$newStart -= $dataPos;
|
1474
|
+
$hdrLen = $newStart - $subdirStart;
|
1475
|
+
$subdirStart = $newStart;
|
1476
|
+
}
|
1477
|
+
if ($$subdir{Base}) {
|
1478
|
+
my $start = $subdirStart + $dataPos;
|
1479
|
+
#### eval Base ($start,$base)
|
1480
|
+
$subdirBase += eval $$subdir{Base};
|
1481
|
+
}
|
1482
|
+
# add IFD number if more than one
|
1483
|
+
$subdirName =~ s/\d*$/$i/ if $i;
|
1484
|
+
my %subdirInfo = (
|
1485
|
+
Base => $subdirBase,
|
1486
|
+
DataPt => $dataPt,
|
1487
|
+
DataPos => $dataPos - $subdirBase + $base,
|
1488
|
+
DataLen => $dataLen,
|
1489
|
+
DirStart => $subdirStart,
|
1490
|
+
DirName => $subdirName,
|
1491
|
+
Name => $$newInfo{Name},
|
1492
|
+
TagInfo => $newInfo,
|
1493
|
+
Parent => $dirName,
|
1494
|
+
Fixup => new Image::ExifTool::Fixup,
|
1495
|
+
RAF => $raf,
|
1496
|
+
Subdir => $subdir,
|
1497
|
+
# set ImageData only for 1st level SubIFD's
|
1498
|
+
ImageData=> $imageDataFlag eq 'Main' ? 'SubIFD' : undef,
|
1499
|
+
);
|
1500
|
+
# pass on header pointer only for certain sub IFD's
|
1501
|
+
$subdirInfo{HeaderPtr} = $$dirInfo{HeaderPtr} if $$newInfo{SubIFD} == 2;
|
1502
|
+
if ($$subdir{RelativeBase}) {
|
1503
|
+
# apply one-time fixup if offsets are relative (Sony IDC hack)
|
1504
|
+
delete $subdirInfo{Fixup};
|
1505
|
+
delete $subdirInfo{ImageData};
|
1506
|
+
}
|
1507
|
+
# is the subdirectory outside our current data?
|
1508
|
+
if ($subdirStart < 0 or $subdirStart + 2 > $dataLen) {
|
1509
|
+
if ($raf) {
|
1510
|
+
# reset SubDirectory buffer (we will load it later)
|
1511
|
+
my $buff = '';
|
1512
|
+
$subdirInfo{DataPt} = \$buff;
|
1513
|
+
$subdirInfo{DataLen} = 0;
|
1514
|
+
} else {
|
1515
|
+
my @err = ("Can't read $subdirName data", $inMakerNotes);
|
1516
|
+
if ($$subTable{VARS} and $$subTable{VARS}{MINOR_ERRORS}) {
|
1517
|
+
$et->Warn($err[0] . '. Ignored.');
|
1518
|
+
} elsif ($et->Error(@err)) {
|
1519
|
+
return undef;
|
1520
|
+
}
|
1521
|
+
next Entry; # don't write this directory
|
1522
|
+
}
|
1523
|
+
}
|
1524
|
+
my $subdirData = $et->WriteDirectory(\%subdirInfo, $subTable, $$subdir{WriteProc});
|
1525
|
+
unless (defined $subdirData) {
|
1526
|
+
# WriteDirectory should have issued an error, but check just in case
|
1527
|
+
$et->Error("Error writing $subdirName") unless $$et{VALUE}{Error};
|
1528
|
+
return undef;
|
1529
|
+
}
|
1530
|
+
# add back original header if necessary (eg. Ricoh GR)
|
1531
|
+
if ($hdrLen and $hdrLen > 0 and $subdirStart <= $dataLen) {
|
1532
|
+
$subdirData = substr($$dataPt, $subdirStart - $hdrLen, $hdrLen) . $subdirData;
|
1533
|
+
$subdirInfo{Fixup}{Start} += $hdrLen;
|
1534
|
+
}
|
1535
|
+
unless (length $subdirData) {
|
1536
|
+
next unless $inMakerNotes;
|
1537
|
+
# don't delete MakerNote Sub-IFD's, write empty IFD instead
|
1538
|
+
$subdirData = "\0" x 6;
|
1539
|
+
# reset SubIFD ImageData and Fixup just to be safe
|
1540
|
+
delete $subdirInfo{ImageData};
|
1541
|
+
delete $subdirInfo{Fixup};
|
1542
|
+
}
|
1543
|
+
# handle data blocks that we will transfer later
|
1544
|
+
if (ref $subdirInfo{ImageData}) {
|
1545
|
+
push @imageData, @{$subdirInfo{ImageData}};
|
1546
|
+
$$origDirInfo{ImageData} = \@imageData;
|
1547
|
+
}
|
1548
|
+
# temporarily set value to subdirectory index
|
1549
|
+
# (will set to actual offset later when we know what it is)
|
1550
|
+
$newValue .= Set32u(0xfeedf00d);
|
1551
|
+
my ($offset, $where);
|
1552
|
+
if ($readCount > 1) {
|
1553
|
+
$offset = length($valBuff) + $i * 4;
|
1554
|
+
$where = 'valBuff';
|
1555
|
+
} else {
|
1556
|
+
$offset = length($dirBuff) + 8;
|
1557
|
+
$where = 'dirBuff';
|
1558
|
+
}
|
1559
|
+
# add to list of subdirectories we will append later
|
1560
|
+
push @subdirs, {
|
1561
|
+
DataPt => \$subdirData,
|
1562
|
+
Table => $subTable,
|
1563
|
+
Fixup => $subdirInfo{Fixup},
|
1564
|
+
Offset => $offset,
|
1565
|
+
Where => $where,
|
1566
|
+
ImageData => $subdirInfo{ImageData},
|
1567
|
+
};
|
1568
|
+
++$writeCount; # count number of subdirs written
|
1569
|
+
}
|
1570
|
+
next unless length $newValue;
|
1571
|
+
# must change location of subdir offset if we deleted
|
1572
|
+
# a directory and only one remains
|
1573
|
+
if ($writeCount < $readCount and $writeCount == 1) {
|
1574
|
+
$subdirs[-1]{Where} = 'dirBuff';
|
1575
|
+
$subdirs[-1]{Offset} = length($dirBuff) + 8;
|
1576
|
+
}
|
1577
|
+
# set new format to int32u for IFD
|
1578
|
+
$newFormName = $$newInfo{FixFormat} || 'int32u';
|
1579
|
+
$newFormat = $formatNumber{$newFormName};
|
1580
|
+
$newValuePt = \$newValue;
|
1581
|
+
|
1582
|
+
} elsif ((not defined $$subdir{Start} or
|
1583
|
+
$$subdir{Start} =~ /\$valuePtr/) and
|
1584
|
+
$$subdir{TagTable})
|
1585
|
+
{
|
1586
|
+
#
|
1587
|
+
# rewrite other existing subdirectories ('$valuePtr' type only)
|
1588
|
+
#
|
1589
|
+
# set subdirectory Start and Base
|
1590
|
+
my $subdirStart = $valuePtr;
|
1591
|
+
if ($$subdir{Start}) {
|
1592
|
+
#### eval Start ($valuePtr)
|
1593
|
+
$subdirStart = eval $$subdir{Start};
|
1594
|
+
# must adjust directory size if start changed
|
1595
|
+
$oldSize -= $subdirStart - $valuePtr;
|
1596
|
+
}
|
1597
|
+
my $subdirBase = $base;
|
1598
|
+
if ($$subdir{Base}) {
|
1599
|
+
my $start = $subdirStart + $valueDataPos;
|
1600
|
+
#### eval Base ($start,$base)
|
1601
|
+
$subdirBase += eval $$subdir{Base};
|
1602
|
+
}
|
1603
|
+
my $subFixup = new Image::ExifTool::Fixup;
|
1604
|
+
my %subdirInfo = (
|
1605
|
+
Base => $subdirBase,
|
1606
|
+
DataPt => $valueDataPt,
|
1607
|
+
DataPos => $valueDataPos - $subdirBase + $base,
|
1608
|
+
DataLen => $valueDataLen,
|
1609
|
+
DirStart => $subdirStart,
|
1610
|
+
DirName => $$subdir{DirName},
|
1611
|
+
DirLen => $oldSize,
|
1612
|
+
Parent => $dirName,
|
1613
|
+
Fixup => $subFixup,
|
1614
|
+
RAF => $raf,
|
1615
|
+
TagInfo => $newInfo,
|
1616
|
+
);
|
1617
|
+
unless ($oldSize) {
|
1618
|
+
# replace with dummy data if empty to prevent WriteDirectory
|
1619
|
+
# routines from accessing data they shouldn't
|
1620
|
+
my $tmp = '';
|
1621
|
+
$subdirInfo{DataPt} = \$tmp;
|
1622
|
+
$subdirInfo{DataLen} = 0;
|
1623
|
+
$subdirInfo{DirStart} = 0;
|
1624
|
+
$subdirInfo{DataPos} += $subdirStart;
|
1625
|
+
}
|
1626
|
+
my $subTable = Image::ExifTool::GetTagTable($$subdir{TagTable});
|
1627
|
+
my $oldOrder = GetByteOrder();
|
1628
|
+
SetByteOrder($$subdir{ByteOrder}) if $$subdir{ByteOrder};
|
1629
|
+
$newValue = $et->WriteDirectory(\%subdirInfo, $subTable, $$subdir{WriteProc});
|
1630
|
+
SetByteOrder($oldOrder);
|
1631
|
+
if (defined $newValue) {
|
1632
|
+
my $hdrLen = $subdirStart - $valuePtr;
|
1633
|
+
if ($hdrLen) {
|
1634
|
+
$newValue = substr($$valueDataPt, $valuePtr, $hdrLen) . $newValue;
|
1635
|
+
$$subFixup{Start} += $hdrLen;
|
1636
|
+
}
|
1637
|
+
$newValuePt = \$newValue;
|
1638
|
+
} else {
|
1639
|
+
$newValuePt = \$oldValue;
|
1640
|
+
}
|
1641
|
+
unless (length $$newValuePt) {
|
1642
|
+
# don't delete a previously empty makernote directory
|
1643
|
+
next if $oldSize or not $inMakerNotes;
|
1644
|
+
}
|
1645
|
+
if ($$subFixup{Pointers} and $subdirInfo{Base} == $base) {
|
1646
|
+
$$subFixup{Start} += length $valBuff;
|
1647
|
+
push @valFixups, $subFixup;
|
1648
|
+
} else {
|
1649
|
+
# apply fixup in case we added a header ($hdrLen above)
|
1650
|
+
$subFixup->ApplyFixup(\$newValue);
|
1651
|
+
}
|
1652
|
+
}
|
1653
|
+
|
1654
|
+
} elsif ($$newInfo{OffsetPair}) {
|
1655
|
+
#
|
1656
|
+
# keep track of offsets
|
1657
|
+
#
|
1658
|
+
my $dataTag = $$newInfo{DataTag} || '';
|
1659
|
+
if ($dataTag eq 'CanonVRD') {
|
1660
|
+
# must decide now if we will write CanonVRD information
|
1661
|
+
my $hasVRD;
|
1662
|
+
if ($$et{NEW_VALUE}{$Image::ExifTool::Extra{CanonVRD}}) {
|
1663
|
+
# adding or deleting as a block
|
1664
|
+
$hasVRD = $et->GetNewValue('CanonVRD') ? 1 : 0;
|
1665
|
+
} elsif ($$et{DEL_GROUP}{CanonVRD} or
|
1666
|
+
$$et{DEL_GROUP}{Trailer})
|
1667
|
+
{
|
1668
|
+
$hasVRD = 0; # deleting as a group
|
1669
|
+
} else {
|
1670
|
+
$hasVRD = ($$newValuePt ne "\0\0\0\0");
|
1671
|
+
}
|
1672
|
+
if ($hasVRD) {
|
1673
|
+
# add a fixup, and set this offset later
|
1674
|
+
$dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
|
1675
|
+
} else {
|
1676
|
+
# there is (or will soon be) no VRD information, so set pointer to zero
|
1677
|
+
$newValue = "\0" x length($$newValuePt);
|
1678
|
+
$newValuePt = \$newValue;
|
1679
|
+
}
|
1680
|
+
} elsif ($dataTag eq 'OriginalDecisionData') {
|
1681
|
+
# handle Canon OriginalDecisionData (no associated length tag)
|
1682
|
+
# - I'm going out of my way here to preserve data which is
|
1683
|
+
# invalidated anyway by our edits
|
1684
|
+
my $odd;
|
1685
|
+
my $oddInfo = $Image::ExifTool::Composite{OriginalDecisionData};
|
1686
|
+
if ($oddInfo and $$et{NEW_VALUE}{$oddInfo}) {
|
1687
|
+
$odd = $et->GetNewValue($dataTag);
|
1688
|
+
if ($verbose > 1) {
|
1689
|
+
print $out " - $dirName:$dataTag\n" if $$newValuePt ne "\0\0\0\0";
|
1690
|
+
print $out " + $dirName:$dataTag\n" if $odd;
|
1691
|
+
}
|
1692
|
+
++$$et{CHANGED};
|
1693
|
+
} elsif ($$newValuePt ne "\0\0\0\0") {
|
1694
|
+
if (length($$newValuePt) == 4) {
|
1695
|
+
require Image::ExifTool::Canon;
|
1696
|
+
my $offset = Get32u($newValuePt,0);
|
1697
|
+
# absolute offset in JPEG images only
|
1698
|
+
$offset += $base unless $$et{FILE_TYPE} eq 'JPEG';
|
1699
|
+
$odd = Image::ExifTool::Canon::ReadODD($et, $offset);
|
1700
|
+
$odd = $$odd if ref $odd;
|
1701
|
+
} else {
|
1702
|
+
$et->Error("Invalid $$newInfo{Name}",1);
|
1703
|
+
}
|
1704
|
+
}
|
1705
|
+
if ($odd) {
|
1706
|
+
my $newOffset = length($valBuff);
|
1707
|
+
# (ODD offset is absolute in JPEG, so add base offset!)
|
1708
|
+
$newOffset += $base if $$et{FILE_TYPE} eq 'JPEG';
|
1709
|
+
$newValue = Set32u($newOffset);
|
1710
|
+
$dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
|
1711
|
+
$valBuff .= $odd; # add original decision data
|
1712
|
+
} else {
|
1713
|
+
$newValue = "\0\0\0\0";
|
1714
|
+
}
|
1715
|
+
$newValuePt = \$newValue;
|
1716
|
+
} else {
|
1717
|
+
my $offsetInfo = $offsetInfo[$ifd];
|
1718
|
+
# save original values (for updating TIFF_END later)
|
1719
|
+
my @vals;
|
1720
|
+
if ($isNew <= 0) {
|
1721
|
+
my $oldOrder = GetByteOrder();
|
1722
|
+
# Minolta A200 stores these in the wrong byte order!
|
1723
|
+
SetByteOrder($$newInfo{ByteOrder}) if $$newInfo{ByteOrder};
|
1724
|
+
@vals = ReadValue(\$oldValue, 0, $readFormName, $readCount, $oldSize);
|
1725
|
+
SetByteOrder($oldOrder);
|
1726
|
+
}
|
1727
|
+
# only support int32 pointers (for now)
|
1728
|
+
if ($formatSize[$newFormat] != 4 and $$newInfo{IsOffset}) {
|
1729
|
+
$isNew > 0 and warn("Internal error (Offset not int32)"), return undef;
|
1730
|
+
$newCount != $readCount and warn("Wrong count!"), return undef;
|
1731
|
+
# change to int32
|
1732
|
+
$newFormName = 'int32u';
|
1733
|
+
$newFormat = $formatNumber{$newFormName};
|
1734
|
+
$newValue = WriteValue(join(' ',@vals), $newFormName, $newCount);
|
1735
|
+
unless (defined $newValue) {
|
1736
|
+
warn "Internal error writing offsets for $$newInfo{Name}\n";
|
1737
|
+
return undef;
|
1738
|
+
}
|
1739
|
+
}
|
1740
|
+
$offsetInfo or $offsetInfo = $offsetInfo[$ifd] = { };
|
1741
|
+
# save location of valuePtr in new directory
|
1742
|
+
# (notice we add 10 instead of 8 for valuePtr because
|
1743
|
+
# we will put a 2-byte count at start of directory later)
|
1744
|
+
my $ptr = $newStart + length($dirBuff) + 10;
|
1745
|
+
$newCount or $newCount = 1; # make sure count is set for offsetInfo
|
1746
|
+
# save value pointer and value count for each tag
|
1747
|
+
$$offsetInfo{$newID} = [$newInfo, $ptr, $newCount, \@vals, $newFormat];
|
1748
|
+
}
|
1749
|
+
|
1750
|
+
} elsif ($$newInfo{DataMember}) {
|
1751
|
+
|
1752
|
+
# save any necessary data members (Make, Model, etc)
|
1753
|
+
my $formatStr = $newFormName;
|
1754
|
+
my $count = $newCount;
|
1755
|
+
# change to specified format if necessary
|
1756
|
+
if ($$newInfo{Format} and $$newInfo{Format} ne $formatStr) {
|
1757
|
+
$formatStr = $$newInfo{Format};
|
1758
|
+
my $format = $formatNumber{$formatStr};
|
1759
|
+
# adjust number of items for new format size
|
1760
|
+
$count = int(length($$newValuePt) / $formatSize[$format]) if $format;
|
1761
|
+
}
|
1762
|
+
my $val = ReadValue($newValuePt,0,$formatStr,$count,length($$newValuePt));
|
1763
|
+
my $conv = $$newInfo{RawConv};
|
1764
|
+
if ($conv) {
|
1765
|
+
# let the RawConv store the (possibly converted) data member
|
1766
|
+
if (ref $conv eq 'CODE') {
|
1767
|
+
&$conv($val, $et);
|
1768
|
+
} else {
|
1769
|
+
my ($self, $tag, $taginfo) = ($et, $$newInfo{Name}, $newInfo);
|
1770
|
+
#### eval RawConv ($self, $val, $tag, $tagInfo)
|
1771
|
+
eval $conv;
|
1772
|
+
}
|
1773
|
+
} else {
|
1774
|
+
$$et{$$newInfo{DataMember}} = $val;
|
1775
|
+
}
|
1776
|
+
}
|
1777
|
+
}
|
1778
|
+
#
|
1779
|
+
# write out the directory entry
|
1780
|
+
#
|
1781
|
+
my $newSize = length($$newValuePt);
|
1782
|
+
my $fsize = $formatSize[$newFormat];
|
1783
|
+
my $offsetVal;
|
1784
|
+
$newCount = int(($newSize + $fsize - 1) / $fsize); # set proper count
|
1785
|
+
if ($newSize > 4) {
|
1786
|
+
# zero-pad to an even number of bytes (required by EXIF standard)
|
1787
|
+
# and make sure we are a multiple of the format size
|
1788
|
+
while ($newSize & 0x01 or $newSize < $newCount * $fsize) {
|
1789
|
+
$$newValuePt .= "\0";
|
1790
|
+
++$newSize;
|
1791
|
+
}
|
1792
|
+
my $entryBased;
|
1793
|
+
if ($$dirInfo{EntryBased} or ($newInfo and $$newInfo{EntryBased})) {
|
1794
|
+
$entryBased = 1;
|
1795
|
+
$offsetVal = Set32u(length($valBuff) - length($dirBuff));
|
1796
|
+
} else {
|
1797
|
+
$offsetVal = Set32u(length $valBuff);
|
1798
|
+
}
|
1799
|
+
my ($dataTag, $putFirst);
|
1800
|
+
($dataTag, $putFirst) = @$newInfo{'DataTag','PutFirst'} if $newInfo;
|
1801
|
+
if ($dataTag) {
|
1802
|
+
if ($dataTag eq 'PreviewImage' and ($$et{FILE_TYPE} eq 'JPEG' or
|
1803
|
+
$$et{GENERATE_PREVIEW_INFO}))
|
1804
|
+
{
|
1805
|
+
# hold onto the PreviewImage until we can determine if it fits
|
1806
|
+
$$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
|
1807
|
+
Data => $$newValuePt,
|
1808
|
+
Fixup => new Image::ExifTool::Fixup,
|
1809
|
+
};
|
1810
|
+
$$et{PREVIEW_INFO}{ChangeBase} = 1 if $$newInfo{ChangeBase};
|
1811
|
+
if ($$newInfo{IsOffset} and $$newInfo{IsOffset} eq '2') {
|
1812
|
+
$$et{PREVIEW_INFO}{NoBaseShift} = 1;
|
1813
|
+
}
|
1814
|
+
# use original preview size if we will attempt to load it later
|
1815
|
+
$newCount = $oldCount if $$newValuePt eq 'LOAD_PREVIEW';
|
1816
|
+
$$newValuePt = '';
|
1817
|
+
} elsif ($dataTag eq 'LeicaTrailer' and $$et{LeicaTrailer}) {
|
1818
|
+
$$newValuePt = '';
|
1819
|
+
}
|
1820
|
+
}
|
1821
|
+
if ($putFirst and $$dirInfo{HeaderPtr}) {
|
1822
|
+
my $hdrPtr = $$dirInfo{HeaderPtr};
|
1823
|
+
# place this value immediately after the TIFF header (eg. IIQ maker notes)
|
1824
|
+
$offsetVal = Set32u(length $$hdrPtr);
|
1825
|
+
$$hdrPtr .= $$newValuePt;
|
1826
|
+
} else {
|
1827
|
+
$valBuff .= $$newValuePt; # add value data to buffer
|
1828
|
+
# must save a fixup pointer for every pointer in the directory
|
1829
|
+
if ($entryBased) {
|
1830
|
+
$entryBasedFixup or $entryBasedFixup = new Image::ExifTool::Fixup;
|
1831
|
+
$entryBasedFixup->AddFixup(length($dirBuff) + 8, $dataTag);
|
1832
|
+
} else {
|
1833
|
+
$dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
|
1834
|
+
}
|
1835
|
+
}
|
1836
|
+
} else {
|
1837
|
+
$offsetVal = $$newValuePt; # save value in offset if 4 bytes or less
|
1838
|
+
# must pad value with zeros if less than 4 bytes
|
1839
|
+
$newSize < 4 and $offsetVal .= "\0" x (4 - $newSize);
|
1840
|
+
}
|
1841
|
+
# write the directory entry
|
1842
|
+
$dirBuff .= Set16u($newID) . Set16u($newFormat) .
|
1843
|
+
Set32u($newCount) . $offsetVal;
|
1844
|
+
# update flag to keep track of mandatory tags
|
1845
|
+
while (defined $allMandatory) {
|
1846
|
+
if (defined $$mandatory{$newID}) {
|
1847
|
+
# values must correspond to mandatory values
|
1848
|
+
my $form = $$newInfo{Format} || $newFormName;
|
1849
|
+
my $mandVal = WriteValue($$mandatory{$newID}, $form, $newCount);
|
1850
|
+
if (defined $mandVal and $mandVal eq $$newValuePt) {
|
1851
|
+
++$allMandatory; # count mandatory tags
|
1852
|
+
last;
|
1853
|
+
}
|
1854
|
+
}
|
1855
|
+
undef $deleteAll;
|
1856
|
+
undef $allMandatory;
|
1857
|
+
}
|
1858
|
+
}
|
1859
|
+
if ($ignoreCount) {
|
1860
|
+
my $y = $ignoreCount > 1 ? 'ies' : 'y';
|
1861
|
+
my $verb = $$dirInfo{FixBase} ? 'Ignored' : 'Removed';
|
1862
|
+
$et->Warn("$verb $ignoreCount invalid entr$y from $name", 1);
|
1863
|
+
}
|
1864
|
+
if ($fixCount) {
|
1865
|
+
my $s = $fixCount > 1 ? 's' : '';
|
1866
|
+
$et->Warn("Fixed invalid count$s for $fixCount $name tag$s", 1);
|
1867
|
+
}
|
1868
|
+
#..............................................................................
|
1869
|
+
# write directory counts and nextIFD pointer and add value data to end of IFD
|
1870
|
+
#
|
1871
|
+
# determine now if there is or will be another IFD after this one
|
1872
|
+
my $nextIfdOffset;
|
1873
|
+
if ($dirEnd + 4 <= $dataLen) {
|
1874
|
+
$nextIfdOffset = Get32u($dataPt, $dirEnd);
|
1875
|
+
} else {
|
1876
|
+
$nextIfdOffset = 0;
|
1877
|
+
}
|
1878
|
+
my $isNextIFD = ($$dirInfo{Multi} and ($nextIfdOffset or
|
1879
|
+
# account for the case where we will create the next IFD
|
1880
|
+
# (IFD1 only, but not in TIFF-format images)
|
1881
|
+
($dirName eq 'IFD0' and $$et{ADD_DIRS}{'IFD1'} and
|
1882
|
+
$$et{FILE_TYPE} ne 'TIFF')));
|
1883
|
+
# calculate number of entries in new directory
|
1884
|
+
my $newEntries = length($dirBuff) / 12;
|
1885
|
+
# delete entire directory if we deleted a tag and only mandatory tags remain or we
|
1886
|
+
# attempted to create a directory with only mandatory tags and there is no nextIFD
|
1887
|
+
if ($allMandatory and not $isNextIFD and ($newEntries < $numEntries or $numEntries == 0)) {
|
1888
|
+
$newEntries = 0;
|
1889
|
+
$dirBuff = '';
|
1890
|
+
$valBuff = '';
|
1891
|
+
undef $dirFixup; # no fixups in this directory
|
1892
|
+
++$deleteAll if defined $deleteAll;
|
1893
|
+
$verbose > 1 and print $out " - $allMandatory mandatory tag(s)\n";
|
1894
|
+
$$et{CHANGED} -= $addMandatory; # didn't change these after all
|
1895
|
+
}
|
1896
|
+
if ($ifd and not $newEntries) {
|
1897
|
+
$verbose and print $out " Deleting IFD1\n";
|
1898
|
+
last; # don't write IFD1 if empty
|
1899
|
+
}
|
1900
|
+
# apply one-time fixup for entry-based offsets
|
1901
|
+
if ($entryBasedFixup) {
|
1902
|
+
$$entryBasedFixup{Shift} = length($dirBuff) + 4;
|
1903
|
+
$entryBasedFixup->ApplyFixup(\$dirBuff);
|
1904
|
+
undef $entryBasedFixup;
|
1905
|
+
}
|
1906
|
+
# initialize next IFD pointer to zero
|
1907
|
+
my $nextIFD = Set32u(0);
|
1908
|
+
# some cameras use a different amount of padding after the makernote IFD
|
1909
|
+
if ($dirName eq 'MakerNotes' and $$dirInfo{Parent} =~ /^(ExifIFD|IFD0)$/) {
|
1910
|
+
my ($rel, $pad) = Image::ExifTool::MakerNotes::GetMakerNoteOffset($et);
|
1911
|
+
$nextIFD = "\0" x $pad if defined $pad and ($pad==0 or ($pad>4 and $pad<=32));
|
1912
|
+
}
|
1913
|
+
# add directory entry count to start of IFD and next IFD pointer to end
|
1914
|
+
$newData .= Set16u($newEntries) . $dirBuff . $nextIFD;
|
1915
|
+
# get position of value data in newData
|
1916
|
+
my $valPos = length($newData);
|
1917
|
+
# go back now and set next IFD pointer if this isn't the first IFD
|
1918
|
+
if ($nextIfdPos) {
|
1919
|
+
# set offset to next IFD
|
1920
|
+
Set32u($newStart, \$newData, $nextIfdPos);
|
1921
|
+
$fixup->AddFixup($nextIfdPos,'NextIFD'); # add fixup for this offset in newData
|
1922
|
+
}
|
1923
|
+
# remember position of 'next IFD' pointer so we can set it next time around
|
1924
|
+
$nextIfdPos = length($nextIFD) ? $valPos - length($nextIFD) : undef;
|
1925
|
+
# add value data after IFD
|
1926
|
+
$newData .= $valBuff;
|
1927
|
+
#
|
1928
|
+
# add any subdirectories, adding fixup information
|
1929
|
+
#
|
1930
|
+
if (@subdirs) {
|
1931
|
+
my $subdir;
|
1932
|
+
foreach $subdir (@subdirs) {
|
1933
|
+
my $len = length($newData); # position of subdirectory in data
|
1934
|
+
my $subdirFixup = $$subdir{Fixup};
|
1935
|
+
if ($subdirFixup) {
|
1936
|
+
$$subdirFixup{Start} += $len;
|
1937
|
+
$fixup->AddFixup($subdirFixup);
|
1938
|
+
}
|
1939
|
+
my $imageData = $$subdir{ImageData};
|
1940
|
+
my $blockSize = 0;
|
1941
|
+
# must also update start position for ImageData fixups
|
1942
|
+
if (ref $imageData) {
|
1943
|
+
my $blockInfo;
|
1944
|
+
foreach $blockInfo (@$imageData) {
|
1945
|
+
my ($pos, $size, $pad, $entry, $subFix) = @$blockInfo;
|
1946
|
+
if ($subFix) {
|
1947
|
+
$$subFix{Start} += $len;
|
1948
|
+
# save expected image data offset for calculating shift later
|
1949
|
+
$$subFix{BlockLen} = length(${$$subdir{DataPt}}) + $blockSize;
|
1950
|
+
}
|
1951
|
+
$blockSize += $size + $pad;
|
1952
|
+
}
|
1953
|
+
}
|
1954
|
+
$newData .= ${$$subdir{DataPt}}; # add subdirectory to our data
|
1955
|
+
undef ${$$subdir{DataPt}}; # free memory now
|
1956
|
+
# set the pointer
|
1957
|
+
my $offset = $$subdir{Offset};
|
1958
|
+
# if offset is in valBuff, it was added to the end of dirBuff
|
1959
|
+
# (plus 4 bytes for nextIFD pointer)
|
1960
|
+
$offset += length($dirBuff) + 4 if $$subdir{Where} eq 'valBuff';
|
1961
|
+
$offset += $newStart + 2; # get offset in newData
|
1962
|
+
# check to be sure we got the right offset
|
1963
|
+
unless (Get32u(\$newData, $offset) == 0xfeedf00d) {
|
1964
|
+
$et->Error("Internal error while rewriting $name");
|
1965
|
+
return undef;
|
1966
|
+
}
|
1967
|
+
# set the offset to the subdirectory data
|
1968
|
+
Set32u($len, \$newData, $offset);
|
1969
|
+
$fixup->AddFixup($offset); # add fixup for this offset in newData
|
1970
|
+
}
|
1971
|
+
}
|
1972
|
+
# add fixup for all offsets in directory according to value data position
|
1973
|
+
# (which is at the end of this directory)
|
1974
|
+
if ($dirFixup) {
|
1975
|
+
$$dirFixup{Start} = $newStart + 2;
|
1976
|
+
$$dirFixup{Shift} = $valPos - $$dirFixup{Start};
|
1977
|
+
$fixup->AddFixup($dirFixup);
|
1978
|
+
}
|
1979
|
+
# add valueData fixups, adjusting for position of value data
|
1980
|
+
my $valFixup;
|
1981
|
+
foreach $valFixup (@valFixups) {
|
1982
|
+
$$valFixup{Start} += $valPos;
|
1983
|
+
$fixup->AddFixup($valFixup);
|
1984
|
+
}
|
1985
|
+
# stop if no next IFD pointer
|
1986
|
+
last unless $isNextIFD; # stop unless scanning for multiple IFD's
|
1987
|
+
if ($nextIfdOffset) {
|
1988
|
+
# continue with next IFD
|
1989
|
+
$dirStart = $nextIfdOffset - $dataPos;
|
1990
|
+
} else {
|
1991
|
+
# create IFD1 if necessary
|
1992
|
+
$verbose and print $out " Creating IFD1\n";
|
1993
|
+
my $ifd1 = "\0" x 2; # empty IFD1 data (zero entry count)
|
1994
|
+
$dataPt = \$ifd1;
|
1995
|
+
$dirStart = 0;
|
1996
|
+
$dirLen = $dataLen = 2;
|
1997
|
+
}
|
1998
|
+
# increment IFD name
|
1999
|
+
my $ifdNum = $dirName =~ s/(\d+)$// ? $1 : 0;
|
2000
|
+
$dirName .= $ifdNum + 1;
|
2001
|
+
$name =~ s/\d+$//;
|
2002
|
+
$name .= $ifdNum + 1;
|
2003
|
+
$$et{DIR_NAME} = $$et{PATH}[-1] = $dirName;
|
2004
|
+
next unless $nextIfdOffset;
|
2005
|
+
|
2006
|
+
# guard against writing the same directory twice
|
2007
|
+
my $addr = $nextIfdOffset + $base;
|
2008
|
+
if ($$et{PROCESSED}{$addr}) {
|
2009
|
+
$et->Error("$name pointer references previous $$et{PROCESSED}{$addr} directory", 1);
|
2010
|
+
last;
|
2011
|
+
}
|
2012
|
+
$$et{PROCESSED}{$addr} = $name;
|
2013
|
+
|
2014
|
+
if ($dirName eq 'SubIFD1' and not ValidateIFD($dirInfo, $dirStart)) {
|
2015
|
+
if ($$et{TIFF_TYPE} eq 'TIFF') {
|
2016
|
+
$et->Error('Ignored bad IFD linked from SubIFD', 1);
|
2017
|
+
} elsif ($verbose) {
|
2018
|
+
$et->Warn('Ignored bad IFD linked from SubIFD');
|
2019
|
+
}
|
2020
|
+
last; # don't write bad IFD
|
2021
|
+
}
|
2022
|
+
if ($$et{DEL_GROUP}{$dirName}) {
|
2023
|
+
$verbose and print $out " Deleting $dirName\n";
|
2024
|
+
$raf and $et->Error("Deleting $dirName also deletes subsequent" .
|
2025
|
+
" IFD's and possibly image data", 1);
|
2026
|
+
++$$et{CHANGED};
|
2027
|
+
if ($$et{DEL_GROUP}{$dirName} == 2 and
|
2028
|
+
$$et{ADD_DIRS}{$dirName})
|
2029
|
+
{
|
2030
|
+
my $emptyIFD = "\0" x 2; # start with empty IFD
|
2031
|
+
$dataPt = \$emptyIFD;
|
2032
|
+
$dirStart = 0;
|
2033
|
+
$dirLen = $dataLen = 2;
|
2034
|
+
} else {
|
2035
|
+
last; # don't write this IFD (or any subsequent IFD)
|
2036
|
+
}
|
2037
|
+
} else {
|
2038
|
+
$verbose and print $out " Rewriting $name\n";
|
2039
|
+
}
|
2040
|
+
}
|
2041
|
+
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
2042
|
+
|
2043
|
+
# do our fixups now so we can more easily calculate offsets below
|
2044
|
+
$fixup->ApplyFixup(\$newData);
|
2045
|
+
#
|
2046
|
+
# determine total block size for deferred data
|
2047
|
+
#
|
2048
|
+
my $numBlocks = scalar @imageData; # save this so we scan only existing blocks later
|
2049
|
+
my $blockSize = 0; # total size of blocks to copy later
|
2050
|
+
my $blockInfo;
|
2051
|
+
foreach $blockInfo (@imageData) {
|
2052
|
+
my ($pos, $size, $pad) = @$blockInfo;
|
2053
|
+
$blockSize += $size + $pad;
|
2054
|
+
}
|
2055
|
+
#
|
2056
|
+
# copy over image data for IFD's, starting with the last IFD first
|
2057
|
+
#
|
2058
|
+
if (@offsetInfo) {
|
2059
|
+
my $ttwLen; # length of MRW TTW segment
|
2060
|
+
my @writeLater; # write image data last
|
2061
|
+
for ($ifd=$#offsetInfo; $ifd>=-1; --$ifd) {
|
2062
|
+
# build list of offsets to process
|
2063
|
+
my @offsetList;
|
2064
|
+
if ($ifd >= 0) {
|
2065
|
+
my $offsetInfo = $offsetInfo[$ifd] or next;
|
2066
|
+
# patch Panasonic RAW/RW2 StripOffsets/StripByteCounts if necessary
|
2067
|
+
my $stripOffsets = $$offsetInfo{0x111};
|
2068
|
+
if ($stripOffsets and $$stripOffsets[0]{PanasonicHack}) {
|
2069
|
+
require Image::ExifTool::PanasonicRaw;
|
2070
|
+
my $err = Image::ExifTool::PanasonicRaw::PatchRawDataOffset($offsetInfo, $raf, $ifd);
|
2071
|
+
$err and $et->Error($err);
|
2072
|
+
}
|
2073
|
+
my $tagID;
|
2074
|
+
# loop through all tags in reverse order so we save thumbnail
|
2075
|
+
# data before main image data if both exist in the same IFD
|
2076
|
+
foreach $tagID (reverse sort keys %$offsetInfo) {
|
2077
|
+
my $tagInfo = $$offsetInfo{$tagID}[0];
|
2078
|
+
next unless $$tagInfo{IsOffset}; # handle byte counts with offsets
|
2079
|
+
my $sizeInfo = $$offsetInfo{$$tagInfo{OffsetPair}};
|
2080
|
+
$sizeInfo or $et->Error("No size tag for $dirName:$$tagInfo{Name}"), next;
|
2081
|
+
my $dataTag = $$tagInfo{DataTag};
|
2082
|
+
# write TIFF image data (strips or tiles) later if requested
|
2083
|
+
if ($raf and defined $$origDirInfo{ImageData} and
|
2084
|
+
($tagID == 0x111 or $tagID == 0x144 or
|
2085
|
+
# also defer writing of other big data such as JpgFromRaw in NEF
|
2086
|
+
($$sizeInfo[3][0] and
|
2087
|
+
# (calculate approximate combined size of all blocks)
|
2088
|
+
$$sizeInfo[3][0] * scalar(@{$$sizeInfo[3]}) > 1000000)) and
|
2089
|
+
# but don't defer writing if replacing with new value
|
2090
|
+
(not defined $dataTag or not defined $offsetData{$dataTag}))
|
2091
|
+
{
|
2092
|
+
push @writeLater, [ $$offsetInfo{$tagID}, $sizeInfo ];
|
2093
|
+
} else {
|
2094
|
+
push @offsetList, [ $$offsetInfo{$tagID}, $sizeInfo ];
|
2095
|
+
}
|
2096
|
+
}
|
2097
|
+
} else {
|
2098
|
+
last unless @writeLater;
|
2099
|
+
@offsetList = @writeLater;
|
2100
|
+
}
|
2101
|
+
my $offsetPair;
|
2102
|
+
foreach $offsetPair (@offsetList) {
|
2103
|
+
my ($tagInfo, $offsets, $count, $oldOffset) = @{$$offsetPair[0]};
|
2104
|
+
my ($cntInfo, $byteCounts, $count2, $oldSize, $format) = @{$$offsetPair[1]};
|
2105
|
+
# must be the same number of offset and byte count values
|
2106
|
+
unless ($count == $count2) {
|
2107
|
+
$et->Error("Offsets/ByteCounts disagree on count for $$tagInfo{Name}");
|
2108
|
+
return undef;
|
2109
|
+
}
|
2110
|
+
my $formatStr = $formatName[$format];
|
2111
|
+
# follow pointer to value data if necessary
|
2112
|
+
$count > 1 and $offsets = Get32u(\$newData, $offsets);
|
2113
|
+
my $n = $count * $formatSize[$format];
|
2114
|
+
$n > 4 and $byteCounts = Get32u(\$newData, $byteCounts);
|
2115
|
+
if ($byteCounts < 0 or $byteCounts + $n > length($newData)) {
|
2116
|
+
$et->Error("Error reading $$tagInfo{Name} byte counts");
|
2117
|
+
return undef;
|
2118
|
+
}
|
2119
|
+
# get offset base and data pos (abnormal for some preview images)
|
2120
|
+
my ($dbase, $dpos, $wrongBase, $subIfdDataFixup);
|
2121
|
+
if ($$tagInfo{IsOffset} eq '2') {
|
2122
|
+
$dbase = $firstBase;
|
2123
|
+
$dpos = $dataPos + $base - $firstBase;
|
2124
|
+
} else {
|
2125
|
+
$dbase = $base;
|
2126
|
+
$dpos = $dataPos;
|
2127
|
+
}
|
2128
|
+
# use different base if necessary for some offsets (Minolta A200)
|
2129
|
+
if ($$tagInfo{WrongBase}) {
|
2130
|
+
my $self = $et;
|
2131
|
+
#### eval WrongBase ($self)
|
2132
|
+
$wrongBase = eval $$tagInfo{WrongBase} || 0;
|
2133
|
+
$dbase += $wrongBase;
|
2134
|
+
$dpos -= $wrongBase;
|
2135
|
+
} else {
|
2136
|
+
$wrongBase = 0;
|
2137
|
+
}
|
2138
|
+
my $oldOrder = GetByteOrder();
|
2139
|
+
my $dataTag = $$tagInfo{DataTag};
|
2140
|
+
# use different byte order for values of this offset pair if required (Minolta A200)
|
2141
|
+
SetByteOrder($$tagInfo{ByteOrder}) if $$tagInfo{ByteOrder};
|
2142
|
+
# transfer the data referenced by all offsets of this tag
|
2143
|
+
for ($n=0; $n<$count; ++$n) {
|
2144
|
+
my ($oldEnd, $size);
|
2145
|
+
if (@$oldOffset and @$oldSize) {
|
2146
|
+
# calculate end offset of this block
|
2147
|
+
$oldEnd = $$oldOffset[$n] + $$oldSize[$n];
|
2148
|
+
# update TIFF_END as if we read this data from file
|
2149
|
+
UpdateTiffEnd($et, $oldEnd + $dbase);
|
2150
|
+
}
|
2151
|
+
my $offsetPos = $offsets + $n * 4;
|
2152
|
+
my $byteCountPos = $byteCounts + $n * $formatSize[$format];
|
2153
|
+
if ($$tagInfo{PanasonicHack}) {
|
2154
|
+
# use actual raw data length (may be different than StripByteCounts!)
|
2155
|
+
$size = $$oldSize[$n];
|
2156
|
+
} else {
|
2157
|
+
# use size of new data
|
2158
|
+
$size = ReadValue(\$newData, $byteCountPos, $formatStr, 1, 4);
|
2159
|
+
}
|
2160
|
+
my $offset = $$oldOffset[$n];
|
2161
|
+
if (defined $offset) {
|
2162
|
+
$offset -= $dpos;
|
2163
|
+
} elsif ($size != 0xfeedfeed) {
|
2164
|
+
$et->Error('Internal error (no offset)');
|
2165
|
+
return undef;
|
2166
|
+
}
|
2167
|
+
my $newOffset = length($newData) - $wrongBase;
|
2168
|
+
my $buff;
|
2169
|
+
# look for 'feed' code to use our new data
|
2170
|
+
if ($size == 0xfeedfeed) {
|
2171
|
+
unless (defined $dataTag) {
|
2172
|
+
$et->Error("No DataTag defined for $$tagInfo{Name}");
|
2173
|
+
return undef;
|
2174
|
+
}
|
2175
|
+
unless (defined $offsetData{$dataTag}) {
|
2176
|
+
$et->Error("Internal error (no $dataTag)");
|
2177
|
+
return undef;
|
2178
|
+
}
|
2179
|
+
if ($count > 1) {
|
2180
|
+
$et->Error("Can't modify $$tagInfo{Name} with count $count");
|
2181
|
+
return undef;
|
2182
|
+
}
|
2183
|
+
$buff = $offsetData{$dataTag};
|
2184
|
+
if ($formatSize[$format] != 4) {
|
2185
|
+
$et->Error("$$cntInfo{Name} is not int32");
|
2186
|
+
return undef;
|
2187
|
+
}
|
2188
|
+
# set the data size
|
2189
|
+
$size = length($buff);
|
2190
|
+
Set32u($size, \$newData, $byteCountPos);
|
2191
|
+
} elsif ($ifd < 0) {
|
2192
|
+
# pad if necessary (but don't pad contiguous image blocks)
|
2193
|
+
my $pad = 0;
|
2194
|
+
++$pad if $size & 0x01 and ($n+1 >= $count or not $oldEnd or
|
2195
|
+
$oldEnd != $$oldOffset[$n+1]);
|
2196
|
+
# preserve original image padding if specified
|
2197
|
+
if ($$origDirInfo{PreserveImagePadding} and $n+1 < $count and
|
2198
|
+
$oldEnd and $$oldOffset[$n+1] > $oldEnd)
|
2199
|
+
{
|
2200
|
+
$pad = $$oldOffset[$n+1] - $oldEnd;
|
2201
|
+
}
|
2202
|
+
# copy data later
|
2203
|
+
push @imageData, [$offset+$dbase+$dpos, $size, $pad];
|
2204
|
+
$newOffset += $blockSize; # data comes after other deferred data
|
2205
|
+
# create fixup for SubIFD ImageData
|
2206
|
+
if ($imageDataFlag eq 'SubIFD' and not $subIfdDataFixup) {
|
2207
|
+
$subIfdDataFixup = new Image::ExifTool::Fixup;
|
2208
|
+
$imageData[-1][4] = $subIfdDataFixup;
|
2209
|
+
}
|
2210
|
+
$size += $pad; # account for pad byte if necessary
|
2211
|
+
# return ImageData list
|
2212
|
+
$$origDirInfo{ImageData} = \@imageData;
|
2213
|
+
} elsif ($offset >= 0 and $offset+$size <= $dataLen) {
|
2214
|
+
# take data from old dir data buffer
|
2215
|
+
$buff = substr($$dataPt, $offset, $size);
|
2216
|
+
} elsif ($$et{TIFF_TYPE} eq 'MRW') {
|
2217
|
+
# TTW segment must be an even 4 bytes long, so pad now if necessary
|
2218
|
+
my $n = length $newData;
|
2219
|
+
$buff = ($n & 0x03) ? "\0" x (4 - ($n & 0x03)) : '';
|
2220
|
+
$size = length($buff);
|
2221
|
+
# data exists after MRW TTW segment
|
2222
|
+
$ttwLen = length($newData) + $size unless defined $ttwLen;
|
2223
|
+
$newOffset = $offset + $dpos + $ttwLen - $dataLen;
|
2224
|
+
} elsif ($raf and $raf->Seek($offset+$dbase+$dpos,0) and
|
2225
|
+
$raf->Read($buff,$size) == $size)
|
2226
|
+
{
|
2227
|
+
# (data was read OK)
|
2228
|
+
# patch incorrect ThumbnailOffset in Sony A100 1.00 ARW images
|
2229
|
+
if ($$et{TIFF_TYPE} eq 'ARW' and $$tagInfo{Name} eq 'ThumbnailOffset' and
|
2230
|
+
$$et{Model} eq 'DSLR-A100' and $buff !~ /^\xff\xd8\xff/)
|
2231
|
+
{
|
2232
|
+
my $pos = $offset + $dbase + $dpos;
|
2233
|
+
my $try;
|
2234
|
+
if ($pos < 0x10000 and $raf->Seek($pos+0x10000,0) and
|
2235
|
+
$raf->Read($try,$size) == $size and $try =~ /^\xff\xd8\xff/)
|
2236
|
+
{
|
2237
|
+
$buff = $try;
|
2238
|
+
$et->Warn('Adjusted incorrect A100 ThumbnailOffset', 1);
|
2239
|
+
} else {
|
2240
|
+
$et->Error('Invalid ThumbnailImage');
|
2241
|
+
}
|
2242
|
+
}
|
2243
|
+
} elsif ($$tagInfo{Name} eq 'ThumbnailOffset' and $offset>=0 and $offset<$dataLen) {
|
2244
|
+
# Grrr. The Canon 350D writes the thumbnail with an incorrect byte count
|
2245
|
+
my $diff = $offset + $size - $dataLen;
|
2246
|
+
$et->Warn("ThumbnailImage runs outside EXIF data by $diff bytes (truncated)",1);
|
2247
|
+
# set the size to the available data
|
2248
|
+
$size -= $diff;
|
2249
|
+
unless (WriteValue($size, $formatStr, 1, \$newData, $byteCountPos)) {
|
2250
|
+
warn 'Internal error writing thumbnail size';
|
2251
|
+
}
|
2252
|
+
# get the truncated image
|
2253
|
+
$buff = substr($$dataPt, $offset, $size);
|
2254
|
+
} elsif ($$tagInfo{Name} eq 'PreviewImageStart' and $$et{FILE_TYPE} eq 'JPEG') {
|
2255
|
+
# try to load the preview image using the specified offset
|
2256
|
+
undef $buff;
|
2257
|
+
my $r = $$et{RAF};
|
2258
|
+
if ($r and not $raf) {
|
2259
|
+
my $tell = $r->Tell();
|
2260
|
+
# read and validate
|
2261
|
+
undef $buff unless $r->Seek($offset+$base+$dataPos,0) and
|
2262
|
+
$r->Read($buff,$size) == $size and
|
2263
|
+
$buff =~ /^.\xd8\xff[\xc4\xdb\xe0-\xef]/s;
|
2264
|
+
$r->Seek($tell, 0) or $et->Error('Seek error'), return undef;
|
2265
|
+
}
|
2266
|
+
# set flag if we must load PreviewImage
|
2267
|
+
$buff = 'LOAD_PREVIEW' unless defined $buff;
|
2268
|
+
} else {
|
2269
|
+
my $dataName = $dataTag || $$tagInfo{Name};
|
2270
|
+
return undef if $et->Error("Error reading $dataName data in $name", $inMakerNotes);
|
2271
|
+
$buff = '';
|
2272
|
+
}
|
2273
|
+
if ($$tagInfo{Name} eq 'PreviewImageStart') {
|
2274
|
+
if ($$et{FILE_TYPE} eq 'JPEG' and not $$tagInfo{MakerPreview}) {
|
2275
|
+
# hold onto the PreviewImage until we can determine if it fits
|
2276
|
+
$$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
|
2277
|
+
Data => $buff,
|
2278
|
+
Fixup => new Image::ExifTool::Fixup,
|
2279
|
+
};
|
2280
|
+
if ($$tagInfo{IsOffset} and $$tagInfo{IsOffset} eq '2') {
|
2281
|
+
$$et{PREVIEW_INFO}{NoBaseShift} = 1;
|
2282
|
+
}
|
2283
|
+
if ($offset >= 0 and $offset+$size <= $dataLen) {
|
2284
|
+
# set flag indicating this preview wasn't in a trailer
|
2285
|
+
$$et{PREVIEW_INFO}{WasContained} = 1;
|
2286
|
+
}
|
2287
|
+
$buff = '';
|
2288
|
+
} elsif ($$et{TIFF_TYPE} eq 'ARW' and $$et{Model} eq 'DSLR-A100') {
|
2289
|
+
# the A100 double-references the same preview, so ignore the
|
2290
|
+
# second one (the offset and size will be patched later)
|
2291
|
+
next if $$et{A100PreviewLength};
|
2292
|
+
$$et{A100PreviewLength} = length $buff if defined $buff;
|
2293
|
+
}
|
2294
|
+
}
|
2295
|
+
# update offset accordingly and add to end of new data
|
2296
|
+
Set32u($newOffset, \$newData, $offsetPos);
|
2297
|
+
# add a pointer to fix up this offset value (marked with DataTag name)
|
2298
|
+
$fixup->AddFixup($offsetPos, $dataTag);
|
2299
|
+
# also add to subIfdDataFixup if necessary
|
2300
|
+
$subIfdDataFixup->AddFixup($offsetPos, $dataTag) if $subIfdDataFixup;
|
2301
|
+
# must also (sometimes) update StripOffsets in Panasonic RW2 images
|
2302
|
+
my $otherPos = $$offsetPair[0][5];
|
2303
|
+
if ($otherPos and $$tagInfo{PanasonicHack}) {
|
2304
|
+
Set32u($newOffset, \$newData, $otherPos);
|
2305
|
+
$fixup->AddFixup($otherPos, $dataTag);
|
2306
|
+
}
|
2307
|
+
if ($ifd >= 0) {
|
2308
|
+
# buff length must be even (Note: may have changed since $size was set)
|
2309
|
+
$buff .= "\0" if length($buff) & 0x01;
|
2310
|
+
$newData .= $buff; # add this strip to the data
|
2311
|
+
} else {
|
2312
|
+
$blockSize += $size; # keep track of total size
|
2313
|
+
}
|
2314
|
+
}
|
2315
|
+
SetByteOrder($oldOrder);
|
2316
|
+
}
|
2317
|
+
}
|
2318
|
+
# verify that nothing else got written after determining TTW length
|
2319
|
+
if (defined $ttwLen and $ttwLen != length($newData)) {
|
2320
|
+
$et->Error('Internal error writing MRW TTW');
|
2321
|
+
}
|
2322
|
+
}
|
2323
|
+
#
|
2324
|
+
# set offsets and generate fixups for tag values which were too large for memory
|
2325
|
+
#
|
2326
|
+
$blockSize = 0;
|
2327
|
+
foreach $blockInfo (@imageData) {
|
2328
|
+
my ($pos, $size, $pad, $entry, $subFix) = @$blockInfo;
|
2329
|
+
if (defined $entry) {
|
2330
|
+
my $format = Get16u(\$newData, $entry + 2);
|
2331
|
+
if ($format < 1 or $format > 13) {
|
2332
|
+
$et->Error('Internal error copying huge value');
|
2333
|
+
last;
|
2334
|
+
} else {
|
2335
|
+
# set count and offset in directory entry
|
2336
|
+
Set32u($size / $formatSize[$format], \$newData, $entry + 4);
|
2337
|
+
Set32u(length($newData)+$blockSize, \$newData, $entry + 8);
|
2338
|
+
$fixup->AddFixup($entry + 8);
|
2339
|
+
# create special fixup for SubIFD data
|
2340
|
+
if ($imageDataFlag eq 'SubIFD') {
|
2341
|
+
my $subIfdDataFixup = new Image::ExifTool::Fixup;
|
2342
|
+
$subIfdDataFixup->AddFixup($entry + 8);
|
2343
|
+
# save fixup in imageData list
|
2344
|
+
$$blockInfo[4] = $subIfdDataFixup;
|
2345
|
+
}
|
2346
|
+
# must reset entry pointer so we don't use it again in a parent IFD!
|
2347
|
+
$$blockInfo[3] = undef;
|
2348
|
+
}
|
2349
|
+
}
|
2350
|
+
# apply additional shift required for contained SubIFD image data offsets
|
2351
|
+
if ($subFix and defined $$subFix{BlockLen} and $numBlocks > 0) {
|
2352
|
+
# our offset expects the data at the end of the SubIFD block (BlockLen + Start),
|
2353
|
+
# but it will actually be at length($newData) + $blockSize. So adjust
|
2354
|
+
# accordingly (and subtract an extra Start because this shift is applied later)
|
2355
|
+
$$subFix{Shift} += length($newData) - $$subFix{BlockLen} - 2 * $$subFix{Start} + $blockSize;
|
2356
|
+
$subFix->ApplyFixup(\$newData);
|
2357
|
+
}
|
2358
|
+
$blockSize += $size + $pad;
|
2359
|
+
--$numBlocks;
|
2360
|
+
}
|
2361
|
+
#
|
2362
|
+
# apply final shift to new data position if this is the top level IFD
|
2363
|
+
#
|
2364
|
+
unless ($$dirInfo{Fixup}) {
|
2365
|
+
my $hdrPtr = $$dirInfo{HeaderPtr};
|
2366
|
+
my $newDataPos = $hdrPtr ? length $$hdrPtr : $$dirInfo{NewDataPos} || 0;
|
2367
|
+
# adjust CanonVRD offset to point to end of regular TIFF if necessary
|
2368
|
+
# (NOTE: This will be incorrect if multiple trailers exist,
|
2369
|
+
# but it is unlikely that it could ever be correct in this case anyway.
|
2370
|
+
# Also, this doesn't work for JPEG images (but CanonDPP doesn't set
|
2371
|
+
# this when editing JPEG images anyway))
|
2372
|
+
$fixup->SetMarkerPointers(\$newData, 'CanonVRD', length($newData) + $blockSize);
|
2373
|
+
if ($newDataPos) {
|
2374
|
+
$$fixup{Shift} += $newDataPos;
|
2375
|
+
$fixup->ApplyFixup(\$newData);
|
2376
|
+
}
|
2377
|
+
# save fixup for adjusting Leica trailer offset if necessary
|
2378
|
+
$$et{LeicaTrailer}{Fixup}->AddFixup($fixup) if $$et{LeicaTrailer};
|
2379
|
+
# save fixup for PreviewImage in JPEG file if necessary
|
2380
|
+
my $previewInfo = $$et{PREVIEW_INFO};
|
2381
|
+
if ($previewInfo) {
|
2382
|
+
my $pt = \$$previewInfo{Data}; # image data or 'LOAD_PREVIEW' flag
|
2383
|
+
# now that we know the size of the EXIF data, first test to see if our new image fits
|
2384
|
+
# inside the EXIF segment (remember about the TIFF and EXIF headers: 8+6 bytes)
|
2385
|
+
if (($$pt ne 'LOAD_PREVIEW' and length($$pt) + length($newData) + 14 <= 0xfffd and
|
2386
|
+
not $$previewInfo{IsTrailer}) or
|
2387
|
+
$$previewInfo{IsShort}) # must fit in this segment if using short pointers
|
2388
|
+
{
|
2389
|
+
# It fits! (or must exist in EXIF segment), so fixup the
|
2390
|
+
# PreviewImage pointers and stuff the preview image in here
|
2391
|
+
my $newPos = length($newData) + $newDataPos;
|
2392
|
+
$newPos += ($$previewInfo{BaseShift} || 0);
|
2393
|
+
if ($$previewInfo{Relative}) {
|
2394
|
+
# calculate our base by looking at how far the pointer got shifted
|
2395
|
+
$newPos -= ($fixup->GetMarkerPointers(\$newData, 'PreviewImage') || 0);
|
2396
|
+
}
|
2397
|
+
$fixup->SetMarkerPointers(\$newData, 'PreviewImage', $newPos);
|
2398
|
+
$newData .= $$pt;
|
2399
|
+
# set flag to delete old preview unless it was contained in the EXIF
|
2400
|
+
$$et{DEL_PREVIEW} = 1 unless $$et{PREVIEW_INFO}{WasContained};
|
2401
|
+
delete $$et{PREVIEW_INFO}; # done with our preview data
|
2402
|
+
} else {
|
2403
|
+
# Doesn't fit, or we still don't know, so save fixup information
|
2404
|
+
# and put the preview at the end of the file
|
2405
|
+
$$previewInfo{Fixup} or $$previewInfo{Fixup} = new Image::ExifTool::Fixup;
|
2406
|
+
$$previewInfo{Fixup}->AddFixup($fixup);
|
2407
|
+
}
|
2408
|
+
} elsif (defined $newData and $deleteAll) {
|
2409
|
+
$newData = ''; # delete both IFD0 and IFD1 since only mandatory tags remain
|
2410
|
+
} elsif ($$et{A100PreviewLength}) {
|
2411
|
+
# save preview image start for patching A100 quirks later
|
2412
|
+
$$et{A100PreviewStart} = $fixup->GetMarkerPointers(\$newData, 'PreviewImage');
|
2413
|
+
}
|
2414
|
+
# save location of last IFD for use in Canon RAW header
|
2415
|
+
if ($newDataPos == 16) {
|
2416
|
+
my @ifdPos = $fixup->GetMarkerPointers(\$newData,'NextIFD');
|
2417
|
+
$$origDirInfo{LastIFD} = pop @ifdPos;
|
2418
|
+
}
|
2419
|
+
# recrypt SR2 SubIFD data if necessary
|
2420
|
+
my $key = $$et{SR2SubIFDKey};
|
2421
|
+
if ($key) {
|
2422
|
+
my $start = $fixup->GetMarkerPointers(\$newData, 'SR2SubIFDOffset');
|
2423
|
+
my $len = $$et{SR2SubIFDLength};
|
2424
|
+
# (must subtract 8 for size of TIFF header)
|
2425
|
+
if ($start and $start - 8 + $len <= length $newData) {
|
2426
|
+
require Image::ExifTool::Sony;
|
2427
|
+
Image::ExifTool::Sony::Decrypt(\$newData, $start - 8, $len, $key);
|
2428
|
+
}
|
2429
|
+
}
|
2430
|
+
}
|
2431
|
+
# return empty string if no entries in directory
|
2432
|
+
# (could be up to 10 bytes and still be empty)
|
2433
|
+
$newData = '' if defined $newData and length($newData) < 12;
|
2434
|
+
|
2435
|
+
return $newData; # return our directory data
|
2436
|
+
}
|
2437
|
+
|
2438
|
+
1; # end
|
2439
|
+
|
2440
|
+
__END__
|
2441
|
+
|
2442
|
+
=head1 NAME
|
2443
|
+
|
2444
|
+
Image::ExifTool::WriteExif.pl - Write EXIF meta information
|
2445
|
+
|
2446
|
+
=head1 SYNOPSIS
|
2447
|
+
|
2448
|
+
This file is autoloaded by Image::ExifTool::Exif.
|
2449
|
+
|
2450
|
+
=head1 DESCRIPTION
|
2451
|
+
|
2452
|
+
This file contains routines to write EXIF metadata.
|
2453
|
+
|
2454
|
+
=head1 AUTHOR
|
2455
|
+
|
2456
|
+
Copyright 2003-2016, Phil Harvey (phil at owl.phy.queensu.ca)
|
2457
|
+
|
2458
|
+
This library is free software; you can redistribute it and/or modify it
|
2459
|
+
under the same terms as Perl itself.
|
2460
|
+
|
2461
|
+
=head1 SEE ALSO
|
2462
|
+
|
2463
|
+
L<Image::ExifTool::Exif(3pm)|Image::ExifTool::Exif>,
|
2464
|
+
L<Image::ExifTool(3pm)|Image::ExifTool>
|
2465
|
+
|
2466
|
+
=cut
|