exiftool_vendored 9.45.0 → 9.46.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.

Files changed (1073) hide show
  1. checksums.yaml +8 -8
  2. data/bin/Image-ExifTool-9.46/Changes +6444 -0
  3. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/MANIFEST +0 -0
  4. data/bin/Image-ExifTool-9.46/META.yml +27 -0
  5. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/Makefile.PL +0 -0
  6. data/bin/Image-ExifTool-9.46/README +228 -0
  7. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/exif2iptc.args +0 -0
  8. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/exif2xmp.args +0 -0
  9. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/gps2xmp.args +0 -0
  10. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/iptc2exif.args +0 -0
  11. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/iptc2xmp.args +0 -0
  12. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/iptcCore.args +0 -0
  13. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/pdf2xmp.args +0 -0
  14. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/xmp2exif.args +0 -0
  15. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/xmp2gps.args +0 -0
  16. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/xmp2iptc.args +0 -0
  17. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/arg_files/xmp2pdf.args +0 -0
  18. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/config_files/ExifTool_config +0 -0
  19. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/config_files/convert_regions.config +0 -0
  20. data/bin/Image-ExifTool-9.46/exiftool +5767 -0
  21. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/fmt_files/gpx.fmt +0 -0
  22. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/fmt_files/gpx_wpt.fmt +0 -0
  23. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/fmt_files/kml.fmt +0 -0
  24. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/ExifTool.html +0 -0
  25. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/MIE1.1-20070121.pdf +0 -0
  26. data/bin/Image-ExifTool-9.46/html/Shift.html +173 -0
  27. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/AFCP.html +0 -0
  28. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/AIFF.html +0 -0
  29. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/APE.html +0 -0
  30. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/APP12.html +0 -0
  31. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/ASF.html +0 -0
  32. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Apple.html +0 -0
  33. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/BMP.html +0 -0
  34. data/bin/Image-ExifTool-9.46/html/TagNames/Canon.html +8322 -0
  35. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/CanonCustom.html +0 -0
  36. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/CanonRaw.html +0 -0
  37. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/CanonVRD.html +0 -0
  38. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Casio.html +0 -0
  39. data/bin/Image-ExifTool-9.46/html/TagNames/Composite.html +673 -0
  40. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DICOM.html +0 -0
  41. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DNG.html +0 -0
  42. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DPX.html +0 -0
  43. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DV.html +0 -0
  44. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DarwinCore.html +0 -0
  45. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/DjVu.html +0 -0
  46. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/EXE.html +0 -0
  47. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/EXIF.html +0 -0
  48. data/bin/Image-ExifTool-9.46/html/TagNames/Extra.html +309 -0
  49. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/FLAC.html +0 -0
  50. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/FLIR.html +0 -0
  51. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Flash.html +0 -0
  52. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/FlashPix.html +0 -0
  53. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Font.html +0 -0
  54. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/FotoStation.html +0 -0
  55. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/FujiFilm.html +0 -0
  56. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/GE.html +0 -0
  57. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/GIF.html +0 -0
  58. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/GIMP.html +0 -0
  59. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/GPS.html +0 -0
  60. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/GeoTiff.html +0 -0
  61. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/H264.html +0 -0
  62. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/HP.html +0 -0
  63. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/HTML.html +0 -0
  64. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/ICC_Profile.html +0 -0
  65. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/ID3.html +0 -0
  66. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/IPTC.html +0 -0
  67. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/ITC.html +0 -0
  68. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/JFIF.html +0 -0
  69. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/JPEG.html +0 -0
  70. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/JVC.html +0 -0
  71. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Jpeg2000.html +0 -0
  72. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Kodak.html +0 -0
  73. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/KyoceraRaw.html +0 -0
  74. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/LNK.html +0 -0
  75. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Leaf.html +0 -0
  76. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/M2TS.html +0 -0
  77. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MIE.html +0 -0
  78. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MIFF.html +0 -0
  79. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MNG.html +0 -0
  80. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MPC.html +0 -0
  81. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MPEG.html +0 -0
  82. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MPF.html +0 -0
  83. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MWG.html +0 -0
  84. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MXF.html +0 -0
  85. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Matroska.html +0 -0
  86. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Microsoft.html +0 -0
  87. data/bin/Image-ExifTool-9.46/html/TagNames/Minolta.html +2568 -0
  88. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/MinoltaRaw.html +0 -0
  89. data/bin/Image-ExifTool-9.46/html/TagNames/Nikon.html +4498 -0
  90. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/NikonCapture.html +0 -0
  91. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/NikonCustom.html +0 -0
  92. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/OOXML.html +0 -0
  93. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Ogg.html +0 -0
  94. data/bin/Image-ExifTool-9.46/html/TagNames/Olympus.html +3401 -0
  95. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/OpenEXR.html +0 -0
  96. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PDF.html +0 -0
  97. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PGF.html +0 -0
  98. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PICT.html +0 -0
  99. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PLIST.html +0 -0
  100. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PNG.html +0 -0
  101. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PSP.html +0 -0
  102. data/bin/Image-ExifTool-9.46/html/TagNames/Panasonic.html +1599 -0
  103. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PanasonicRaw.html +0 -0
  104. data/bin/Image-ExifTool-9.46/html/TagNames/Pentax.html +4528 -0
  105. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PhaseOne.html +0 -0
  106. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PhotoCD.html +0 -0
  107. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PhotoMechanic.html +0 -0
  108. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Photoshop.html +0 -0
  109. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PostScript.html +0 -0
  110. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/PrintIM.html +0 -0
  111. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Qualcomm.html +0 -0
  112. data/bin/Image-ExifTool-9.46/html/TagNames/QuickTime.html +3438 -0
  113. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/RIFF.html +0 -0
  114. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/RSRC.html +0 -0
  115. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/RTF.html +0 -0
  116. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Radiance.html +0 -0
  117. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Rawzor.html +0 -0
  118. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Real.html +0 -0
  119. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Reconyx.html +0 -0
  120. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Ricoh.html +0 -0
  121. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Samsung.html +0 -0
  122. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Sanyo.html +0 -0
  123. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Scalado.html +0 -0
  124. data/bin/Image-ExifTool-9.46/html/TagNames/Shortcuts.html +240 -0
  125. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Sigma.html +0 -0
  126. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/SigmaRaw.html +0 -0
  127. data/bin/Image-ExifTool-9.46/html/TagNames/Sony.html +5721 -0
  128. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/SonyIDC.html +0 -0
  129. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Stim.html +0 -0
  130. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Theora.html +0 -0
  131. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Torrent.html +0 -0
  132. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Unknown.html +0 -0
  133. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/Vorbis.html +0 -0
  134. data/bin/Image-ExifTool-9.46/html/TagNames/XMP.html +7939 -0
  135. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/ZIP.html +0 -0
  136. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/iWork.html +0 -0
  137. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/index.html +0 -0
  138. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/TagNames/style.css +0 -0
  139. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/ancient_history.html +0 -0
  140. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/canon_raw.html +0 -0
  141. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/commentary.html +0 -0
  142. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/config.html +0 -0
  143. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/data_members.html +0 -0
  144. data/bin/Image-ExifTool-9.46/html/exiftool_pod.html +2370 -0
  145. data/bin/Image-ExifTool-9.46/html/faq.html +1435 -0
  146. data/bin/Image-ExifTool-9.46/html/filename.html +294 -0
  147. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/geotag.html +0 -0
  148. data/bin/Image-ExifTool-9.46/html/history.html +377 -0
  149. data/bin/Image-ExifTool-9.46/html/htmldump.html +733 -0
  150. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/idiosyncracies.html +0 -0
  151. data/bin/Image-ExifTool-9.46/html/index.html +1283 -0
  152. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/install.html +0 -0
  153. data/bin/Image-ExifTool-9.46/html/metafiles.html +274 -0
  154. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/overview.png +0 -0
  155. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/standards.html +0 -0
  156. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/struct.html +0 -0
  157. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/style.css +0 -0
  158. data/bin/Image-ExifTool-9.46/html/under.html +126 -0
  159. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/verbose.html +0 -0
  160. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/html/writing.html +0 -0
  161. data/bin/Image-ExifTool-9.46/lib/File/RandomAccess.pm +378 -0
  162. data/bin/Image-ExifTool-9.46/lib/File/RandomAccess.pod +231 -0
  163. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool.pm +6916 -0
  164. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool.pod +2406 -0
  165. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/AES.pm +501 -0
  166. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/AFCP.pm +284 -0
  167. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/AIFF.pm +271 -0
  168. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/APE.pm +262 -0
  169. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/APP12.pm +322 -0
  170. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/ASF.pm +884 -0
  171. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Apple.pm +113 -0
  172. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/BMP.pm +179 -0
  173. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/BZZ.pm +472 -0
  174. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/BigTIFF.pm +282 -0
  175. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/BuildTagLookup.pm +2425 -0
  176. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Canon.pm +7983 -0
  177. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/CanonCustom.pm +2523 -0
  178. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/CanonRaw.pm +931 -0
  179. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/CanonVRD.pm +1481 -0
  180. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/CaptureOne.pm +235 -0
  181. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Casio.pm +2013 -0
  182. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Charset.pm +396 -0
  183. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Arabic.pm +0 -0
  184. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Baltic.pm +0 -0
  185. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Cyrillic.pm +0 -0
  186. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Greek.pm +0 -0
  187. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Hebrew.pm +0 -0
  188. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/JIS.pm +0 -0
  189. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Latin.pm +0 -0
  190. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Latin2.pm +0 -0
  191. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacArabic.pm +0 -0
  192. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacChineseCN.pm +0 -0
  193. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacChineseTW.pm +0 -0
  194. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacCroatian.pm +0 -0
  195. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacCyrillic.pm +0 -0
  196. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacGreek.pm +0 -0
  197. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacHebrew.pm +0 -0
  198. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacIceland.pm +0 -0
  199. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacJapanese.pm +0 -0
  200. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacKorean.pm +0 -0
  201. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacLatin2.pm +0 -0
  202. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacRSymbol.pm +0 -0
  203. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacRoman.pm +0 -0
  204. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacRomanian.pm +0 -0
  205. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacThai.pm +0 -0
  206. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/MacTurkish.pm +0 -0
  207. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/PDFDoc.pm +0 -0
  208. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/ShiftJIS.pm +0 -0
  209. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Symbol.pm +0 -0
  210. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Thai.pm +0 -0
  211. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Turkish.pm +0 -0
  212. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/Charset/Vietnam.pm +0 -0
  213. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DICOM.pm +3874 -0
  214. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DNG.pm +835 -0
  215. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DPX.pm +151 -0
  216. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DV.pm +319 -0
  217. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DarwinCore.pm +317 -0
  218. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/DjVu.pm +376 -0
  219. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/EXE.pm +1228 -0
  220. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Exif.pm +4596 -0
  221. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/FLAC.pm +296 -0
  222. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/FLIR.pm +1232 -0
  223. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Fixup.pm +354 -0
  224. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Flash.pm +755 -0
  225. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/FlashPix.pm +1882 -0
  226. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Font.pm +643 -0
  227. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/FotoStation.pm +259 -0
  228. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/FujiFilm.pm +1088 -0
  229. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/GE.pm +80 -0
  230. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/GIF.pm +542 -0
  231. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/GIMP.pm +258 -0
  232. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/GPS.pm +514 -0
  233. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/GeoTiff.pm +2187 -0
  234. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Geotag.pm +1176 -0
  235. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/H264.pm +1102 -0
  236. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/HP.pm +262 -0
  237. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/HTML.pm +576 -0
  238. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/HtmlDump.pm +895 -0
  239. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/ICC_Profile.pm +999 -0
  240. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/ID3.pm +1532 -0
  241. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/IPTC.pm +1244 -0
  242. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/ITC.pm +215 -0
  243. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Import.pm +308 -0
  244. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/InDesign.pm +277 -0
  245. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/JPEG.pm +522 -0
  246. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/JPEGDigest.pm +2511 -0
  247. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/JVC.pm +130 -0
  248. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Jpeg2000.pm +873 -0
  249. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Kodak.pm +2014 -0
  250. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/KyoceraRaw.pm +173 -0
  251. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/LNK.pm +723 -0
  252. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/cs.pm +1586 -0
  253. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/de.pm +7356 -0
  254. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/en_ca.pm +557 -0
  255. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/en_gb.pm +572 -0
  256. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/es.pm +4017 -0
  257. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/fi.pm +2856 -0
  258. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/fr.pm +4738 -0
  259. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/it.pm +7918 -0
  260. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/ja.pm +5815 -0
  261. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/ko.pm +2332 -0
  262. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/nl.pm +3220 -0
  263. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/pl.pm +1140 -0
  264. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/ru.pm +769 -0
  265. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/sv.pm +639 -0
  266. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/tr.pm +544 -0
  267. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/zh_cn.pm +1329 -0
  268. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Lang/zh_tw.pm +802 -0
  269. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Leaf.pm +515 -0
  270. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/M2TS.pm +725 -0
  271. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MIE.pm +2561 -0
  272. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MIEUnits.pod +377 -0
  273. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MIFF.pm +279 -0
  274. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MNG.pm +684 -0
  275. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MPC.pm +156 -0
  276. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MPEG.pm +736 -0
  277. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MPF.pm +289 -0
  278. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MWG.pm +748 -0
  279. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MXF.pm +3032 -0
  280. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MakerNotes.pm +1598 -0
  281. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Matroska.pm +891 -0
  282. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Microsoft.pm +879 -0
  283. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Minolta.pm +2861 -0
  284. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/MinoltaRaw.pm +534 -0
  285. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Nikon.pm +6145 -0
  286. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/NikonCapture.pm +911 -0
  287. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/NikonCustom.pm +4405 -0
  288. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/OOXML.pm +409 -0
  289. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Ogg.pm +237 -0
  290. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Olympus.pm +3630 -0
  291. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/OpenEXR.pm +324 -0
  292. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PDF.pm +2327 -0
  293. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PGF.pm +143 -0
  294. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PICT.pm +1260 -0
  295. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PLIST.pm +453 -0
  296. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PNG.pm +1161 -0
  297. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PPM.pm +169 -0
  298. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PSP.pm +305 -0
  299. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Panasonic.pm +2205 -0
  300. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PanasonicRaw.pm +535 -0
  301. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Pentax.pm +5792 -0
  302. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PhaseOne.pm +557 -0
  303. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PhotoCD.pm +507 -0
  304. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PhotoMechanic.pm +256 -0
  305. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Photoshop.pm +629 -0
  306. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PostScript.pm +693 -0
  307. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/PrintIM.pm +125 -0
  308. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Qualcomm.pm +1344 -0
  309. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/QuickTime.pm +3910 -0
  310. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/lib/Image/ExifTool/README +0 -0
  311. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/RIFF.pm +1332 -0
  312. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/RSRC.pm +241 -0
  313. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/RTF.pm +383 -0
  314. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Radiance.pm +144 -0
  315. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Rawzor.pm +190 -0
  316. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Real.pm +736 -0
  317. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Reconyx.pm +190 -0
  318. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Ricoh.pm +1039 -0
  319. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Samsung.pm +846 -0
  320. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Sanyo.pm +439 -0
  321. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Scalado.pm +141 -0
  322. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Shift.pl +594 -0
  323. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Shortcuts.pm +298 -0
  324. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Sigma.pm +574 -0
  325. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/SigmaRaw.pm +649 -0
  326. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Sony.pm +7072 -0
  327. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/SonyIDC.pm +330 -0
  328. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Stim.pm +196 -0
  329. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/TagInfoXML.pm +794 -0
  330. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/TagLookup.pm +8365 -0
  331. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/TagNames.pod +26883 -0
  332. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Theora.pm +145 -0
  333. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Torrent.pm +317 -0
  334. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Unknown.pm +66 -0
  335. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Vorbis.pm +237 -0
  336. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WriteCanonRaw.pl +637 -0
  337. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WriteExif.pl +3685 -0
  338. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WriteIPTC.pl +702 -0
  339. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WritePDF.pl +765 -0
  340. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WritePNG.pl +376 -0
  341. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WritePhotoshop.pl +266 -0
  342. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WritePostScript.pl +777 -0
  343. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WriteQuickTime.pl +344 -0
  344. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/WriteXMP.pl +1318 -0
  345. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/Writer.pl +5851 -0
  346. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/XMP.pm +3755 -0
  347. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/XMP2.pl +1303 -0
  348. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/XMPStruct.pl +814 -0
  349. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/ZIP.pm +623 -0
  350. data/bin/Image-ExifTool-9.46/lib/Image/ExifTool/iWork.pm +223 -0
  351. data/bin/Image-ExifTool-9.46/perl-Image-ExifTool.spec +105 -0
  352. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/AFCP.t +0 -0
  353. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/AFCP_2.out +0 -0
  354. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/AFCP_3.out +0 -0
  355. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/AIFF.t +0 -0
  356. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/AIFF_2.out +0 -0
  357. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/APE.t +0 -0
  358. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/APE_2.out +0 -0
  359. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/APE_3.out +0 -0
  360. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ASF.t +0 -0
  361. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ASF_2.out +0 -0
  362. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/BMP.t +0 -0
  363. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/BMP_2.out +0 -0
  364. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/BigTIFF.t +0 -0
  365. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/BigTIFF_2.out +0 -0
  366. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Canon.t +0 -0
  367. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw.t +0 -0
  368. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw_2.out +0 -0
  369. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw_4.out +0 -0
  370. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw_5.out +0 -0
  371. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw_6.out +0 -0
  372. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonRaw_7.out +0 -0
  373. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD.t +0 -0
  374. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_11.out +0 -0
  375. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_12.out +0 -0
  376. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_2.out +0 -0
  377. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_3.out +0 -0
  378. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_4.out +0 -0
  379. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_5.out +0 -0
  380. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_6.out +0 -0
  381. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_7.out +0 -0
  382. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_8.out +0 -0
  383. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/CanonVRD_9.out +0 -0
  384. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Canon_2.out +0 -0
  385. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Canon_3.out +0 -0
  386. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio.t +0 -0
  387. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio_2.out +0 -0
  388. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio_3.out +0 -0
  389. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio_4.out +0 -0
  390. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio_5.out +0 -0
  391. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Casio_6.out +0 -0
  392. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DICOM.t +0 -0
  393. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DICOM_2.out +0 -0
  394. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DNG.t +0 -0
  395. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DNG_2.out +0 -0
  396. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DNG_3.out +0 -0
  397. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DPX.t +0 -0
  398. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DPX_2.out +0 -0
  399. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DV.t +0 -0
  400. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DV_2.out +0 -0
  401. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DjVu.t +0 -0
  402. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/DjVu_2.out +0 -0
  403. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/EXE.t +0 -0
  404. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/EXE_2.out +0 -0
  405. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/EXE_3.out +0 -0
  406. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/EXE_4.out +0 -0
  407. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool.t +0 -0
  408. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_16.out +0 -0
  409. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_17.out +0 -0
  410. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_2.out +0 -0
  411. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_20.out +0 -0
  412. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_21.out +0 -0
  413. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_22.out +0 -0
  414. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_23.out +0 -0
  415. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_24.out +0 -0
  416. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_25.out +0 -0
  417. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_26.out +0 -0
  418. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_3.out +0 -0
  419. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_4.out +0 -0
  420. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_5.out +0 -0
  421. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_6.out +0 -0
  422. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_7.out +0 -0
  423. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_8.out +0 -0
  424. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ExifTool_9.out +0 -0
  425. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLAC.t +0 -0
  426. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLAC_2.out +0 -0
  427. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLAC_3.out +0 -0
  428. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLIR.t +0 -0
  429. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLIR_2.out +0 -0
  430. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FLIR_3.out +0 -0
  431. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Flash.t +0 -0
  432. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FlashPix.t +0 -0
  433. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FlashPix_2.out +0 -0
  434. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Flash_2.out +0 -0
  435. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Flash_3.out +0 -0
  436. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font.t +0 -0
  437. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_2.out +0 -0
  438. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_3.out +0 -0
  439. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_4.out +0 -0
  440. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_5.out +0 -0
  441. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_6.out +0 -0
  442. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Font_7.out +0 -0
  443. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FotoStation.t +0 -0
  444. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FotoStation_2.out +0 -0
  445. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FotoStation_3.out +0 -0
  446. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FujiFilm.t +0 -0
  447. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FujiFilm_2.out +0 -0
  448. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FujiFilm_3.out +0 -0
  449. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FujiFilm_4.out +0 -0
  450. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/FujiFilm_5.out +0 -0
  451. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GE.t +0 -0
  452. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GE_2.out +0 -0
  453. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GE_3.out +0 -0
  454. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIF.t +0 -0
  455. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIF_2.out +0 -0
  456. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIF_3.out +0 -0
  457. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIF_4.out +0 -0
  458. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIMP.t +0 -0
  459. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GIMP_2.out +0 -0
  460. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GPS.t +0 -0
  461. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GPS_2.out +0 -0
  462. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GPS_3.out +0 -0
  463. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GeoTiff.t +0 -0
  464. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GeoTiff_2.out +0 -0
  465. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/GeoTiff_3.out +0 -0
  466. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag.t +0 -0
  467. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_2.out +0 -0
  468. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_3.out +0 -0
  469. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_5.out +0 -0
  470. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_6.out +0 -0
  471. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_7.out +0 -0
  472. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_8.out +0 -0
  473. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Geotag_9.out +0 -0
  474. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/HTML.t +0 -0
  475. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/HTML_2.out +0 -0
  476. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC.t +0 -0
  477. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_2.out +0 -0
  478. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_4.out +0 -0
  479. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_5.out +0 -0
  480. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_6.out +0 -0
  481. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_7.out +0 -0
  482. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/IPTC_8.out +0 -0
  483. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ITC.t +0 -0
  484. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ITC_2.out +0 -0
  485. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/InDesign.t +0 -0
  486. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/InDesign_2.out +0 -0
  487. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/InDesign_3.out +0 -0
  488. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/InDesign_4.out +0 -0
  489. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/JVC.t +0 -0
  490. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/JVC_2.out +0 -0
  491. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/JVC_3.out +0 -0
  492. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Jpeg2000.t +0 -0
  493. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Jpeg2000_2.out +0 -0
  494. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Jpeg2000_3.out +0 -0
  495. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Jpeg2000_4.out +0 -0
  496. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Kodak.t +0 -0
  497. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Kodak_2.out +0 -0
  498. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Kodak_3.out +0 -0
  499. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/KyoceraRaw.t +0 -0
  500. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/KyoceraRaw_2.out +0 -0
  501. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/LNK.t +0 -0
  502. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/LNK_2.out +0 -0
  503. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang.t +0 -0
  504. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_1.out +0 -0
  505. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_10.out +0 -0
  506. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_11.out +0 -0
  507. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_12.out +0 -0
  508. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_13.out +0 -0
  509. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_14.out +0 -0
  510. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_15.out +0 -0
  511. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_16.out +0 -0
  512. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_17.out +0 -0
  513. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_18.out +0 -0
  514. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_2.out +0 -0
  515. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_3.out +0 -0
  516. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_4.out +0 -0
  517. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_5.out +0 -0
  518. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_6.out +0 -0
  519. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_7.out +0 -0
  520. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_8.out +0 -0
  521. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Lang_9.out +0 -0
  522. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/M2TS.t +0 -0
  523. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/M2TS_2.out +0 -0
  524. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIE.t +0 -0
  525. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIE_2.out +0 -0
  526. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIE_3.out +0 -0
  527. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIE_5.out +0 -0
  528. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIE_6.out +0 -0
  529. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIFF.t +0 -0
  530. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MIFF_2.out +0 -0
  531. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MP3.t +0 -0
  532. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MP3_2.out +0 -0
  533. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG.t +0 -0
  534. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG_2.out +0 -0
  535. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG_3.out +0 -0
  536. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG_4.out +0 -0
  537. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG_5.out +0 -0
  538. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MWG_6.out +0 -0
  539. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MXF.t +0 -0
  540. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/MXF_2.out +0 -0
  541. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Matroska.t +0 -0
  542. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Matroska_2.out +0 -0
  543. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Minolta.t +0 -0
  544. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Minolta_2.out +0 -0
  545. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Minolta_3.out +0 -0
  546. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Minolta_4.out +0 -0
  547. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon.t +0 -0
  548. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_2.out +0 -0
  549. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_3.out +0 -0
  550. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_4.out +0 -0
  551. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_5.out +0 -0
  552. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_7.out +0 -0
  553. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Nikon_8.out +0 -0
  554. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus.t +0 -0
  555. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_2.out +0 -0
  556. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_3.out +0 -0
  557. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_4.out +0 -0
  558. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_5.out +0 -0
  559. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_6.out +0 -0
  560. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Olympus_7.out +0 -0
  561. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/OpenEXR.t +0 -0
  562. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/OpenEXR_2.out +0 -0
  563. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF.t +0 -0
  564. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_10.out +0 -0
  565. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_11.out +0 -0
  566. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_12.out +0 -0
  567. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_14.out +0 -0
  568. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_15.out +0 -0
  569. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_16.out +0 -0
  570. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_17.out +0 -0
  571. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_18.out +0 -0
  572. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_19.out +0 -0
  573. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_2.out +0 -0
  574. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_20.out +0 -0
  575. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_22.out +0 -0
  576. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_4.out +0 -0
  577. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_5.out +0 -0
  578. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_6.out +0 -0
  579. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_7.out +0 -0
  580. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_8.out +0 -0
  581. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PDF_9.out +0 -0
  582. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PGF.t +0 -0
  583. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PGF_2.out +0 -0
  584. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PICT.t +0 -0
  585. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PICT_2.out +0 -0
  586. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PLIST.t +0 -0
  587. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PLIST_2.out +0 -0
  588. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PLIST_3.out +0 -0
  589. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PNG.t +0 -0
  590. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PNG_2.out +0 -0
  591. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PNG_3.out +0 -0
  592. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PNG_4.out +0 -0
  593. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PNG_5.out +0 -0
  594. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PPM.t +0 -0
  595. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PPM_2.out +0 -0
  596. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PPM_3.out +0 -0
  597. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PSP.t +0 -0
  598. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PSP_2.out +0 -0
  599. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Panasonic.t +0 -0
  600. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Panasonic_2.out +0 -0
  601. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Panasonic_3.out +0 -0
  602. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Panasonic_4.out +0 -0
  603. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Panasonic_5.out +0 -0
  604. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Pentax.t +0 -0
  605. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Pentax_2.out +0 -0
  606. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Pentax_3.out +0 -0
  607. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Pentax_4.out +0 -0
  608. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PhotoCD.t +0 -0
  609. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PhotoCD_2.out +0 -0
  610. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PhotoMechanic.t +0 -0
  611. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PhotoMechanic_2.out +0 -0
  612. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PhotoMechanic_3.out +0 -0
  613. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Photoshop.t +0 -0
  614. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Photoshop_2.out +0 -0
  615. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Photoshop_3.out +0 -0
  616. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PostScript.t +0 -0
  617. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PostScript_2.out +0 -0
  618. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/PostScript_3.out +0 -0
  619. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/QuickTime.t +0 -0
  620. data/bin/Image-ExifTool-9.46/t/QuickTime_2.out +131 -0
  621. data/bin/Image-ExifTool-9.46/t/QuickTime_3.out +72 -0
  622. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/QuickTime_4.out +0 -0
  623. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/QuickTime_5.out +0 -0
  624. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RIFF.t +0 -0
  625. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RIFF_2.out +0 -0
  626. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RIFF_3.out +0 -0
  627. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RIFF_4.out +0 -0
  628. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RTF.t +0 -0
  629. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/RTF_2.out +0 -0
  630. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Radiance.t +0 -0
  631. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Radiance_2.out +0 -0
  632. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Real.t +0 -0
  633. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Real_2.out +0 -0
  634. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Real_3.out +0 -0
  635. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Real_4.out +0 -0
  636. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Ricoh.t +0 -0
  637. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Ricoh_2.out +0 -0
  638. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Ricoh_3.out +0 -0
  639. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Ricoh_4.out +0 -0
  640. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sanyo.t +0 -0
  641. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sanyo_2.out +0 -0
  642. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sanyo_3.out +0 -0
  643. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sigma.t +0 -0
  644. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sigma_2.out +0 -0
  645. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sigma_3.out +0 -0
  646. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sigma_4.out +0 -0
  647. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sigma_5.out +0 -0
  648. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sony.t +0 -0
  649. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sony_2.out +0 -0
  650. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sony_3.out +0 -0
  651. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Sony_5.out +0 -0
  652. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/TestLib.pm +0 -0
  653. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Torrent.t +0 -0
  654. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Torrent_2.out +0 -0
  655. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Unknown.t +0 -0
  656. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Unknown_2.out +0 -0
  657. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Unknown_3.out +0 -0
  658. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Vorbis.t +0 -0
  659. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Vorbis_2.out +0 -0
  660. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer.t +0 -0
  661. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_10.out +0 -0
  662. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_11.out +0 -0
  663. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_13.out +0 -0
  664. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_14.out +0 -0
  665. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_15.out +0 -0
  666. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_16.out +0 -0
  667. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_17.out +0 -0
  668. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_18.out +0 -0
  669. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_19.out +0 -0
  670. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_2.out +0 -0
  671. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_22.out +0 -0
  672. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_24.out +0 -0
  673. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_25.out +0 -0
  674. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_26.out +0 -0
  675. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_27.out +0 -0
  676. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_28.out +0 -0
  677. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_29.out +0 -0
  678. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_30.out +0 -0
  679. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_31.out +0 -0
  680. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_32.out +0 -0
  681. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_33.out +0 -0
  682. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_34.out +0 -0
  683. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_35.out +0 -0
  684. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_36.out +0 -0
  685. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_37.out +0 -0
  686. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_38.out +0 -0
  687. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_39.out +0 -0
  688. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_4.out +0 -0
  689. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_40.out +0 -0
  690. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_41.out +0 -0
  691. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_42.out +0 -0
  692. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_43.out +0 -0
  693. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_44.out +0 -0
  694. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_45.out +0 -0
  695. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_46.out +0 -0
  696. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_47.out +0 -0
  697. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_48.out +0 -0
  698. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_50.out +0 -0
  699. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_51.out +0 -0
  700. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_52.out +0 -0
  701. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_53.out +0 -0
  702. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_54.out +0 -0
  703. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_6.out +0 -0
  704. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_7.out +0 -0
  705. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/Writer_9.out +0 -0
  706. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP.t +0 -0
  707. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_10.out +0 -0
  708. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_11.out +0 -0
  709. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_12.out +0 -0
  710. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_13.out +0 -0
  711. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_14.out +0 -0
  712. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_15.out +0 -0
  713. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_16.out +0 -0
  714. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_17.out +0 -0
  715. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_18.out +0 -0
  716. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_19.out +0 -0
  717. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_2.out +0 -0
  718. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_20.out +0 -0
  719. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_21.out +0 -0
  720. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_22.out +0 -0
  721. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_23.out +0 -0
  722. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_24.out +0 -0
  723. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_25.out +0 -0
  724. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_26.out +0 -0
  725. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_27.out +0 -0
  726. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_28.out +0 -0
  727. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_29.out +0 -0
  728. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_3.out +0 -0
  729. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_30.out +0 -0
  730. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_31.out +0 -0
  731. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_32.out +0 -0
  732. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_34.out +0 -0
  733. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_36.out +0 -0
  734. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_37.out +0 -0
  735. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_39.out +0 -0
  736. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_40.out +0 -0
  737. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_41.out +0 -0
  738. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_5.out +0 -0
  739. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_6.out +0 -0
  740. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_7.out +0 -0
  741. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_8.out +0 -0
  742. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/XMP_9.out +0 -0
  743. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP.t +0 -0
  744. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_2.out +0 -0
  745. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_3.out +0 -0
  746. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_4.out +0 -0
  747. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_5.out +0 -0
  748. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_6.out +0 -0
  749. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/ZIP_7.out +0 -0
  750. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/AFCP.jpg +0 -0
  751. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/AIFF.aif +0 -0
  752. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/APE.ape +0 -0
  753. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/APE.mpc +0 -0
  754. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ASF.wmv +0 -0
  755. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/BMP.bmp +0 -0
  756. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/BigTIFF.btf +0 -0
  757. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Canon.jpg +0 -0
  758. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Canon1DmkIII.jpg +0 -0
  759. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/CanonRaw.cr2 +0 -0
  760. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/CanonRaw.crw +0 -0
  761. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/CanonVRD.vrd +0 -0
  762. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/CaptureOne.eip +0 -0
  763. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Casio.jpg +0 -0
  764. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Casio2.jpg +0 -0
  765. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/CasioQVCI.jpg +0 -0
  766. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/DICOM.dcm +0 -0
  767. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/DNG.dng +0 -0
  768. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/DPX.dpx +0 -0
  769. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/DV.dv +0 -0
  770. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/DjVu.djvu +0 -0
  771. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/EXE.elf +0 -0
  772. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/EXE.exe +0 -0
  773. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/EXE.macho +0 -0
  774. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ExifTool.jpg +0 -0
  775. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ExifTool.tif +0 -0
  776. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ExtendedXMP.jpg +0 -0
  777. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FLAC.flac +0 -0
  778. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FLAC.ogg +0 -0
  779. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FLIR.fpf +0 -0
  780. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FLIR.jpg +0 -0
  781. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Flash.flv +0 -0
  782. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Flash.swf +0 -0
  783. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FlashPix.ppt +0 -0
  784. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.afm +0 -0
  785. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.dfont +0 -0
  786. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.pfa +0 -0
  787. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.pfb +0 -0
  788. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.pfm +0 -0
  789. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Font.ttf +0 -0
  790. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FotoStation.jpg +0 -0
  791. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FujiFilm.jpg +0 -0
  792. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/FujiFilm.raf +0 -0
  793. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/GE.jpg +0 -0
  794. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/GIF.gif +0 -0
  795. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/GIMP.xcf +0 -0
  796. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/GPS.jpg +0 -0
  797. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/GeoTiff.tif +0 -0
  798. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag.gpx +0 -0
  799. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag.igc +0 -0
  800. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag.kml +0 -0
  801. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag.log +0 -0
  802. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag.xml +0 -0
  803. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Geotag2.log +0 -0
  804. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/HTML.html +0 -0
  805. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/IPTC.jpg +0 -0
  806. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ITC.itc +0 -0
  807. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/InDesign.indd +0 -0
  808. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/JVC.jpg +0 -0
  809. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/JVC2.jpg +0 -0
  810. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Jpeg2000.j2c +0 -0
  811. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Jpeg2000.jp2 +0 -0
  812. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Kodak.jpg +0 -0
  813. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/KyoceraRaw.raw +0 -0
  814. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/LNK.lnk +0 -0
  815. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/M2TS.mts +0 -0
  816. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/MIE.mie +0 -0
  817. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/MIFF.miff +0 -0
  818. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/MP3.mp3 +0 -0
  819. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/MWG.jpg +0 -0
  820. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/MXF.mxf +0 -0
  821. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Matroska.mkv +0 -0
  822. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Minolta.jpg +0 -0
  823. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Minolta.mrw +0 -0
  824. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Nikon.jpg +0 -0
  825. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Nikon.nef +0 -0
  826. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/NikonD2Hs.jpg +0 -0
  827. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/NikonD70.jpg +0 -0
  828. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/OOXML.docx +0 -0
  829. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Olympus.jpg +0 -0
  830. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Olympus2.jpg +0 -0
  831. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/OlympusE1.jpg +0 -0
  832. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/OpenDoc.ods +0 -0
  833. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/OpenEXR.exr +0 -0
  834. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PDF.pdf +0 -0
  835. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PDF2.pdf +0 -0
  836. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PGF.pgf +0 -0
  837. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PICT.pict +0 -0
  838. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PLIST-bin.plist +0 -0
  839. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PLIST-xml.plist +0 -0
  840. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PNG.png +0 -0
  841. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PPM.ppm +0 -0
  842. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PSP.psp +0 -0
  843. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Panasonic.jpg +0 -0
  844. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Panasonic.rw2 +0 -0
  845. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Pentax.avi +0 -0
  846. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Pentax.jpg +0 -0
  847. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PhotoCD.pcd +0 -0
  848. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PhotoMechanic.jpg +0 -0
  849. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Photoshop.psd +0 -0
  850. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/PostScript.eps +0 -0
  851. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/QuickTime.m4a +0 -0
  852. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/QuickTime.mov +0 -0
  853. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/RIFF.avi +0 -0
  854. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/RIFF.wav +0 -0
  855. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/RIFF.webp +0 -0
  856. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/RTF.rtf +0 -0
  857. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Radiance.hdr +0 -0
  858. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Real.ra +0 -0
  859. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Real.ram +0 -0
  860. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Real.rm +0 -0
  861. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Ricoh.jpg +0 -0
  862. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Ricoh2.jpg +0 -0
  863. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Sanyo.jpg +0 -0
  864. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Sigma.jpg +0 -0
  865. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Sigma.x3f +0 -0
  866. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/SigmaDP2.x3f +0 -0
  867. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Sony.jpg +0 -0
  868. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Sony.pmp +0 -0
  869. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Torrent.torrent +0 -0
  870. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Unknown.jpg +0 -0
  871. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Vorbis.ogg +0 -0
  872. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/Writer.jpg +0 -0
  873. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP.inx +0 -0
  874. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP.jpg +0 -0
  875. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP.svg +0 -0
  876. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP.xml +0 -0
  877. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP.xmp +0 -0
  878. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP2.xmp +0 -0
  879. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP3.xmp +0 -0
  880. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP4.xmp +0 -0
  881. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/XMP5.xmp +0 -0
  882. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ZIP.gz +0 -0
  883. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/ZIP.zip +0 -0
  884. data/bin/{Image-ExifTool-9.45 → Image-ExifTool-9.46}/t/images/iWork.numbers +0 -0
  885. data/lib/exiftool_vendored/version.rb +1 -1
  886. metadata +886 -886
  887. data/bin/Image-ExifTool-9.45/Changes +0 -6430
  888. data/bin/Image-ExifTool-9.45/META.yml +0 -27
  889. data/bin/Image-ExifTool-9.45/README +0 -228
  890. data/bin/Image-ExifTool-9.45/exiftool +0 -5767
  891. data/bin/Image-ExifTool-9.45/html/Shift.html +0 -173
  892. data/bin/Image-ExifTool-9.45/html/TagNames/Canon.html +0 -8302
  893. data/bin/Image-ExifTool-9.45/html/TagNames/Composite.html +0 -672
  894. data/bin/Image-ExifTool-9.45/html/TagNames/Extra.html +0 -308
  895. data/bin/Image-ExifTool-9.45/html/TagNames/Minolta.html +0 -2568
  896. data/bin/Image-ExifTool-9.45/html/TagNames/Nikon.html +0 -4495
  897. data/bin/Image-ExifTool-9.45/html/TagNames/Olympus.html +0 -3400
  898. data/bin/Image-ExifTool-9.45/html/TagNames/Panasonic.html +0 -1585
  899. data/bin/Image-ExifTool-9.45/html/TagNames/Pentax.html +0 -4527
  900. data/bin/Image-ExifTool-9.45/html/TagNames/QuickTime.html +0 -3397
  901. data/bin/Image-ExifTool-9.45/html/TagNames/Shortcuts.html +0 -239
  902. data/bin/Image-ExifTool-9.45/html/TagNames/Sony.html +0 -5721
  903. data/bin/Image-ExifTool-9.45/html/TagNames/XMP.html +0 -7927
  904. data/bin/Image-ExifTool-9.45/html/exiftool_pod.html +0 -2370
  905. data/bin/Image-ExifTool-9.45/html/faq.html +0 -1434
  906. data/bin/Image-ExifTool-9.45/html/filename.html +0 -282
  907. data/bin/Image-ExifTool-9.45/html/history.html +0 -362
  908. data/bin/Image-ExifTool-9.45/html/htmldump.html +0 -732
  909. data/bin/Image-ExifTool-9.45/html/index.html +0 -1283
  910. data/bin/Image-ExifTool-9.45/html/metafiles.html +0 -266
  911. data/bin/Image-ExifTool-9.45/html/under.html +0 -124
  912. data/bin/Image-ExifTool-9.45/lib/File/RandomAccess.pm +0 -378
  913. data/bin/Image-ExifTool-9.45/lib/File/RandomAccess.pod +0 -231
  914. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool.pm +0 -6894
  915. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool.pod +0 -2406
  916. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/AES.pm +0 -501
  917. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/AFCP.pm +0 -284
  918. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/AIFF.pm +0 -271
  919. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/APE.pm +0 -262
  920. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/APP12.pm +0 -322
  921. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/ASF.pm +0 -884
  922. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Apple.pm +0 -113
  923. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/BMP.pm +0 -179
  924. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/BZZ.pm +0 -472
  925. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/BigTIFF.pm +0 -282
  926. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/BuildTagLookup.pm +0 -2421
  927. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Canon.pm +0 -7985
  928. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/CanonCustom.pm +0 -2523
  929. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/CanonRaw.pm +0 -931
  930. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/CanonVRD.pm +0 -1481
  931. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/CaptureOne.pm +0 -235
  932. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Casio.pm +0 -2013
  933. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Charset.pm +0 -396
  934. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DICOM.pm +0 -3874
  935. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DNG.pm +0 -835
  936. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DPX.pm +0 -151
  937. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DV.pm +0 -319
  938. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DarwinCore.pm +0 -317
  939. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/DjVu.pm +0 -376
  940. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/EXE.pm +0 -1228
  941. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Exif.pm +0 -4596
  942. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/FLAC.pm +0 -296
  943. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/FLIR.pm +0 -1232
  944. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Fixup.pm +0 -354
  945. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Flash.pm +0 -755
  946. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/FlashPix.pm +0 -1882
  947. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Font.pm +0 -643
  948. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/FotoStation.pm +0 -259
  949. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/FujiFilm.pm +0 -1088
  950. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/GE.pm +0 -80
  951. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/GIF.pm +0 -542
  952. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/GIMP.pm +0 -258
  953. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/GPS.pm +0 -514
  954. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/GeoTiff.pm +0 -2187
  955. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Geotag.pm +0 -1176
  956. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/H264.pm +0 -1102
  957. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/HP.pm +0 -262
  958. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/HTML.pm +0 -576
  959. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/HtmlDump.pm +0 -895
  960. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/ICC_Profile.pm +0 -999
  961. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/ID3.pm +0 -1532
  962. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/IPTC.pm +0 -1244
  963. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/ITC.pm +0 -215
  964. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Import.pm +0 -308
  965. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/InDesign.pm +0 -277
  966. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/JPEG.pm +0 -522
  967. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/JPEGDigest.pm +0 -2511
  968. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/JVC.pm +0 -130
  969. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Jpeg2000.pm +0 -873
  970. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Kodak.pm +0 -2014
  971. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/KyoceraRaw.pm +0 -173
  972. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/LNK.pm +0 -723
  973. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/cs.pm +0 -1586
  974. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/de.pm +0 -7356
  975. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/en_ca.pm +0 -557
  976. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/en_gb.pm +0 -572
  977. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/es.pm +0 -4017
  978. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/fi.pm +0 -2856
  979. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/fr.pm +0 -4720
  980. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/it.pm +0 -7918
  981. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/ja.pm +0 -5815
  982. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/ko.pm +0 -2332
  983. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/nl.pm +0 -3220
  984. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/pl.pm +0 -1140
  985. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/ru.pm +0 -769
  986. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/sv.pm +0 -639
  987. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/tr.pm +0 -544
  988. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/zh_cn.pm +0 -1329
  989. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Lang/zh_tw.pm +0 -802
  990. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Leaf.pm +0 -515
  991. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/M2TS.pm +0 -725
  992. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MIE.pm +0 -2561
  993. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MIEUnits.pod +0 -377
  994. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MIFF.pm +0 -279
  995. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MNG.pm +0 -684
  996. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MPC.pm +0 -156
  997. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MPEG.pm +0 -736
  998. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MPF.pm +0 -289
  999. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MWG.pm +0 -748
  1000. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MXF.pm +0 -3032
  1001. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MakerNotes.pm +0 -1598
  1002. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Matroska.pm +0 -891
  1003. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Microsoft.pm +0 -879
  1004. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Minolta.pm +0 -2859
  1005. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/MinoltaRaw.pm +0 -534
  1006. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Nikon.pm +0 -6141
  1007. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/NikonCapture.pm +0 -911
  1008. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/NikonCustom.pm +0 -4405
  1009. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/OOXML.pm +0 -409
  1010. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Ogg.pm +0 -237
  1011. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Olympus.pm +0 -3628
  1012. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/OpenEXR.pm +0 -324
  1013. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PDF.pm +0 -2327
  1014. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PGF.pm +0 -143
  1015. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PICT.pm +0 -1260
  1016. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PLIST.pm +0 -453
  1017. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PNG.pm +0 -1161
  1018. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PPM.pm +0 -169
  1019. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PSP.pm +0 -305
  1020. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Panasonic.pm +0 -2180
  1021. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PanasonicRaw.pm +0 -535
  1022. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Pentax.pm +0 -5788
  1023. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PhaseOne.pm +0 -557
  1024. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PhotoCD.pm +0 -507
  1025. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PhotoMechanic.pm +0 -256
  1026. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Photoshop.pm +0 -629
  1027. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PostScript.pm +0 -693
  1028. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/PrintIM.pm +0 -125
  1029. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Qualcomm.pm +0 -1344
  1030. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/QuickTime.pm +0 -3849
  1031. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/RIFF.pm +0 -1332
  1032. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/RSRC.pm +0 -241
  1033. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/RTF.pm +0 -383
  1034. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Radiance.pm +0 -144
  1035. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Rawzor.pm +0 -190
  1036. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Real.pm +0 -736
  1037. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Reconyx.pm +0 -190
  1038. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Ricoh.pm +0 -1039
  1039. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Samsung.pm +0 -846
  1040. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Sanyo.pm +0 -439
  1041. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Scalado.pm +0 -141
  1042. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Shift.pl +0 -594
  1043. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Shortcuts.pm +0 -293
  1044. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Sigma.pm +0 -574
  1045. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/SigmaRaw.pm +0 -649
  1046. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Sony.pm +0 -7072
  1047. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/SonyIDC.pm +0 -330
  1048. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Stim.pm +0 -196
  1049. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/TagInfoXML.pm +0 -794
  1050. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/TagLookup.pm +0 -8351
  1051. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/TagNames.pod +0 -26867
  1052. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Theora.pm +0 -145
  1053. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Torrent.pm +0 -317
  1054. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Unknown.pm +0 -66
  1055. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Vorbis.pm +0 -237
  1056. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WriteCanonRaw.pl +0 -637
  1057. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WriteExif.pl +0 -3685
  1058. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WriteIPTC.pl +0 -702
  1059. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WritePDF.pl +0 -765
  1060. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WritePNG.pl +0 -376
  1061. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WritePhotoshop.pl +0 -266
  1062. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WritePostScript.pl +0 -777
  1063. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WriteQuickTime.pl +0 -344
  1064. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/WriteXMP.pl +0 -1318
  1065. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/Writer.pl +0 -5851
  1066. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/XMP.pm +0 -3755
  1067. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/XMP2.pl +0 -1299
  1068. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/XMPStruct.pl +0 -814
  1069. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/ZIP.pm +0 -623
  1070. data/bin/Image-ExifTool-9.45/lib/Image/ExifTool/iWork.pm +0 -223
  1071. data/bin/Image-ExifTool-9.45/perl-Image-ExifTool.spec +0 -105
  1072. data/bin/Image-ExifTool-9.45/t/QuickTime_2.out +0 -130
  1073. data/bin/Image-ExifTool-9.45/t/QuickTime_3.out +0 -71
@@ -1,3685 +0,0 @@
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
- sub InsertWritableProperties($$;$);
18
-
19
- # some information may be stored in different IFD's with the same meaning.
20
- # Use this lookup to decide when we should delete information that is stored
21
- # in another IFD when we write it to the preferred IFD.
22
- my %crossDelete = (
23
- ExifIFD => 'IFD0',
24
- IFD0 => 'ExifIFD',
25
- );
26
-
27
- # mandatory tag default values
28
- my %mandatory = (
29
- IFD0 => {
30
- 0x011a => 72, # XResolution
31
- 0x011b => 72, # YResolution
32
- 0x0128 => 2, # ResolutionUnit (inches)
33
- 0x0213 => 1, # YCbCrPositioning (centered)
34
- # 0x8769 => ????, # ExifOffset
35
- },
36
- IFD1 => {
37
- 0x0103 => 6, # Compression (JPEG)
38
- 0x011a => 72, # XResolution
39
- 0x011b => 72, # YResolution
40
- 0x0128 => 2, # ResolutionUnit (inches)
41
- },
42
- ExifIFD => {
43
- 0x9000 => '0230', # ExifVersion
44
- 0x9101 => "1 2 3 0",# ComponentsConfiguration
45
- 0xa000 => '0100', # FlashpixVersion
46
- 0xa001 => 0xffff, # ColorSpace (uncalibrated)
47
- # 0xa002 => ????, # ExifImageWidth
48
- # 0xa003 => ????, # ExifImageHeight
49
- },
50
- GPS => {
51
- 0x0000 => '2 3 0 0',# GPSVersionID
52
- },
53
- InteropIFD => {
54
- 0x0002 => '0100', # InteropVersion
55
- },
56
- );
57
-
58
- # The main EXIF table is unique because the tags from this table may appear
59
- # in many different directories. For this reason, we introduce a
60
- # "WriteGroup" member to the tagInfo that tells us the preferred location
61
- # for writing each tag. Here is the lookup for Writable flag (format)
62
- # and WriteGroup for all writable tags
63
- # - WriteGroup is ExifIFD unless otherwise specified
64
- # - Protected is 1 if the tag shouldn't be copied with SetNewValuesFromFile()
65
- my %writeTable = (
66
- 0x0001 => { # InteropIndex
67
- Protected => 1,
68
- Writable => 'string',
69
- WriteGroup => 'InteropIFD',
70
- },
71
- 0x0002 => { # InteropVersion
72
- Protected => 1,
73
- Writable => 'undef',
74
- Mandatory => 1,
75
- WriteGroup => 'InteropIFD',
76
- },
77
- 0x000b => { # ProcessingSoftware
78
- Writable => 'string',
79
- WriteGroup => 'IFD0',
80
- },
81
- 0x00fe => { # SubfileType
82
- Protected => 1,
83
- Writable => 'int32u',
84
- WriteGroup => 'IFD0',
85
- },
86
- 0x00ff => { # OldSubfileType
87
- Protected => 1,
88
- Writable => 'int16u',
89
- WriteGroup => 'IFD0',
90
- },
91
- 0x0100 => { # ImageWidth
92
- Protected => 1,
93
- Writable => 'int32u',
94
- WriteGroup => 'IFD0',
95
- },
96
- 0x0101 => { # ImageHeight
97
- Protected => 1,
98
- Writable => 'int32u',
99
- WriteGroup => 'IFD0',
100
- },
101
- 0x0102 => { # BitsPerSample
102
- Protected => 1,
103
- Writable => 'int16u',
104
- WriteGroup => 'IFD0',
105
- Count => -1, # can be 1 or 3: -1 means 'variable'
106
- },
107
- 0x0103 => { # Compression
108
- Protected => 1,
109
- Writable => 'int16u',
110
- WriteGroup => 'IFD0',
111
- Mandatory => 1,
112
- },
113
- 0x0106 => { # PhotometricInterpretation
114
- Protected => 1,
115
- Writable => 'int16u',
116
- WriteGroup => 'IFD0',
117
- },
118
- 0x0107 => { # Thresholding
119
- Protected => 1,
120
- Writable => 'int16u',
121
- WriteGroup => 'IFD0',
122
- },
123
- 0x0108 => { # CellWidth
124
- Protected => 1,
125
- Writable => 'int16u',
126
- WriteGroup => 'IFD0',
127
- },
128
- 0x0109 => { # CellLength
129
- Protected => 1,
130
- Writable => 'int16u',
131
- WriteGroup => 'IFD0',
132
- },
133
- 0x010a => { # FillOrder
134
- Protected => 1,
135
- Writable => 'int16u',
136
- WriteGroup => 'IFD0',
137
- },
138
- 0x010d => { # DocumentName
139
- Writable => 'string',
140
- WriteGroup => 'IFD0',
141
- },
142
- 0x010e => { # ImageDescription
143
- Writable => 'string',
144
- WriteGroup => 'IFD0',
145
- },
146
- 0x010f => { # Make
147
- Writable => 'string',
148
- WriteGroup => 'IFD0',
149
- },
150
- 0x0110 => { # Model
151
- Writable => 'string',
152
- WriteGroup => 'IFD0',
153
- },
154
- 0x0112 => { # Orientation
155
- Writable => 'int16u',
156
- WriteGroup => 'IFD0',
157
- },
158
- 0x0115 => { # SamplesPerPixel
159
- Protected => 1,
160
- Writable => 'int16u',
161
- WriteGroup => 'IFD0',
162
- },
163
- 0x0116 => { # RowsPerStrip
164
- Protected => 1,
165
- Writable => 'int32u',
166
- WriteGroup => 'IFD0',
167
- },
168
- 0x0118 => { # MinSampleValue
169
- Writable => 'int16u',
170
- WriteGroup => 'IFD0',
171
- },
172
- 0x0119 => { # MaxSampleValue
173
- Writable => 'int16u',
174
- WriteGroup => 'IFD0',
175
- },
176
- 0x011a => { # XResolution
177
- Writable => 'rational64u',
178
- WriteGroup => 'IFD0',
179
- Mandatory => 1,
180
- },
181
- 0x011b => { # YResolution
182
- Writable => 'rational64u',
183
- WriteGroup => 'IFD0',
184
- Mandatory => 1,
185
- },
186
- 0x011c => { # PlanarConfiguration
187
- Protected => 1,
188
- Writable => 'int16u',
189
- WriteGroup => 'IFD0',
190
- },
191
- 0x011d => { # PageName
192
- Writable => 'string',
193
- WriteGroup => 'IFD0',
194
- },
195
- 0x011e => { # XPosition
196
- Writable => 'rational64u',
197
- WriteGroup => 'IFD0',
198
- },
199
- 0x011f => { # YPosition
200
- Writable => 'rational64u',
201
- WriteGroup => 'IFD0',
202
- },
203
- 0x0122 => { # GrayResponseUnit
204
- Writable => 'int16u',
205
- WriteGroup => 'IFD0',
206
- },
207
- 0x0128 => { # ResolutionUnit
208
- Writable => 'int16u',
209
- WriteGroup => 'IFD0',
210
- Mandatory => 1,
211
- },
212
- 0x0129 => { # PageNumber
213
- Writable => 'int16u',
214
- WriteGroup => 'IFD0',
215
- Count => 2,
216
- },
217
- 0x012d => { # TransferFunction
218
- Protected => 1,
219
- Writable => 'int16u',
220
- WriteGroup => 'IFD0',
221
- Count => 768,
222
- },
223
- 0x0131 => { # Software
224
- Writable => 'string',
225
- WriteGroup => 'IFD0',
226
- },
227
- 0x0132 => { # ModifyDate
228
- Writable => 'string',
229
- Shift => 'Time',
230
- WriteGroup => 'IFD0',
231
- PrintConvInv => '$self->InverseDateTime($val,0)',
232
- },
233
- 0x013b => { # Artist
234
- Writable => 'string',
235
- WriteGroup => 'IFD0',
236
- },
237
- 0x013c => { # HostComputer
238
- Writable => 'string',
239
- WriteGroup => 'IFD0',
240
- },
241
- 0x013d => { # Predictor
242
- Protected => 1,
243
- Writable => 'int16u',
244
- WriteGroup => 'IFD0',
245
- },
246
- 0x013e => { # WhitePoint
247
- Writable => 'rational64u',
248
- WriteGroup => 'IFD0',
249
- Count => 2,
250
- },
251
- 0x013f => { # PrimaryChromaticities
252
- Writable => 'rational64u',
253
- WriteGroup => 'IFD0',
254
- Count => 6,
255
- },
256
- 0x0141 => { # HalftoneHints
257
- Writable => 'int16u',
258
- WriteGroup => 'IFD0',
259
- Count => 2,
260
- },
261
- 0x0142 => { # TileWidth
262
- Protected => 1,
263
- Writable => 'int32u',
264
- WriteGroup => 'IFD0',
265
- },
266
- 0x0143 => { # TileLength
267
- Protected => 1,
268
- Writable => 'int32u',
269
- WriteGroup => 'IFD0',
270
- },
271
- 0x014c => { # InkSet
272
- Writable => 'int16u',
273
- WriteGroup => 'IFD0',
274
- },
275
- 0x0150 => { # TargetPrinter
276
- Writable => 'string',
277
- WriteGroup => 'IFD0',
278
- },
279
- 0x013c => { # HostComputer
280
- Writable => 'string',
281
- WriteGroup => 'IFD0',
282
- },
283
- 0x0211 => { # YCbCrCoefficients
284
- Protected => 1,
285
- Writable => 'rational64u',
286
- WriteGroup => 'IFD0',
287
- Count => 3,
288
- },
289
- 0x0212 => { # YCbCrSubSampling
290
- Protected => 1,
291
- Writable => 'int16u',
292
- WriteGroup => 'IFD0',
293
- Count => 2,
294
- },
295
- 0x0213 => { # YCbCrPositioning
296
- Protected => 1,
297
- Writable => 'int16u',
298
- WriteGroup => 'IFD0',
299
- Mandatory => 1,
300
- },
301
- 0x0214 => { # ReferenceBlackWhite
302
- Writable => 'rational64u',
303
- WriteGroup => 'IFD0',
304
- Count => 6,
305
- },
306
- 0x1000 => { # RelatedImageFileFormat
307
- Protected => 1,
308
- Writable => 'string',
309
- WriteGroup => 'InteropIFD',
310
- },
311
- 0x1001 => { # RelatedImageWidth
312
- Protected => 1,
313
- Writable => 'int16u',
314
- WriteGroup => 'InteropIFD',
315
- },
316
- 0x1002 => { # RelatedImageHeight (more commonly RelatedImageLength)
317
- Protected => 1,
318
- Writable => 'int16u',
319
- WriteGroup => 'InteropIFD',
320
- },
321
- 0x4746 => { # Rating (MicrosoftPhoto)
322
- Writable => 'int16u',
323
- WriteGroup => 'IFD0',
324
- Avoid => 1,
325
- },
326
- 0x4749 => { # RatingPercent (MicrosoftPhoto)
327
- Writable => 'int16u',
328
- WriteGroup => 'IFD0',
329
- Avoid => 1,
330
- },
331
- 0x828d => { # CFARepeatPatternDim
332
- Protected => 1,
333
- Writable => 'int16u',
334
- WriteGroup => 'SubIFD',
335
- Count => 2,
336
- },
337
- 0x828e => { # CFAPattern2
338
- Protected => 1,
339
- Writable => 'int8u',
340
- WriteGroup => 'SubIFD',
341
- Count => -1,
342
- },
343
- 0x8298 => { # Copyright
344
- Writable => 'string',
345
- WriteGroup => 'IFD0',
346
- RawConvInv => sub {
347
- my ($val, $self) = @_;
348
- # encode if necessary
349
- my $enc = $self->Options('CharsetEXIF');
350
- $val = $self->Encode($val,$enc) if $enc and $val !~ /\0/;
351
- if ($val =~ /(.*?)\s*[\n\r]+\s*(.*)/s) {
352
- return $1 . "\0" unless length $2;
353
- # photographer copyright set to ' ' if it doesn't exist, according to spec.
354
- return((length($1) ? $1 : ' ') . "\0" . $2 . "\0");
355
- }
356
- return $val . "\0";
357
- },
358
- },
359
- #
360
- # Most of the tags below this belong in the ExifIFD...
361
- #
362
- 0x829a => { # ExposureTime
363
- Writable => 'rational64u',
364
- PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
365
- },
366
- 0x829d => { # FNumber
367
- Writable => 'rational64u',
368
- PrintConvInv => '$val',
369
- },
370
- 0x8546 => { # SEMInfo
371
- Writable => 'string',
372
- WriteGroup => 'IFD0',
373
- },
374
- 0x8822 => 'int16u', # ExposureProgram
375
- 0x8824 => 'string', # SpectralSensitivity
376
- 0x8827 => { # ISO
377
- Writable => 'int16u',
378
- Count => -1,
379
- PrintConvInv => '$val=~tr/,//d; $val',
380
- },
381
- 0x882a => { # TimeZoneOffset
382
- Writable => 'int16s',
383
- Count => -1, # can be 1 or 2
384
- Notes => q{
385
- 1 or 2 values: 1. The time zone offset of DateTimeOriginal from GMT in
386
- hours, 2. If present, the time zone offset of ModifyDate
387
- },
388
- },
389
- 0x882b => 'int16u', # SelfTimerMode
390
- 0x8830 => 'int16u', # SensitivityType
391
- 0x8831 => 'int32u', # StandardOutputSensitivity
392
- 0x8832 => 'int32u', # RecommendedExposureIndex
393
- 0x8833 => 'int32u', # ISOSpeed
394
- 0x8834 => 'int32u', # ISOSpeedLatitudeyyy
395
- 0x8835 => 'int32u', # ISOSpeedLatitudezzz
396
- 0x9000 => { # ExifVersion
397
- Writable => 'undef',
398
- Mandatory => 1,
399
- PrintConvInv => '$val=~tr/.//d; $val=~/^\d{4}$/ ? $val : undef',
400
- },
401
- 0x9003 => { # DateTimeOriginal
402
- Writable => 'string',
403
- Shift => 'Time',
404
- PrintConvInv => '$self->InverseDateTime($val,0)',
405
- },
406
- 0x9004 => { # CreateDate
407
- Writable => 'string',
408
- Shift => 'Time',
409
- PrintConvInv => '$self->InverseDateTime($val,0)',
410
- },
411
- 0x9101 => { # ComponentsConfiguration
412
- Protected => 1,
413
- Writable => 'undef',
414
- Count => 4,
415
- Mandatory => 1,
416
- ValueConvInv => '$val=~tr/,//d; $val', # (so we can copy from XMP with -n)
417
- },
418
- 0x9102 => { # CompressedBitsPerPixel
419
- Protected => 1,
420
- Writable => 'rational64u',
421
- },
422
- 0x9201 => { # ShutterSpeedValue
423
- Writable => 'rational64s',
424
- ValueConvInv => '$val>0 ? -log($val)/log(2) : -100',
425
- # do eval to convert things like '1/100'
426
- PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
427
- },
428
- 0x9202 => { # ApertureValue
429
- Writable => 'rational64u',
430
- ValueConvInv => '$val>0 ? 2*log($val)/log(2) : 0',
431
- PrintConvInv => '$val',
432
- },
433
- 0x9203 => 'rational64s',# BrightnessValue
434
- 0x9204 => { # ExposureCompensation
435
- Writable => 'rational64s',
436
- # do eval to convert things like '+2/3'
437
- PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
438
- },
439
- 0x9205 => { # MaxApertureValue
440
- Writable => 'rational64u',
441
- ValueConvInv => '$val>0 ? 2*log($val)/log(2) : 0',
442
- PrintConvInv => '$val',
443
- },
444
- 0x9206 => { # SubjectDistance
445
- Writable => 'rational64u',
446
- PrintConvInv => '$val=~s/\s*m$//;$val',
447
- },
448
- 0x9207 => 'int16u', # MeteringMode
449
- 0x9208 => 'int16u', # LightSource
450
- 0x9209 => 'int16u', # Flash
451
- 0x920a => { # FocalLength
452
- Writable => 'rational64u',
453
- PrintConvInv => '$val=~s/\s*mm$//;$val',
454
- },
455
- 0x9211 => 'int32u', # ImageNumber
456
- 0x9212 => 'string', # SecurityClassification
457
- 0x9213 => 'string', # ImageHistory
458
- 0x9214 => { # SubjectArea
459
- Writable => 'int16u',
460
- Count => -1, # 2, 3 or 4 values
461
- },
462
- # 0x927c => 'undef', # MakerNotes
463
- 0x9286 => { # UserComment
464
- Writable => 'undef',
465
- # (starts with "ASCII\0\0\0", "UNICODE\0", "JIS\0\0\0\0\0" or "\0\0\0\0\0\0\0\0")
466
- RawConvInv => 'Image::ExifTool::Exif::EncodeExifText($self,$val)',
467
- # SHOULD ADD SPECIAL LOGIC TO ALLOW CONDITIONAL OVERWRITE OF
468
- # "UNKNOWN" VALUES FILLED WITH SPACES
469
- },
470
- 0x9290 => { # SubSecTime
471
- Writable => 'string',
472
- # extract fractional seconds from a full date/time value
473
- ValueConvInv => '$val=~/^(\d+)\s*$/ ? $1 : ($val=~/\.(\d+)/ ? $1 : undef)',
474
- },
475
- 0x9291 => { # SubSecTimeOriginal
476
- Writable => 'string',
477
- ValueConvInv => '$val=~/^(\d+)\s*$/ ? $1 : ($val=~/\.(\d+)/ ? $1 : undef)',
478
- },
479
- 0x9292 => { # SubSecTimeDigitized
480
- Writable => 'string',
481
- ValueConvInv => '$val=~/^(\d+)\s*$/ ? $1 : ($val=~/\.(\d+)/ ? $1 : undef)',
482
- },
483
- 0x935c => { # ImageSourceData
484
- Writable => 'undef',
485
- WriteGroup => 'IFD0',
486
- Protected => 1,
487
- },
488
- # 0x9928 => 'undef', # Opto-ElectricConversionFactor
489
- 0x9c9b => { # XPTitle
490
- Writable => 'int8u',
491
- WriteGroup => 'IFD0',
492
- Notes => q{
493
- tags 0x9c9b-0x9c9f are used by Windows Explorer; special characters
494
- in these values are converted to UTF-8 by default, or Windows Latin1
495
- with the -L option. XPTitle is ignored by Windows Explorer if
496
- ImageDescription exists
497
- },
498
- ValueConvInv => '$self->Encode($val,"UCS2","II") . "\0\0"',
499
- },
500
- 0x9c9c => { # XPComment
501
- Writable => 'int8u',
502
- WriteGroup => 'IFD0',
503
- ValueConvInv => '$self->Encode($val,"UCS2","II") . "\0\0"',
504
- },
505
- 0x9c9d => { # XPAuthor
506
- Writable => 'int8u',
507
- WriteGroup => 'IFD0',
508
- Notes => 'ignored by Windows Explorer if Artist exists',
509
- ValueConvInv => '$self->Encode($val,"UCS2","II") . "\0\0"',
510
- },
511
- 0x9c9e => { # XPKeywords
512
- Writable => 'int8u',
513
- WriteGroup => 'IFD0',
514
- ValueConvInv => '$self->Encode($val,"UCS2","II") . "\0\0"',
515
- },
516
- 0x9c9f => { # XPSubject
517
- Writable => 'int8u',
518
- WriteGroup => 'IFD0',
519
- ValueConvInv => '$self->Encode($val,"UCS2","II") . "\0\0"',
520
- },
521
- 0xa000 => { # FlashpixVersion
522
- Writable => 'undef',
523
- Mandatory => 1,
524
- PrintConvInv => '$val=~tr/.//d; $val=~/^\d{4}$/ ? $val : undef',
525
- },
526
- 0xa001 => { # ColorSpace
527
- Writable => 'int16u',
528
- Mandatory => 1,
529
- },
530
- 0xa002 => { # ExifImageWidth (could also be int32u)
531
- Writable => 'int16u',
532
- Mandatory => 1,
533
- },
534
- 0xa003 => { # ExifImageHeight (could also be int32u)
535
- Writable => 'int16u',
536
- Mandatory => 1,
537
- },
538
- 0xa004 => 'string', # RelatedSoundFile
539
- 0xa20b => { # FlashEnergy
540
- Writable => 'rational64u',
541
- Count => -1, # 1 or 2 (ref 12)
542
- },
543
- # 0xa20c => 'undef', # SpatialFrequencyResponse
544
- 0xa20e => 'rational64u',# FocalPlaneXResolution
545
- 0xa20f => 'rational64u',# FocalPlaneYResolution
546
- 0xa210 => 'int16u', # FocalPlaneResolutionUnit
547
- 0xa214 => { # SubjectLocation
548
- Writable => 'int16u',
549
- Count => 2,
550
- },
551
- 0xa215 => 'rational64u',# ExposureIndex
552
- 0xa217 => 'int16u', # SensingMethod
553
- 0xa300 => { # FileSource
554
- Writable => 'undef',
555
- ValueConvInv => '($val=~/^\d+$/ and $val < 256) ? chr($val) : $val',
556
- },
557
- 0xa301 => { # SceneType
558
- Writable => 'undef',
559
- ValueConvInv => 'chr($val)',
560
- },
561
- 0xa302 => { # CFAPattern
562
- Writable => 'undef',
563
- RawConvInv => q{
564
- my @a = split ' ', $val;
565
- return $val if @a <= 2; # also accept binary data for backward compatibility
566
- return pack(GetByteOrder() eq 'II' ? 'v2C*' : 'n2C*', @a);
567
- },
568
- PrintConvInv => 'Image::ExifTool::Exif::GetCFAPattern($val)',
569
- },
570
- 0xa401 => 'int16u', # CustomRendered
571
- 0xa402 => 'int16u', # ExposureMode
572
- 0xa403 => 'int16u', # WhiteBalance
573
- 0xa404 => 'rational64u',# DigitalZoomRatio
574
- 0xa405 => { # FocalLengthIn35mmFormat
575
- Writable => 'int16u',
576
- PrintConvInv => '$val=~s/\s*mm$//;$val',
577
- },
578
- 0xa406 => 'int16u', # SceneCaptureType
579
- 0xa407 => 'int16u', # GainControl
580
- 0xa408 => { # Contrast
581
- Writable => 'int16u',
582
- PrintConvInv => 'Image::ExifTool::Exif::ConvertParameter($val)',
583
- },
584
- 0xa409 => { # Saturation
585
- Writable => 'int16u',
586
- PrintConvInv => 'Image::ExifTool::Exif::ConvertParameter($val)',
587
- },
588
- 0xa40a => { # Sharpness
589
- Writable => 'int16u',
590
- PrintConvInv => 'Image::ExifTool::Exif::ConvertParameter($val)',
591
- },
592
- # 0xa40b => 'undef', # DeviceSettingDescription
593
- 0xa40c => 'int16u', # SubjectDistanceRange
594
- 0xa420 => 'string', # ImageUniqueID
595
- 0xa430 => 'string', # OwnerName
596
- 0xa431 => 'string', # SerialNumber
597
- 0xa432 => { # LensInfo
598
- Writable => 'rational64u',
599
- Count => 4,
600
- PrintConvInv => \&ConvertLensInfo,
601
- },
602
- 0xa433 => 'string', # LensMake
603
- 0xa434 => 'string', # LensModel
604
- 0xa435 => 'string', # LensSerialNumber
605
- 0xa500 => 'rational64u',# Gamma
606
- #
607
- # DNG stuff (mostly in IFD0, "Raw IFD" in SubIFD)
608
- #
609
- 0xc612 => { # DNGVersion
610
- Writable => 'int8u',
611
- WriteGroup => 'IFD0',
612
- Count => 4,
613
- Protected => 1, # (confuses Apple Preview if written to a TIFF image)
614
- PrintConvInv => '$val =~ tr/./ /; $val',
615
- },
616
- 0xc613 => { # DNGBackwardVersion
617
- Writable => 'int8u',
618
- WriteGroup => 'IFD0',
619
- Count => 4,
620
- Protected => 1,
621
- PrintConvInv => '$val =~ tr/./ /; $val',
622
- },
623
- 0xc614 => { # UniqueCameraModel
624
- Writable => 'string',
625
- WriteGroup => 'IFD0',
626
- },
627
- 0xc615 => { # LocalizedCameraModel
628
- Writable => 'string',
629
- WriteGroup => 'IFD0',
630
- PrintConvInv => '$val',
631
- },
632
- 0xc618 => { # LinearizationTable
633
- Writable => 'int16u',
634
- WriteGroup => 'SubIFD',
635
- Count => -1,
636
- Protected => 1,
637
- },,
638
- 0xc619 => { # BlackLevelRepeatDim
639
- Writable => 'int16u',
640
- WriteGroup => 'SubIFD',
641
- Count => 2,
642
- Protected => 1,
643
- },
644
- 0xc61a => { # BlackLevel
645
- Writable => 'rational64u',
646
- WriteGroup => 'SubIFD',
647
- Count => -1,
648
- Protected => 1,
649
- },
650
- 0xc61b => { # BlackLevelDeltaH
651
- Writable => 'rational64s',
652
- WriteGroup => 'SubIFD',
653
- Count => -1,
654
- Protected => 1,
655
- },
656
- 0xc61c => { # BlackLevelDeltaV
657
- Writable => 'rational64s',
658
- WriteGroup => 'SubIFD',
659
- Count => -1,
660
- Protected => 1,
661
- },
662
- 0xc61d => { # WhiteLevel
663
- Writable => 'int32u',
664
- WriteGroup => 'SubIFD',
665
- Count => -1,
666
- Protected => 1,
667
- },
668
- 0xc61e => { # DefaultScale
669
- Writable => 'rational64u',
670
- WriteGroup => 'SubIFD',
671
- Count => 2,
672
- Protected => 1,
673
- },
674
- 0xc61f => { # DefaultCropOrigin
675
- Writable => 'int32u',
676
- WriteGroup => 'SubIFD',
677
- Count => 2,
678
- Protected => 1,
679
- },
680
- 0xc620 => { # DefaultCropSize
681
- Writable => 'int32u',
682
- WriteGroup => 'SubIFD',
683
- Count => 2,
684
- Protected => 1,
685
- },
686
- 0xc621 => { # ColorMatrix1
687
- Writable => 'rational64s',
688
- WriteGroup => 'IFD0',
689
- Count => -1,
690
- Protected => 1,
691
- },
692
- 0xc622 => { # ColorMatrix2
693
- Writable => 'rational64s',
694
- WriteGroup => 'IFD0',
695
- Count => -1,
696
- Protected => 1,
697
- },
698
- 0xc623 => { # CameraCalibration1
699
- Writable => 'rational64s',
700
- WriteGroup => 'IFD0',
701
- Count => -1,
702
- Protected => 1,
703
- },
704
- 0xc624 => { # CameraCalibration2
705
- Writable => 'rational64s',
706
- WriteGroup => 'IFD0',
707
- Count => -1,
708
- Protected => 1,
709
- },
710
- 0xc625 => { # ReductionMatrix1
711
- Writable => 'rational64s',
712
- WriteGroup => 'IFD0',
713
- Count => -1,
714
- Protected => 1,
715
- },
716
- 0xc626 => { # ReductionMatrix2
717
- Writable => 'rational64s',
718
- WriteGroup => 'IFD0',
719
- Count => -1,
720
- Protected => 1,
721
- },
722
- 0xc627 => { # AnalogBalance
723
- Writable => 'rational64u',
724
- WriteGroup => 'IFD0',
725
- Count => -1,
726
- Protected => 1,
727
- },
728
- 0xc628 => { # AsShotNeutral
729
- Writable => 'rational64u',
730
- WriteGroup => 'IFD0',
731
- Count => -1,
732
- Protected => 1,
733
- },
734
- 0xc629 => { # AsShotWhiteXY
735
- Writable => 'rational64u',
736
- WriteGroup => 'IFD0',
737
- Count => 2,
738
- Protected => 1,
739
- },
740
- 0xc62a => { # BaselineExposure
741
- Writable => 'rational64s',
742
- WriteGroup => 'IFD0',
743
- Protected => 1,
744
- },
745
- 0xc62b => { # BaselineNoise
746
- Writable => 'rational64u',
747
- WriteGroup => 'IFD0',
748
- Protected => 1,
749
- },
750
- 0xc62c => { # BaselineSharpness
751
- Writable => 'rational64u',
752
- WriteGroup => 'IFD0',
753
- Protected => 1,
754
- },
755
- 0xc62d => { # BayerGreenSplit
756
- Writable => 'int32u',
757
- WriteGroup => 'SubIFD',
758
- Protected => 1,
759
- },
760
- 0xc62e => { # LinearResponseLimit
761
- Writable => 'rational64u',
762
- WriteGroup => 'IFD0',
763
- Protected => 1,
764
- },
765
- 0xc62f => { # CameraSerialNumber
766
- Writable => 'string',
767
- WriteGroup => 'IFD0',
768
- },
769
- 0xc630 => { # DNGLensInfo
770
- Writable => 'rational64u',
771
- WriteGroup => 'IFD0',
772
- Count => 4,
773
- PrintConvInv => \&ConvertLensInfo,
774
- },
775
- 0xc631 => { # ChromaBlurRadius
776
- Writable => 'rational64u',
777
- WriteGroup => 'SubIFD',
778
- Protected => 1,
779
- },
780
- 0xc632 => { # AntiAliasStrength
781
- Writable => 'rational64u',
782
- WriteGroup => 'SubIFD',
783
- Protected => 1,
784
- },
785
- 0xc633 => { # ShadowScale
786
- Writable => 'rational64u',
787
- WriteGroup => 'IFD0',
788
- Protected => 1,
789
- },
790
- 0xc635 => { # MakerNoteSafety
791
- Writable => 'int16u',
792
- WriteGroup => 'IFD0',
793
- },
794
- 0xc65a => { # CalibrationIlluminant1
795
- Writable => 'int16u',
796
- WriteGroup => 'IFD0',
797
- Protected => 1,
798
- },
799
- 0xc65b => { # CalibrationIlluminant2
800
- Writable => 'int16u',
801
- WriteGroup => 'IFD0',
802
- Protected => 1,
803
- },
804
- 0xc65c => { # BestQualityScale
805
- Writable => 'rational64u',
806
- WriteGroup => 'SubIFD',
807
- Protected => 1,
808
- },
809
- 0xc65d => { # RawDataUniqueID
810
- Writable => 'int8u',
811
- WriteGroup => 'IFD0',
812
- Count => 16,
813
- Count => 16,
814
- ValueConvInv => 'pack("H*", $val)',
815
- Protected => 1,
816
- },
817
- 0xc68b => { # OriginalRawFileName
818
- Writable => 'string',
819
- WriteGroup => 'IFD0',
820
- Protected => 1,
821
- },
822
- 0xc68d => { # ActiveArea
823
- Writable => 'int32u',
824
- WriteGroup => 'SubIFD',
825
- Count => 4,
826
- Protected => 1,
827
- },
828
- 0xc68e => { # MaskedAreas
829
- Writable => 'int32u',
830
- WriteGroup => 'SubIFD',
831
- Count => 4,
832
- Protected => 1,
833
- },
834
- 0xc68f => { # AsShotICCProfile (writable directory)
835
- WriteGroup => 'IFD0',
836
- Protected => 1,
837
- WriteCheck => q{
838
- require Image::ExifTool::ICC_Profile;
839
- return Image::ExifTool::ICC_Profile::ValidateICC(\$val);
840
- },
841
- },
842
- 0xc690 => { # AsShotPreProfileMatrix
843
- Writable => 'rational64s',
844
- WriteGroup => 'IFD0',
845
- Count => -1,
846
- Protected => 1,
847
- },
848
- 0xc691 => { # CurrentICCProfile (writable directory)
849
- Writable => 'undef',
850
- WriteGroup => 'IFD0',
851
- Protected => 1,
852
- WriteCheck => q{
853
- require Image::ExifTool::ICC_Profile;
854
- return Image::ExifTool::ICC_Profile::ValidateICC(\$val);
855
- },
856
- },
857
- 0xc692 => { # CurrentPreProfileMatrix
858
- Writable => 'rational64s',
859
- WriteGroup => 'IFD0',
860
- Count => -1,
861
- Protected => 1,
862
- },
863
- 0xc6bf => { # ColorimetricReference
864
- Writable => 'int16u',
865
- WriteGroup => 'IFD0',
866
- Protected => 1,
867
- },
868
- 0xc6d2 => { # PanasonicTitle (Panasonic DMC-TZ5, not a DNG tag)
869
- Writable => 'undef',
870
- WriteGroup => 'IFD0',
871
- ValueConvInv => '$self->Encode($val,"UTF8")',
872
- },
873
- 0xc6d3 => { # PanasonicTitle2 (Panasonic DMC-FS7, not a DNG tag)
874
- Writable => 'undef',
875
- WriteGroup => 'IFD0',
876
- ValueConvInv => '$self->Encode($val,"UTF8")',
877
- },
878
- 0xc6f3 => { # CameraCalibrationSig
879
- Writable => 'string',
880
- WriteGroup => 'IFD0',
881
- Protected => 1,
882
- },
883
- 0xc6f4 => { # ProfileCalibrationSig
884
- Writable => 'string',
885
- WriteGroup => 'IFD0',
886
- Protected => 1,
887
- },
888
- 0xc6f6 => { # AsShotProfileName
889
- Writable => 'string',
890
- WriteGroup => 'IFD0',
891
- Protected => 1,
892
- },
893
- 0xc6f7 => { # NoiseReductionApplied
894
- Writable => 'rational64u',
895
- WriteGroup => 'SubIFD',
896
- Protected => 1,
897
- },
898
- 0xc6f8 => { # ProfileName
899
- Writable => 'string',
900
- WriteGroup => 'IFD0',
901
- Protected => 1,
902
- },
903
- 0xc6f9 => { # ProfileHueSatMapDims
904
- Writable => 'int32u',
905
- WriteGroup => 'IFD0',
906
- Count => 3,
907
- Protected => 1,
908
- },
909
- 0xc6fa => { # ProfileHueSatMapData1
910
- Writable => 'float',
911
- WriteGroup => 'IFD0',
912
- Count => -1,
913
- Protected => 1,
914
- },
915
- 0xc6fb => { # ProfileHueSatMapData2
916
- Writable => 'float',
917
- WriteGroup => 'IFD0',
918
- Count => -1,
919
- Protected => 1,
920
- },
921
- 0xc6fc => { # ProfileToneCurve
922
- Writable => 'float',
923
- WriteGroup => 'IFD0',
924
- Count => -1,
925
- Protected => 1,
926
- },
927
- 0xc6fd => { # ProfileEmbedPolicy
928
- Writable => 'int32u',
929
- WriteGroup => 'IFD0',
930
- Protected => 1,
931
- },
932
- 0xc6fe => { # ProfileCopyright
933
- Writable => 'string',
934
- WriteGroup => 'IFD0',
935
- Protected => 1,
936
- },
937
- 0xc714 => { # ForwardMatrix1
938
- Writable => 'rational64s',
939
- WriteGroup => 'IFD0',
940
- Count => -1,
941
- Protected => 1,
942
- },
943
- 0xc715 => { # ForwardMatrix2
944
- Writable => 'rational64s',
945
- WriteGroup => 'IFD0',
946
- Count => -1,
947
- Protected => 1,
948
- },
949
- 0xc716 => { # PreviewApplicationName
950
- Writable => 'string',
951
- WriteGroup => 'IFD0',
952
- Protected => 1,
953
- },
954
- 0xc717 => { # PreviewApplicationVersion
955
- Writable => 'string',
956
- WriteGroup => 'IFD0',
957
- Protected => 1,
958
- },
959
- 0xc718 => { # PreviewSettingsName
960
- Writable => 'string',
961
- WriteGroup => 'IFD0',
962
- Protected => 1,
963
- },
964
- 0xc719 => { # PreviewSettingsDigest
965
- Writable => 'int8u',
966
- WriteGroup => 'IFD0',
967
- Protected => 1,
968
- ValueConvInv => 'pack("H*", $val)',
969
- },
970
- 0xc71a => { # PreviewColorSpace
971
- Writable => 'int32u',
972
- WriteGroup => 'IFD0',
973
- Protected => 1,
974
- PrintConv => {
975
- 0 => 'Unknown',
976
- 1 => 'Gray Gamma 2.2',
977
- 2 => 'sRGB',
978
- 3 => 'Adobe RGB',
979
- 4 => 'ProPhoto RGB',
980
- },
981
- },
982
- 0xc71b => { # PreviewDateTime
983
- Writable => 'string',
984
- WriteGroup => 'IFD0',
985
- Protected => 1,
986
- ValueConvInv => q{
987
- require Image::ExifTool::XMP;
988
- return Image::ExifTool::XMP::FormatXMPDate($val);
989
- },
990
- PrintConvInv => '$self->InverseDateTime($val,1,1)',
991
- },
992
- 0xc71c => { # RawImageDigest
993
- Writable => 'int8u',
994
- WriteGroup => 'IFD0',
995
- Count => 16,
996
- Protected => 1,
997
- ValueConvInv => 'pack("H*", $val)',
998
- },
999
- 0xc71d => { # OriginalRawFileDigest
1000
- Writable => 'int8u',
1001
- WriteGroup => 'IFD0',
1002
- Count => 16,
1003
- Protected => 1,
1004
- ValueConvInv => 'pack("H*", $val)',
1005
- },
1006
- 0xc725 => { # ProfileLookTableDims
1007
- Writable => 'int32u',
1008
- WriteGroup => 'IFD0',
1009
- Count => 3,
1010
- Protected => 1,
1011
- },
1012
- 0xc726 => { # ProfileLookTableData
1013
- Writable => 'float',
1014
- WriteGroup => 'IFD0',
1015
- Count => -1,
1016
- Protected => 1,
1017
- },
1018
- 0xc761 => { # NoiseProfile
1019
- Writable => 'double',
1020
- WriteGroup => 'SubIFD',
1021
- Count => -1,
1022
- Protected => 1,
1023
- },
1024
- 0xc763 => { # TimeCodes
1025
- Writable => 'int8u',
1026
- WriteGroup => 'IFD0',
1027
- Count => -1, # (8 * number of time codes, max 10)
1028
- ValueConvInv => q{
1029
- my @a = map hex, split /[. ]+/, $val;
1030
- join ' ', @a;
1031
- },
1032
- PrintConvInv => q{
1033
- my @a = split ' ', $val;
1034
- my @v;
1035
- foreach (@a) {
1036
- my @td = reverse split /T/;
1037
- my $tz = 0x39; # default to unknown timezone
1038
- if ($td[0] =~ s/([-+])(\d+):(\d+)$//) {
1039
- if ($3 == 0) {
1040
- $tz = hex(($1 eq '-') ? $2 : 0x26 - $2);
1041
- } elsif ($3 == 30) {
1042
- if ($1 eq '-') {
1043
- $tz = $2 + 0x0a;
1044
- $tz += 0x0a if $tz > 0x0f;
1045
- } else {
1046
- $tz = 0x3f - $2;
1047
- $tz -= 0x0a if $tz < 0x3a;
1048
- }
1049
- } elsif ($3 == 45) {
1050
- $tz = 0x32 if $1 eq '+' and $2 == 12;
1051
- }
1052
- }
1053
- my @t = split /[:.]/, $td[0];
1054
- push @t, '00' while @t < 4;
1055
- my $bg;
1056
- if ($td[1]) {
1057
- # date was specified: fill in date & timezone
1058
- my @d = split /[-]/, $td[1];
1059
- next if @d < 3;
1060
- $bg = sprintf('.%.2d.%.2d.%.2d.%.2x', $d[2], $d[1], $d[0]%100, $tz);
1061
- $t[0] = sprintf('%.2x', hex($t[0]) + 0xc0); # set BGF1+BGF2
1062
- } else { # time only
1063
- $bg = '.00.00.00.00';
1064
- }
1065
- push @v, join('.', reverse(@t[0..3])) . $bg;
1066
- }
1067
- join ' ', @v;
1068
- },
1069
- },
1070
- 0xc764 => { # FrameRate
1071
- Writable => 'rational64s',
1072
- WriteGroup => 'IFD0',
1073
- PrintConvInv => '$val',
1074
- },
1075
- 0xc772 => { # TStop
1076
- Writable => 'rational64u',
1077
- WriteGroup => 'IFD0',
1078
- Count => -1, # (1 or 2)
1079
- PrintConvInv => '$val=~tr/-/ /; $val',
1080
- },
1081
- 0xc789 => { # ReelName
1082
- Writable => 'string',
1083
- WriteGroup => 'IFD0',
1084
- },
1085
- 0xc791 => { # OriginalDefaultFinalSize
1086
- Writable => 'int32u',
1087
- WriteGroup => 'IFD0',
1088
- Count => 2,
1089
- Protected => 1,
1090
- },
1091
- 0xc792 => { # OriginalBestQualitySize
1092
- Writable => 'int32u',
1093
- WriteGroup => 'IFD0',
1094
- Count => 2,
1095
- Protected => 1,
1096
- },
1097
- 0xc793 => { # OriginalDefaultCropSize
1098
- Writable => 'rational64u',
1099
- WriteGroup => 'IFD0',
1100
- Count => 2,
1101
- Protected => 1,
1102
- },
1103
- 0xc7a1 => { # CameraLabel
1104
- Writable => 'string',
1105
- WriteGroup => 'IFD0',
1106
- },
1107
- 0xc7a3 => { # ProfileHueSatMapEncoding
1108
- Writable => 'int32u',
1109
- WriteGroup => 'IFD0',
1110
- Protected => 1,
1111
- },
1112
- 0xc7a4 => { # ProfileLookTableEncoding
1113
- Writable => 'int32u',
1114
- WriteGroup => 'IFD0',
1115
- Protected => 1,
1116
- },
1117
- 0xc7a5 => { # BaselineExposureOffset
1118
- Writable => 'rational64u',
1119
- WriteGroup => 'IFD0',
1120
- Protected => 1,
1121
- },
1122
- 0xc7a6 => { # DefaultBlackRender
1123
- Writable => 'int32u',
1124
- WriteGroup => 'IFD0',
1125
- Protected => 1,
1126
- },
1127
- 0xc7a7 => { # NewRawImageDigest
1128
- Writable => 'int8u',
1129
- WriteGroup => 'IFD0',
1130
- Count => 16,
1131
- Protected => 1,
1132
- ValueConvInv => 'pack("H*", $val)',
1133
- },
1134
- 0xc7a8 => { # RawToPreviewGain
1135
- Writable => 'double',
1136
- WriteGroup => 'IFD0',
1137
- Protected => 1,
1138
- },
1139
- 0xc7b5 => { # DefaultUserCrop
1140
- Writable => 'rational64u',
1141
- WriteGroup => 'SubIFD',
1142
- Count => 4,
1143
- Protected => 1,
1144
- },
1145
- # --- end DNG tags ---
1146
- 0xea1d => { # OffsetSchema
1147
- Writable => 'int32s',
1148
- },
1149
- # tags produced by Photoshop Camera RAW
1150
- # (avoid creating these tags unless there is no other option)
1151
- 0xfde8 => {
1152
- Name => 'OwnerName',
1153
- Condition => '$$self{TIFF_TYPE} ne "DCR"', # (used for another purpose in Kodak DCR images)
1154
- Avoid => 1,
1155
- PSRaw => 1,
1156
- Writable => 'string',
1157
- ValueConv => '$val=~s/^.*: //;$val',
1158
- ValueConvInv => q{"Owner's Name: $val"},
1159
- Notes => q{
1160
- tags 0xfde8-0xfdea and 0xfe4c-0xfe58 are generated by Photoshop Camera RAW.
1161
- Some names are the same as other EXIF tags, but ExifTool will avoid writing
1162
- these unless they already exist in the file
1163
- },
1164
- },
1165
- 0xfde9 => {
1166
- Name => 'SerialNumber',
1167
- Condition => '$$self{TIFF_TYPE} ne "DCR"', # (used for another purpose in Kodak DCR SubIFD)
1168
- Avoid => 1,
1169
- PSRaw => 1,
1170
- Writable => 'string',
1171
- ValueConv => '$val=~s/^.*: //;$val',
1172
- ValueConvInv => q{"Serial Number: $val"},
1173
- },
1174
- 0xfdea => {
1175
- Name => 'Lens',
1176
- Condition => '$$self{TIFF_TYPE} ne "DCR"', # (used for another purpose in Kodak DCR SubIFD)
1177
- Avoid => 1,
1178
- PSRaw => 1,
1179
- Writable => 'string',
1180
- ValueConv => '$val=~s/^.*: //;$val',
1181
- ValueConvInv => q{"Lens: $val"},
1182
- },
1183
- 0xfe4c => {
1184
- Name => 'RawFile',
1185
- Avoid => 1,
1186
- PSRaw => 1,
1187
- Writable => 'string',
1188
- ValueConv => '$val=~s/^.*: //;$val',
1189
- ValueConvInv => q{"Raw File: $val"},
1190
- },
1191
- 0xfe4d => {
1192
- Name => 'Converter',
1193
- Avoid => 1,
1194
- PSRaw => 1,
1195
- Writable => 'string',
1196
- ValueConv => '$val=~s/^.*: //;$val',
1197
- ValueConvInv => q{"Converter: $val"},
1198
- },
1199
- 0xfe4e => {
1200
- Name => 'WhiteBalance',
1201
- Avoid => 1,
1202
- PSRaw => 1,
1203
- Writable => 'string',
1204
- ValueConv => '$val=~s/^.*: //;$val',
1205
- ValueConvInv => q{"White Balance: $val"},
1206
- },
1207
- 0xfe51 => {
1208
- Name => 'Exposure',
1209
- Avoid => 1,
1210
- PSRaw => 1,
1211
- Writable => 'string',
1212
- ValueConv => '$val=~s/^.*: //;$val',
1213
- ValueConvInv => q{"Exposure: $val"},
1214
- },
1215
- 0xfe52 => {
1216
- Name => 'Shadows',
1217
- Avoid => 1,
1218
- PSRaw => 1,
1219
- Writable => 'string',
1220
- ValueConv => '$val=~s/^.*: //;$val',
1221
- ValueConvInv => q{"Shadows: $val"},
1222
- },
1223
- 0xfe53 => {
1224
- Name => 'Brightness',
1225
- Avoid => 1,
1226
- PSRaw => 1,
1227
- Writable => 'string',
1228
- ValueConv => '$val=~s/^.*: //;$val',
1229
- ValueConvInv => q{"Brightness: $val"},
1230
- },
1231
- 0xfe54 => {
1232
- Name => 'Contrast',
1233
- Avoid => 1,
1234
- PSRaw => 1,
1235
- Writable => 'string',
1236
- ValueConv => '$val=~s/^.*: //;$val',
1237
- ValueConvInv => q{"Contrast: $val"},
1238
- },
1239
- 0xfe55 => {
1240
- Name => 'Saturation',
1241
- Avoid => 1,
1242
- PSRaw => 1,
1243
- Writable => 'string',
1244
- ValueConv => '$val=~s/^.*: //;$val',
1245
- ValueConvInv => q{"Saturation: $val"},
1246
- },
1247
- 0xfe56 => {
1248
- Name => 'Sharpness',
1249
- Avoid => 1,
1250
- PSRaw => 1,
1251
- Writable => 'string',
1252
- ValueConv => '$val=~s/^.*: //;$val',
1253
- ValueConvInv => q{"Sharpness: $val"},
1254
- },
1255
- 0xfe57 => {
1256
- Name => 'Smoothness',
1257
- Avoid => 1,
1258
- PSRaw => 1,
1259
- Writable => 'string',
1260
- ValueConv => '$val=~s/^.*: //;$val',
1261
- ValueConvInv => q{"Smoothness: $val"},
1262
- },
1263
- 0xfe58 => {
1264
- Name => 'MoireFilter',
1265
- Avoid => 1,
1266
- PSRaw => 1,
1267
- Writable => 'string',
1268
- ValueConv => '$val=~s/^.*: //;$val',
1269
- ValueConvInv => q{"Moire Filter: $val"},
1270
- },
1271
- );
1272
-
1273
- # insert our writable properties into main EXIF tag table
1274
- InsertWritableProperties(\%Image::ExifTool::Exif::Main, \%writeTable, \&CheckExif);
1275
-
1276
- #------------------------------------------------------------------------------
1277
- # Inverse print conversion for LensInfo
1278
- # Inputs: 0) lens info string
1279
- # Returns: PrintConvInv of string
1280
- sub ConvertLensInfo($)
1281
- {
1282
- my $val = shift;
1283
- my @a = GetLensInfo($val, 1); # (allow unknown "?" values)
1284
- return @a ? join(' ', @a) : $val;
1285
- }
1286
-
1287
- #------------------------------------------------------------------------------
1288
- # Get binary CFA Pattern from a text string
1289
- # Inputs: Print-converted CFA pattern (ie. '[Blue,Green][Green,Red]')
1290
- # Returns: CFA pattern as a string of numbers
1291
- sub GetCFAPattern($)
1292
- {
1293
- my $val = shift;
1294
- my @rows = split /\]\s*\[/, $val;
1295
- @rows or warn("Rows not properly bracketed by '[]'\n"), return undef;
1296
- my @cols = split /,/, $rows[0];
1297
- @cols or warn("Colors not separated by ','\n"), return undef;
1298
- my $ny = @cols;
1299
- my @a = (scalar(@rows), scalar(@cols));
1300
- my %cfaLookup = (red=>0, green=>1, blue=>2, cyan=>3, magenta=>4, yellow=>5, white=>6);
1301
- my $row;
1302
- foreach $row (@rows) {
1303
- @cols = split /,/, $row;
1304
- @cols == $ny or warn("Inconsistent number of colors in each row\n"), return undef;
1305
- foreach (@cols) {
1306
- tr/ \]\[//d; # remove remaining brackets and any spaces
1307
- my $c = $cfaLookup{lc($_)};
1308
- defined $c or warn("Unknown color '$_'\n"), return undef;
1309
- push @a, $c;
1310
- }
1311
- }
1312
- return "@a";
1313
- }
1314
-
1315
- #------------------------------------------------------------------------------
1316
- # validate raw values for writing
1317
- # Inputs: 0) ExifTool ref, 1) tagInfo hash ref, 2) raw value ref
1318
- # Returns: error string or undef (and possibly changes value) on success
1319
- sub CheckExif($$$)
1320
- {
1321
- my ($et, $tagInfo, $valPtr) = @_;
1322
- my $format = $$tagInfo{Format} || $$tagInfo{Writable} || $$tagInfo{Table}{WRITABLE};
1323
- if (not $format or $format eq '1') {
1324
- if ($$tagInfo{Groups}{0} eq 'MakerNotes') {
1325
- return undef; # OK to have no format for makernotes
1326
- } else {
1327
- return 'No writable format';
1328
- }
1329
- }
1330
- return Image::ExifTool::CheckValue($valPtr, $format, $$tagInfo{Count});
1331
- }
1332
-
1333
- #------------------------------------------------------------------------------
1334
- # encode exif ASCII/Unicode text from UTF8 or Latin
1335
- # Inputs: 0) ExifTool ref, 1) text string
1336
- # Returns: encoded string
1337
- # Note: MUST be called Raw conversion time so the EXIF byte order is known!
1338
- sub EncodeExifText($$)
1339
- {
1340
- my ($et, $val) = @_;
1341
- # does the string contain special characters?
1342
- if ($val =~ /[\x80-\xff]/) {
1343
- my $order = $et->GetNewValues('ExifUnicodeByteOrder');
1344
- return "UNICODE\0" . $et->Encode($val,'UTF16',$order);
1345
- } else {
1346
- return "ASCII\0\0\0$val";
1347
- }
1348
- }
1349
-
1350
- #------------------------------------------------------------------------------
1351
- # insert writable properties into main tag table
1352
- # Inputs: 0) tag table ref, 1) reference to writable properties
1353
- # 2) [optional] CHECK_PROC reference
1354
- sub InsertWritableProperties($$;$)
1355
- {
1356
- my ($tagTablePtr, $writeTablePtr, $checkProc) = @_;
1357
- my $tag;
1358
- $checkProc and $$tagTablePtr{CHECK_PROC} = $checkProc;
1359
- foreach $tag (keys %$writeTablePtr) {
1360
- my $writeInfo = $$writeTablePtr{$tag};
1361
- my @infoList = GetTagInfoList($tagTablePtr, $tag);
1362
- if (@infoList) {
1363
- my $tagInfo;
1364
- foreach $tagInfo (@infoList) {
1365
- if (ref $writeInfo) {
1366
- my $key;
1367
- foreach $key (keys %$writeInfo) {
1368
- $$tagInfo{$key} = $$writeInfo{$key} unless defined $$tagInfo{$key};
1369
- }
1370
- } else {
1371
- $$tagInfo{Writable} = $writeInfo unless defined $$tagInfo{Writable};
1372
- }
1373
- }
1374
- } else {
1375
- AddTagToTable($tagTablePtr, $tag, $writeInfo);
1376
- }
1377
- }
1378
- }
1379
-
1380
- #------------------------------------------------------------------------------
1381
- # rebuild maker notes to properly contain all value data
1382
- # (some manufacturers put value data outside maker notes!!)
1383
- # Inputs: 0) ExifTool object ref, 1) tag table ref, 2) dirInfo ref
1384
- # Returns: new maker note data (and creates MAKER_NOTE_FIXUP), or undef on error
1385
- sub RebuildMakerNotes($$$)
1386
- {
1387
- my ($et, $tagTablePtr, $dirInfo) = @_;
1388
- my $dirStart = $$dirInfo{DirStart};
1389
- my $dirLen = $$dirInfo{DirLen};
1390
- my $dataPt = $$dirInfo{DataPt};
1391
- my $dataPos = $$dirInfo{DataPos} || 0;
1392
- my $rtnValue;
1393
- my %subdirInfo = %$dirInfo;
1394
-
1395
- delete $$et{MAKER_NOTE_FIXUP};
1396
-
1397
- # don't need to rebuild text, BinaryData or PreviewImage maker notes
1398
- my $tagInfo = $$dirInfo{TagInfo};
1399
- my $subdir = $$tagInfo{SubDirectory};
1400
- my $proc = $$subdir{ProcessProc} || $$tagTablePtr{PROCESS_PROC} || \&ProcessExif;
1401
- if (($proc ne \&ProcessExif and $$tagInfo{Name} =~ /Text/) or
1402
- $proc eq \&Image::ExifTool::ProcessBinaryData or
1403
- ($$tagInfo{PossiblePreview} and $dirLen > 6 and
1404
- substr($$dataPt, $dirStart, 3) eq "\xff\xd8\xff"))
1405
- {
1406
- return substr($$dataPt, $dirStart, $dirLen);
1407
- }
1408
- my $saveOrder = GetByteOrder();
1409
- my $loc = Image::ExifTool::MakerNotes::LocateIFD($et,\%subdirInfo);
1410
- if (defined $loc) {
1411
- my $makerFixup = $subdirInfo{Fixup} = new Image::ExifTool::Fixup;
1412
- # create new exiftool object to rewrite the directory without changing it
1413
- my $newTool = new Image::ExifTool;
1414
- $newTool->Options(
1415
- IgnoreMinorErrors => $$et{OPTIONS}{IgnoreMinorErrors},
1416
- FixBase => $$et{OPTIONS}{FixBase},
1417
- );
1418
- $newTool->Init(); # must do this before calling WriteDirectory()!
1419
- # don't copy over preview image
1420
- $newTool->SetNewValue(PreviewImage => '');
1421
- # copy all transient members over in case they are used for writing
1422
- # (Make, Model, etc)
1423
- foreach (grep /[a-z]/, keys %$et) {
1424
- $$newTool{$_} = $$et{$_};
1425
- }
1426
- # fix base offsets if specified
1427
- $newTool->Options(FixBase => $et->Options('FixBase'));
1428
- # set GENERATE_PREVIEW_INFO flag so PREVIEW_INFO will be generated
1429
- $$newTool{GENERATE_PREVIEW_INFO} = 1;
1430
- # drop any large tags
1431
- $$newTool{DROP_TAGS} = 1;
1432
- # initialize other necessary data members
1433
- $$newTool{FILE_TYPE} = $$et{FILE_TYPE};
1434
- $$newTool{TIFF_TYPE} = $$et{TIFF_TYPE};
1435
- # rewrite maker notes
1436
- $rtnValue = $newTool->WriteDirectory(\%subdirInfo, $tagTablePtr);
1437
- if (defined $rtnValue and length $rtnValue) {
1438
- # add the dummy/empty preview image if necessary
1439
- if ($$newTool{PREVIEW_INFO}) {
1440
- $makerFixup->SetMarkerPointers(\$rtnValue, 'PreviewImage', length($rtnValue));
1441
- $rtnValue .= $$newTool{PREVIEW_INFO}{Data};
1442
- delete $$newTool{PREVIEW_INFO};
1443
- }
1444
- # add makernote header
1445
- if ($loc) {
1446
- my $hdr = substr($$dataPt, $dirStart, $loc);
1447
- # special case: convert Pentax/Samsung DNG maker notes to JPEG style
1448
- # (in JPEG, Pentax makernotes are absolute and start with "AOC\0" for some
1449
- # models, but in DNG images they are stored in tag 0xc634 of IFD0 and
1450
- # start with either "PENTAX \0" or "SAMSUNG\0")
1451
- if ($$dirInfo{Parent} eq 'IFD0' and $hdr =~ /^(PENTAX |SAMSUNG)\0/) {
1452
- # convert to JPEG-style AOC maker notes if used by this model
1453
- # (Note: this expression also appears in Exif.pm)
1454
- if ($$et{Model} =~ /\b(K(-[57mrx]|(10|20|100|110|200)D|2000)|GX(10|20))\b/) {
1455
- $hdr =~ s/^(PENTAX |SAMSUNG)\0/AOC\0/;
1456
- }
1457
- # save fixup so we will adjust to absolute offsets when writing
1458
- $$et{MAKER_NOTE_FIXUP} = $makerFixup;
1459
- }
1460
- $rtnValue = $hdr . $rtnValue;
1461
- # adjust fixup for shift in start position
1462
- $$makerFixup{Start} += length $hdr;
1463
- }
1464
- # shift offsets according to original position of maker notes,
1465
- # and relative to the makernotes Base
1466
- $$makerFixup{Shift} += $dataPos + $dirStart +
1467
- $$dirInfo{Base} - $subdirInfo{Base};
1468
- # repair incorrect offsets if offsets were fixed
1469
- $$makerFixup{Shift} += $subdirInfo{FixedBy} || 0;
1470
- # fix up pointers to the specified offset
1471
- $makerFixup->ApplyFixup(\$rtnValue);
1472
- # save fixup information unless offsets were relative
1473
- unless ($subdirInfo{Relative}) {
1474
- # set shift so offsets are all relative to start of maker notes
1475
- $$makerFixup{Shift} -= $dataPos + $dirStart;
1476
- $$et{MAKER_NOTE_FIXUP} = $makerFixup; # save fixup for later
1477
- }
1478
- }
1479
- }
1480
- SetByteOrder($saveOrder);
1481
-
1482
- return $rtnValue;
1483
- }
1484
-
1485
- #------------------------------------------------------------------------------
1486
- # Sort IFD directory entries
1487
- # Inputs: 0) data reference, 1) directory start, 2) number of entries
1488
- sub SortIFD($$$)
1489
- {
1490
- my ($dataPt, $dirStart, $numEntries) = @_;
1491
- my ($index, %entries);
1492
- # split the directory into separate entries
1493
- my $newDir = '';
1494
- for ($index=0; $index<$numEntries; ++$index) {
1495
- my $entry = $dirStart + 2 + 12 * $index;
1496
- my $tagID = Get16u($dataPt, $entry);
1497
- my $entryData = substr($$dataPt, $entry, 12);
1498
- # silly software can pad directories with zero entries -- put these at the end
1499
- $tagID = 0x10000 unless $tagID or $index == 0;
1500
- # add new entry (allow for duplicate tag ID's, which shouldn't normally happen)
1501
- if ($entries{$tagID}) {
1502
- $entries{$tagID} .= $entryData;
1503
- } else {
1504
- $entries{$tagID} = $entryData;
1505
- }
1506
- }
1507
- # sort the directory entries
1508
- my @sortedTags = sort { $a <=> $b } keys %entries;
1509
- foreach (@sortedTags) {
1510
- $newDir .= $entries{$_};
1511
- }
1512
- # replace original directory with new, sorted one
1513
- substr($$dataPt, $dirStart + 2, 12 * $numEntries) = $newDir;
1514
- }
1515
-
1516
- #------------------------------------------------------------------------------
1517
- # Validate IFD entries (strict validation to test possible chained IFD's)
1518
- # Inputs: 0) dirInfo ref (must have RAF set), 1) optional DirStart
1519
- # Returns: true if IFD looks OK
1520
- sub ValidateIFD($;$)
1521
- {
1522
- my ($dirInfo, $dirStart) = @_;
1523
- my $raf = $$dirInfo{RAF} or return 0;
1524
- my $base = $$dirInfo{Base};
1525
- $dirStart = $$dirInfo{DirStart} || 0 unless defined $dirStart;
1526
- my $offset = $dirStart + ($$dirInfo{DataPos} || 0);
1527
- my ($buff, $index);
1528
- $raf->Seek($offset + $base, 0) and $raf->Read($buff,2) == 2 or return 0;
1529
- my $numEntries = Get16u(\$buff,0);
1530
- $numEntries > 1 and $numEntries < 64 or return 0;
1531
- my $len = 12 * $numEntries;
1532
- $raf->Read($buff, $len) == $len or return 0;
1533
- my $lastID = -1;
1534
- for ($index=0; $index<$numEntries; ++$index) {
1535
- my $entry = 12 * $index;
1536
- my $tagID = Get16u(\$buff, $entry);
1537
- $tagID > $lastID or $$dirInfo{AllowOutOfOrderTags} or return 0;
1538
- my $format = Get16u(\$buff, $entry+2);
1539
- $format > 0 and $format <= 13 or return 0;
1540
- my $count = Get32u(\$buff, $entry+4);
1541
- $count > 0 or return 0;
1542
- $lastID = $tagID;
1543
- }
1544
- return 1;
1545
- }
1546
-
1547
- #------------------------------------------------------------------------------
1548
- # Get sorted list of offsets used in IFD
1549
- # Inputs: 0) data ref, 1) directory start, 2) dataPos, 3) IFD entries, 4) tag table ref
1550
- # Returns: 0) sorted list of offsets (only offsets after the end of the IFD)
1551
- # 1) hash of list indices keyed by offset value
1552
- # Notes: This is used in a patch to fix the count for tags in Kodak SubIFD3
1553
- sub GetOffList($$$$$)
1554
- {
1555
- my ($dataPt, $dirStart, $dataPos, $numEntries, $tagTablePtr) = @_;
1556
- my $ifdEnd = $dirStart + 2 + 12 * $numEntries + $dataPos;
1557
- my ($index, $offset, %offHash);
1558
- for ($index=0; $index<$numEntries; ++$index) {
1559
- my $entry = $dirStart + 2 + 12 * $index;
1560
- my $format = Get16u($dataPt, $entry + 2);
1561
- next if $format < 1 or $format > 13;
1562
- my $count = Get16u($dataPt, $entry + 4);
1563
- my $size = $formatSize[$format] * $count;
1564
- if ($size <= 4) {
1565
- my $tagID = Get16u($dataPt, $entry);
1566
- next unless ref $$tagTablePtr{$tagID} eq 'HASH' and $$tagTablePtr{$tagID}{FixCount};
1567
- }
1568
- my $offset = Get16u($dataPt, $entry + 8);
1569
- $offHash{$offset} = 1 if $offset >= $ifdEnd;
1570
- }
1571
- # set offset hash values to indices in list
1572
- my @offList = sort keys %offHash;
1573
- $index = 0;
1574
- foreach $offset (@offList) {
1575
- $offHash{$offset} = $index++;
1576
- }
1577
- return(\@offList, \%offHash);
1578
- }
1579
-
1580
- #------------------------------------------------------------------------------
1581
- # Update TIFF_END member if defined
1582
- # Inputs: 0) ExifTool ref, 1) end of valid TIFF data
1583
- sub UpdateTiffEnd($$)
1584
- {
1585
- my ($et, $end) = @_;
1586
- if (defined $$et{TIFF_END} and
1587
- $$et{TIFF_END} < $end)
1588
- {
1589
- $$et{TIFF_END} = $end;
1590
- }
1591
- }
1592
-
1593
- #------------------------------------------------------------------------------
1594
- # Handle error while writing EXIF
1595
- # Inputs: 0) ExifTool ref, 1) error string, 2) tag table ref
1596
- # Returns: undef on fatal error, or '' if minor error is ignored
1597
- sub ExifErr($$$)
1598
- {
1599
- my ($et, $errStr, $tagTablePtr) = @_;
1600
- # MakerNote errors are minor by default
1601
- my $minor = ($$tagTablePtr{GROUPS}{0} eq 'MakerNotes');
1602
- if ($$tagTablePtr{VARS} and $$tagTablePtr{VARS}{MINOR_ERRORS}) {
1603
- $et->Warn("$errStr. IFD dropped.") and return '' if $minor;
1604
- $minor = 1;
1605
- }
1606
- return undef if $et->Error($errStr, $minor);
1607
- return '';
1608
- }
1609
-
1610
- #------------------------------------------------------------------------------
1611
- # Read/Write IFD with TIFF-like header (used by DNG 1.2)
1612
- # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
1613
- # Returns: Reading: 1 on success, otherwise returns 0 and sets a Warning
1614
- # Writing: new data block or undef on error
1615
- sub ProcessTiffIFD($$$)
1616
- {
1617
- my ($et, $dirInfo, $tagTablePtr) = @_;
1618
- $et or return 1; # allow dummy access
1619
- my $raf = $$dirInfo{RAF};
1620
- my $base = $$dirInfo{Base} || 0;
1621
- my $dirName = $$dirInfo{DirName};
1622
- my $magic = $$dirInfo{Subdir}{Magic} || 0x002a;
1623
- my $buff;
1624
-
1625
- # structured with a TIFF-like header and relative offsets
1626
- $raf->Seek($base, 0) and $raf->Read($buff, 8) == 8 or return 0;
1627
- unless (SetByteOrder(substr($buff,0,2)) and Get16u(\$buff, 2) == $magic) {
1628
- my $msg = "Invalid $dirName header";
1629
- if ($$dirInfo{IsWriting}) {
1630
- $et->Error($msg);
1631
- return undef;
1632
- } else {
1633
- $et->Warn($msg);
1634
- return 0;
1635
- }
1636
- }
1637
- my $offset = Get32u(\$buff, 4);
1638
- my %dirInfo = (
1639
- DirName => $$dirInfo{DirName},
1640
- Parent => $$dirInfo{Parent},
1641
- Base => $base,
1642
- DataPt => \$buff,
1643
- DataLen => length $buff,
1644
- DataPos => 0,
1645
- DirStart => $offset,
1646
- DirLen => length($buff) - $offset,
1647
- RAF => $raf,
1648
- NewDataPos => 8,
1649
- );
1650
- if ($$dirInfo{IsWriting}) {
1651
- # rewrite the Camera Profile IFD
1652
- my $newDir = WriteExif($et, \%dirInfo, $tagTablePtr);
1653
- # don't add header if error writing directory ($newDir is undef)
1654
- # or if directory is being deleted ($newDir is empty)
1655
- return $newDir unless $newDir;
1656
- # return directory with TIFF-like header
1657
- return GetByteOrder() . Set16u($magic) . Set32u(8) . $newDir;
1658
- }
1659
- if ($$et{HTML_DUMP}) {
1660
- my $tip = sprintf("Byte order: %s endian\nIdentifier: 0x%.4x\n%s offset: 0x%.4x",
1661
- (GetByteOrder() eq 'II') ? 'Little' : 'Big', $magic, $dirName, $offset);
1662
- $et->HDump($base, 8, "$dirName header", $tip, 0);
1663
- }
1664
- return ProcessExif($et, \%dirInfo, $tagTablePtr);
1665
- }
1666
-
1667
- #------------------------------------------------------------------------------
1668
- # Write EXIF directory
1669
- # Inputs: 0) ExifTool object ref, 1) source dirInfo ref, 2) tag table ref
1670
- # Returns: Exif data block (may be empty if no Exif data) or undef on error
1671
- # Notes: Increments ExifTool CHANGED flag for each tag changed. Also updates
1672
- # TIFF_END if defined with location of end of original TIFF image.
1673
- # Returns IFD data in the following order:
1674
- # 1. IFD0 directory followed by its data
1675
- # 2. SubIFD directory followed by its data, thumbnail and image
1676
- # 3. GlobalParameters, EXIF, GPS, Interop IFD's each with their data
1677
- # 4. IFD1,IFD2,... directories each followed by their data
1678
- # 5. Thumbnail and/or image data for each IFD, with IFD0 image last
1679
- sub WriteExif($$$)
1680
- {
1681
- my ($et, $dirInfo, $tagTablePtr) = @_;
1682
- $et or return 1; # allow dummy access to autoload this package
1683
- my $origDirInfo = $dirInfo; # save original dirInfo
1684
- my $dataPt = $$dirInfo{DataPt};
1685
- unless ($dataPt) {
1686
- my $emptyData = '';
1687
- $dataPt = \$emptyData;
1688
- }
1689
- my $dataPos = $$dirInfo{DataPos} || 0;
1690
- my $dirStart = $$dirInfo{DirStart} || 0;
1691
- my $dataLen = $$dirInfo{DataLen} || length($$dataPt);
1692
- my $dirLen = $$dirInfo{DirLen} || ($dataLen - $dirStart);
1693
- my $base = $$dirInfo{Base} || 0;
1694
- my $firstBase = $base;
1695
- my $raf = $$dirInfo{RAF};
1696
- my $dirName = $$dirInfo{DirName} || 'unknown';
1697
- my $fixup = $$dirInfo{Fixup} || new Image::ExifTool::Fixup;
1698
- my $imageDataFlag = $$dirInfo{ImageData} || '';
1699
- my $verbose = $et->Options('Verbose');
1700
- my $out = $et->Options('TextOut');
1701
- my ($nextIfdPos, %offsetData, $inMakerNotes);
1702
- my (@offsetInfo, %xDelete, $strEnc);
1703
- my $deleteAll = 0;
1704
- my $newData = ''; # initialize buffer to receive new directory data
1705
- my @imageData; # image data blocks to copy later if requested
1706
- my $name = $$dirInfo{Name};
1707
- $name = $dirName unless $name and $dirName eq 'MakerNotes' and $name !~ /^MakerNote/;
1708
-
1709
- # set encoding for strings
1710
- $strEnc = $et->Options('CharsetEXIF') if $$tagTablePtr{GROUPS}{0} eq 'EXIF';
1711
-
1712
- # allow multiple IFD's in IFD0-IFD1-IFD2... chain
1713
- $$dirInfo{Multi} = 1 if $dirName =~ /^(IFD0|SubIFD)$/ and not defined $$dirInfo{Multi};
1714
- $inMakerNotes = 1 if $$tagTablePtr{GROUPS}{0} eq 'MakerNotes';
1715
- my $ifd;
1716
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1717
- # loop through each IFD
1718
- #
1719
- for ($ifd=0; ; ++$ifd) { # loop through multiple IFD's
1720
-
1721
- # save pointer to start of this IFD within the newData
1722
- my $newStart = length($newData);
1723
- my @subdirs; # list of subdirectory data and tag table pointers
1724
- # determine if directory is contained within our data
1725
- my $mustRead;
1726
- if ($dirStart < 0 or $dirStart > $dataLen-2) {
1727
- $mustRead = 1;
1728
- } elsif ($dirLen > 2) {
1729
- my $len = 2 + 12 * Get16u($dataPt, $dirStart);
1730
- $mustRead = 1 if $dirStart + $len > $dataLen;
1731
- }
1732
- # read IFD from file if necessary
1733
- if ($mustRead) {
1734
- if ($raf) {
1735
- # read the count of entries in this IFD
1736
- my $offset = $dirStart + $dataPos;
1737
- my ($buff, $buf2);
1738
- unless ($raf->Seek($offset + $base, 0) and $raf->Read($buff,2) == 2) {
1739
- return ExifErr($et, "Bad IFD or truncated file in $name", $tagTablePtr);
1740
- }
1741
- my $len = 12 * Get16u(\$buff,0);
1742
- # (also read next IFD pointer if available)
1743
- unless ($raf->Read($buf2, $len+4) >= $len) {
1744
- return ExifErr($et, "Error reading $name", $tagTablePtr);
1745
- }
1746
- $buff .= $buf2;
1747
- # make copy of dirInfo since we're going to modify it
1748
- my %newDirInfo = %$dirInfo;
1749
- $dirInfo = \%newDirInfo;
1750
- # update directory parameters for the newly loaded IFD
1751
- $dataPt = $$dirInfo{DataPt} = \$buff;
1752
- $dirStart = $$dirInfo{DirStart} = 0;
1753
- $dataPos = $$dirInfo{DataPos} = $offset;
1754
- $dataLen = $$dirInfo{DataLen} = length $buff;
1755
- $dirLen = $$dirInfo{DirLen} = $dataLen;
1756
- # only account for nextIFD pointer if we are going to use it
1757
- $len += 4 if $dataLen==$len+6 and ($$dirInfo{Multi} or $buff =~ /\0{4}$/);
1758
- UpdateTiffEnd($et, $offset+$base+2+$len);
1759
- } elsif ($dirLen) {
1760
- # error if we can't load IFD (unless we are creating
1761
- # from scratch, in which case dirLen will be zero)
1762
- my $str = $et->Options('IgnoreMinorErrors') ? 'Deleted bad' : 'Bad';
1763
- $et->Error("$str $name directory", 1);
1764
- }
1765
- }
1766
- my ($index, $dirEnd, $numEntries);
1767
- if ($dirStart + 4 < $dataLen) {
1768
- $numEntries = Get16u($dataPt, $dirStart);
1769
- $dirEnd = $dirStart + 2 + 12 * $numEntries;
1770
- if ($dirEnd > $dataLen) {
1771
- return ExifErr($et, "Truncated $name directory", $tagTablePtr);
1772
- }
1773
- # sort entries if necessary (but not in maker notes IFDs)
1774
- unless ($inMakerNotes) {
1775
- my $lastID = -1;
1776
- for ($index=0; $index<$numEntries; ++$index) {
1777
- my $tagID = Get16u($dataPt, $dirStart + 2 + 12 * $index);
1778
- # check for proper sequence (but ignore null entries at end)
1779
- if ($tagID < $lastID and $tagID) {
1780
- SortIFD($dataPt, $dirStart, $numEntries);
1781
- $et->Warn("Entries in $name were out of sequence. Fixed.",1);
1782
- last;
1783
- }
1784
- $lastID = $tagID;
1785
- }
1786
- }
1787
- } else {
1788
- $numEntries = 0;
1789
- $dirEnd = $dirStart;
1790
- }
1791
-
1792
- # loop through new values and accumulate all information for this IFD
1793
- my (%set, %mayDelete, $tagInfo);
1794
- my $wrongDir = $crossDelete{$dirName};
1795
- foreach $tagInfo ($et->GetNewTagInfoList($tagTablePtr)) {
1796
- my $tagID = $$tagInfo{TagID};
1797
- # evaluate conditional lists now if necessary
1798
- if (ref $$tagTablePtr{$tagID} eq 'ARRAY' or $$tagInfo{Condition}) {
1799
- my $curInfo = $et->GetTagInfo($tagTablePtr, $tagID);
1800
- if (defined $curInfo and not $curInfo) {
1801
- # need value to evaluate the condition
1802
- my ($val) = $et->GetNewValues($tagInfo);
1803
- # must convert to binary for evaluating in Condition
1804
- if ($$tagInfo{Format} and defined $val) {
1805
- $val = WriteValue($val, $$tagInfo{Format}, $$tagInfo{Count});
1806
- }
1807
- if (defined $val) {
1808
- my $fmt = $$tagInfo{Writable} || $$tagInfo{Format} || 'undef';
1809
- my $cnt = $$tagInfo{Count} || 1;
1810
- # always use old format/count for Condition in maker notes
1811
- if ($inMakerNotes) {
1812
- for ($index=0; $index<$numEntries; ++$index) {
1813
- my $entry = $dirStart + 2 + 12 * $index;
1814
- my $id = Get16u($dataPt, $entry);
1815
- if ($id eq $tagID) {
1816
- my $f = Get16u($dataPt, $entry + 2);
1817
- if ($formatName[$f]) {
1818
- $fmt = $formatName[$f];
1819
- $cnt = Get32u($dataPt, $entry + 4);
1820
- }
1821
- last;
1822
- }
1823
- }
1824
- }
1825
- $curInfo = $et->GetTagInfo($tagTablePtr, $tagID, \$val, $fmt, $cnt);
1826
- } else {
1827
- # may want to delete this, but we need to see the value first
1828
- $mayDelete{$tagID} = 1;
1829
- }
1830
- }
1831
- # don't set this tag unless valid for the current condition
1832
- next unless defined $curInfo and $curInfo eq $tagInfo;
1833
- }
1834
- if ($$tagInfo{WriteCondition}) {
1835
- my $self = $et; # set $self to be used in eval
1836
- #### eval WriteCondition ($self)
1837
- unless (eval $$tagInfo{WriteCondition}) {
1838
- $@ and warn $@;
1839
- next;
1840
- }
1841
- }
1842
- my $nvHash = $et->GetNewValueHash($tagInfo, $dirName);
1843
- unless ($nvHash) {
1844
- next unless $wrongDir;
1845
- # delete stuff from the wrong directory if setting somewhere else
1846
- $nvHash = $et->GetNewValueHash($tagInfo, $wrongDir);
1847
- # don't cross delete if not overwriting
1848
- next unless $et->IsOverwriting($nvHash);
1849
- # don't cross delete if specifically deleting from the other directory
1850
- # (Note: don't call GetValue() here because it shouldn't be called
1851
- # if IsOverwriting returns < 0 -- ie. when shifting)
1852
- next if not defined $$nvHash{Value} and $$nvHash{WantGroup} and
1853
- lc($$nvHash{WantGroup}) eq lc($wrongDir);
1854
- # remove this tag if found in this IFD
1855
- $xDelete{$tagID} = 1;
1856
- }
1857
- if ($set{$tagID}) {
1858
- # this tag is being set twice, which can happen if two Condition's
1859
- # were true for this tag. Hopefully the only case where this can
1860
- # happen is the MakerNotes tag since it may store two very different
1861
- # types of information (MakerNotes and PreviewImage), but we want
1862
- # to store the MakerNotes if both are available
1863
- if ($tagID == 0x927c and $dirName =~ /^(ExifIFD|IFD0)$/) {
1864
- next if $$tagInfo{Name} eq 'PreviewImage';
1865
- } else {
1866
- $et->Warn(sprintf("Multiple new values for $name tag 0x%.4x",$tagID));
1867
- }
1868
- }
1869
- $set{$tagID} = $tagInfo;
1870
- }
1871
-
1872
- # fix base offsets (some cameras incorrectly write maker notes in IFD0)
1873
- if ($dirName eq 'MakerNotes' and $$dirInfo{Parent} =~ /^(ExifIFD|IFD0)$/ and
1874
- $$et{TIFF_TYPE} !~ /^(ARW|SR2)$/ and not $$et{LeicaTrailerPos} and
1875
- Image::ExifTool::MakerNotes::FixBase($et, $dirInfo))
1876
- {
1877
- # update local variables from fixed values
1878
- $base = $$dirInfo{Base};
1879
- $dataPos = $$dirInfo{DataPos};
1880
- }
1881
-
1882
- # initialize variables to handle mandatory tags
1883
- my $mandatory = $mandatory{$dirName};
1884
- my ($allMandatory, $addMandatory);
1885
- if ($mandatory) {
1886
- # use X/Y resolution values from JFIF if available
1887
- if ($dirName eq 'IFD0' and defined $$et{JFIFYResolution}) {
1888
- my %ifd0Vals = %$mandatory;
1889
- $ifd0Vals{0x011a} = $$et{JFIFXResolution};
1890
- $ifd0Vals{0x011b} = $$et{JFIFYResolution};
1891
- $ifd0Vals{0x0128} = $$et{JFIFResolutionUnit} + 1;
1892
- $mandatory = \%ifd0Vals;
1893
- }
1894
- $allMandatory = $addMandatory = 0; # initialize to zero
1895
- # add mandatory tags if creating a new directory
1896
- unless ($numEntries) {
1897
- foreach (keys %$mandatory) {
1898
- $set{$_} or $set{$_} = $$tagTablePtr{$_};
1899
- }
1900
- }
1901
- } else {
1902
- undef $deleteAll; # don't remove directory (no mandatory entries)
1903
- }
1904
- my ($addDirs, @newTags);
1905
- if ($inMakerNotes) {
1906
- $addDirs = { }; # can't currently add new directories in MakerNotes
1907
- # allow non-permanent makernotes tags to be added
1908
- # (note: we may get into trouble if there are too many of these
1909
- # because we allow out-of-order tags in MakerNote IFD's but our
1910
- # logic to add new tags relies on ordered entries)
1911
- foreach (keys %set) {
1912
- my $perm = $set{$_}{Permanent};
1913
- push @newTags, $_ if defined $perm and not $perm;
1914
- }
1915
- @newTags = sort { $a <=> $b } @newTags if @newTags > 1;
1916
- } else {
1917
- # get a hash of directories we will be writing in this one
1918
- $addDirs = $et->GetAddDirHash($tagTablePtr, $dirName);
1919
- # make a union of tags & dirs (can set whole dirs, like MakerNotes)
1920
- my %allTags = ( %set, %$addDirs );
1921
- # make sorted list of new tags to be added
1922
- @newTags = sort { $a <=> $b } keys(%allTags);
1923
- }
1924
- my $dirBuff = ''; # buffer for directory data
1925
- my $valBuff = ''; # buffer for value data
1926
- my @valFixups; # list of fixups for offsets in valBuff
1927
- # fixup for offsets in dirBuff
1928
- my $dirFixup = new Image::ExifTool::Fixup;
1929
- my $entryBasedFixup;
1930
- my $lastTagID = -1;
1931
- my ($oldInfo, $oldFormat, $oldFormName, $oldCount, $oldSize, $oldValue, $oldImageData);
1932
- my ($readFormat, $readFormName, $readCount); # format for reading old value(s)
1933
- my ($entry, $valueDataPt, $valueDataPos, $valueDataLen, $valuePtr, $valEnd);
1934
- my ($offList, $offHash, $ignoreCount, $fixCount);
1935
- my $oldID = -1;
1936
- my $newID = -1;
1937
-
1938
- # patch for Canon EOS 40D firmware 1.0.4 bug (incorrect directory counts)
1939
- if ($inMakerNotes and $$et{Model} eq 'Canon EOS 40D') {
1940
- my $fmt = Get16u($dataPt, $dirStart + 2 + 12 * ($numEntries - 1) + 2);
1941
- if ($fmt < 1 or $fmt > 13) {
1942
- # adjust the number of directory entries
1943
- --$numEntries;
1944
- $dirEnd -= 12;
1945
- $ignoreCount = 1;
1946
- }
1947
- }
1948
- #..............................................................................
1949
- # loop through entries in new directory
1950
- #
1951
- $index = 0;
1952
- Entry: for (;;) {
1953
-
1954
- if (defined $oldID and $oldID == $newID) {
1955
- #
1956
- # read next entry from existing directory
1957
- #
1958
- if ($index < $numEntries) {
1959
- $entry = $dirStart + 2 + 12 * $index;
1960
- $oldID = Get16u($dataPt, $entry);
1961
- $readFormat = $oldFormat = Get16u($dataPt, $entry+2);
1962
- $readCount = $oldCount = Get32u($dataPt, $entry+4);
1963
- undef $oldImageData;
1964
- if ($oldFormat < 1 or $oldFormat > 13) {
1965
- my $msg = "Bad format ($oldFormat) for $name entry $index";
1966
- # patch to preserve invalid directory entries in SubIFD3 of
1967
- # various Kodak Z-series cameras (Z812, Z1085IS, Z1275)
1968
- # and some Sony cameras such as the DSC-P10
1969
- if ($dirName eq 'MakerNotes' and (($$et{Make}=~/KODAK/i and
1970
- $$dirInfo{Name} and $$dirInfo{Name} eq 'SubIFD3') or
1971
- ($numEntries == 12 and $$et{Make} eq 'SONY' and $index >= 8)))
1972
- {
1973
- $dirBuff .= substr($$dataPt, $entry, 12);
1974
- ++$index;
1975
- $newID = $oldID; # we wrote this
1976
- $et->Warn($msg, 1);
1977
- next;
1978
- }
1979
- # don't write out null directory entry
1980
- if ($oldFormat==0 and $index and $oldCount==0) {
1981
- $ignoreCount = ($ignoreCount || 0) + 1;
1982
- # must keep same directory size to avoid messing up our fixed offsets
1983
- $dirBuff .= ("\0" x 12) if $$dirInfo{FixBase};
1984
- ++$index;
1985
- $newID = $oldID; # pretend we wrote this
1986
- next;
1987
- }
1988
- return ExifErr($et, $msg, $tagTablePtr);
1989
- }
1990
- $readFormName = $oldFormName = $formatName[$oldFormat];
1991
- $valueDataPt = $dataPt;
1992
- $valueDataPos = $dataPos;
1993
- $valueDataLen = $dataLen;
1994
- $valuePtr = $entry + 8;
1995
- # try direct method first for speed
1996
- $oldInfo = $$tagTablePtr{$oldID};
1997
- if (ref $oldInfo ne 'HASH' or $$oldInfo{Condition}) {
1998
- # must get unknown tags too
1999
- # (necessary so we don't miss a tag we want to Drop)
2000
- my $unk = $et->Options(Unknown => 1);
2001
- $oldInfo = $et->GetTagInfo($tagTablePtr, $oldID);
2002
- $et->Options(Unknown => $unk);
2003
- }
2004
- # patch incorrect count in Kodak SubIFD3 tags
2005
- if ($oldCount < 2 and $oldInfo and $$oldInfo{FixCount}) {
2006
- $offList or ($offList, $offHash) = GetOffList($dataPt, $dirStart, $dataPos,
2007
- $numEntries, $tagTablePtr);
2008
- my $i = $$offHash{Get32u($dataPt, $valuePtr)};
2009
- if (defined $i and $i < $#$offList) {
2010
- $oldCount = int(($$offList[$i+1] - $$offList[$i]) / $formatSize[$oldFormat]);
2011
- $fixCount = ($fixCount || 0) + 1 if $oldCount != $readCount;
2012
- }
2013
- }
2014
- $oldSize = $oldCount * $formatSize[$oldFormat];
2015
- my $readFromFile;
2016
- if ($oldSize > 4) {
2017
- $valuePtr = Get32u($dataPt, $valuePtr);
2018
- # fix valuePtr if necessary
2019
- if ($$dirInfo{FixOffsets}) {
2020
- $valEnd or $valEnd = $dataPos + $dirStart + 2 + 12 * $numEntries + 4;
2021
- my ($tagID, $size, $wFlag) = ($oldID, $oldSize, 1);
2022
- #### eval FixOffsets ($valuePtr, $valEnd, $size, $tagID, $wFlag)
2023
- eval $$dirInfo{FixOffsets};
2024
- unless (defined $valuePtr) {
2025
- unless ($$et{DROP_TAGS}) {
2026
- my $tagStr = $oldInfo ? $$oldInfo{Name} : sprintf("tag 0x%.4x",$oldID);
2027
- return undef if $et->Error("Bad $name offset for $tagStr", $inMakerNotes);
2028
- }
2029
- ++$index; $oldID = $newID; next; # drop this tag
2030
- }
2031
- }
2032
- # offset shouldn't point into TIFF or IFD header
2033
- my $suspect = ($valuePtr < 8);
2034
- # convert offset to pointer in $$dataPt
2035
- if ($$dirInfo{EntryBased} or (ref $$tagTablePtr{$oldID} eq 'HASH' and
2036
- $$tagTablePtr{$oldID}{EntryBased}))
2037
- {
2038
- $valuePtr += $entry;
2039
- } else {
2040
- $valuePtr -= $dataPos;
2041
- }
2042
- # value shouldn't overlap our directory
2043
- $suspect = 1 if $valuePtr < $dirEnd and $valuePtr+$oldSize > $dirStart;
2044
- # get value by seeking in file if we are allowed
2045
- if ($valuePtr < 0 or $valuePtr+$oldSize > $dataLen) {
2046
- my ($pos, $tagStr, $invalidPreview, $tmpInfo, $leicaTrailer);
2047
- if ($oldInfo) {
2048
- $tagStr = $$oldInfo{Name};
2049
- $leicaTrailer = $$oldInfo{LeicaTrailer};
2050
- } elsif (defined $oldInfo) {
2051
- $tmpInfo = $et->GetTagInfo($tagTablePtr, $oldID, \ '', $oldFormName, $oldCount);
2052
- if ($tmpInfo) {
2053
- $tagStr = $$tmpInfo{Name};
2054
- $leicaTrailer = $$tmpInfo{LeicaTrailer};
2055
- }
2056
- }
2057
- $tagStr or $tagStr = sprintf("tag 0x%.4x",$oldID);
2058
- # allow PreviewImage to run outside EXIF segment in JPEG images
2059
- if (not $raf) {
2060
- if ($tagStr eq 'PreviewImage') {
2061
- $raf = $$et{RAF};
2062
- if ($raf) {
2063
- $pos = $raf->Tell();
2064
- if ($oldInfo and $$oldInfo{ChangeBase}) {
2065
- # adjust base offset for this tag only
2066
- #### eval ChangeBase ($dirStart,$dataPos)
2067
- my $newBase = eval $$oldInfo{ChangeBase};
2068
- $valuePtr += $newBase;
2069
- }
2070
- } else {
2071
- $invalidPreview = 1;
2072
- }
2073
- } elsif ($leicaTrailer) {
2074
- # save information about Leica makernote trailer
2075
- $$et{LeicaTrailer} = {
2076
- TagInfo => $oldInfo || $tmpInfo,
2077
- Offset => $base + $valuePtr + $dataPos,
2078
- Size => $oldSize,
2079
- Fixup => new Image::ExifTool::Fixup,
2080
- },
2081
- $invalidPreview = 2;
2082
- # remove SubDirectory to prevent processing (for now)
2083
- my %copy = %{$oldInfo || $tmpInfo};
2084
- delete $copy{SubDirectory};
2085
- delete $copy{MakerNotes};
2086
- $oldInfo = \%copy;
2087
- }
2088
- }
2089
- if ($oldSize > BINARY_DATA_LIMIT and $$origDirInfo{ImageData} and
2090
- (not defined $oldInfo or ($oldInfo and not $$oldInfo{SubDirectory})))
2091
- {
2092
- # copy huge data blocks later instead of loading into memory
2093
- $oldValue = ''; # dummy empty value
2094
- # copy this value later unless writing a new value
2095
- unless ($set{$oldID}) {
2096
- my $pad = $oldSize & 0x01 ? 1 : 0;
2097
- # save block information to copy later (set directory offset later)
2098
- $oldImageData = [$base+$valuePtr+$dataPos, $oldSize, $pad];
2099
- }
2100
- } elsif ($raf) {
2101
- my $success = ($raf->Seek($base+$valuePtr+$dataPos, 0) and
2102
- $raf->Read($oldValue, $oldSize) == $oldSize);
2103
- if (defined $pos) {
2104
- $raf->Seek($pos, 0);
2105
- undef $raf;
2106
- # (sony A700 has 32-byte header on PreviewImage)
2107
- unless ($success and $oldValue =~ /^(\xff\xd8\xff|(.|.{33})\xd8\xff\xdb)/s) {
2108
- $invalidPreview = 1;
2109
- $success = 1; # continue writing directory anyway
2110
- }
2111
- }
2112
- unless ($success) {
2113
- return undef if $et->Error("Error reading value for $name entry $index", $inMakerNotes);
2114
- ++$index; $oldID = $newID; next; # drop this tag
2115
- }
2116
- } elsif (not $invalidPreview) {
2117
- return undef if $et->Error("Bad $name offset for $tagStr", $inMakerNotes);
2118
- ++$index; $oldID = $newID; next; # drop this tag
2119
- }
2120
- if ($invalidPreview) {
2121
- # set value for invalid preview
2122
- if ($$et{FILE_TYPE} eq 'JPEG') {
2123
- # define dummy value for preview (or Leica MakerNote) to write later
2124
- # (value must be larger than 4 bytes to generate PREVIEW_INFO,
2125
- # and an even number of bytes so it won't be padded)
2126
- $oldValue = 'LOAD_PREVIEW';
2127
- } else {
2128
- $oldValue = 'none';
2129
- $oldSize = length $oldValue;
2130
- }
2131
- $valuePtr = 0;
2132
- } else {
2133
- UpdateTiffEnd($et, $base+$valuePtr+$dataPos+$oldSize);
2134
- }
2135
- # update pointers for value just read from file
2136
- $valueDataPt = \$oldValue;
2137
- $valueDataPos = $valuePtr + $dataPos;
2138
- $valueDataLen = $oldSize;
2139
- $valuePtr = 0;
2140
- $readFromFile = 1;
2141
- }
2142
- if ($suspect) {
2143
- my $tagStr = $oldInfo ? $$oldInfo{Name} : sprintf('tag 0x%.4x', $oldID);
2144
- my $str = "Suspicious $name offset for $tagStr";
2145
- if ($inMakerNotes) {
2146
- $et->Warn($str, 1);
2147
- } else {
2148
- return undef if $et->Error($str, 1);
2149
- }
2150
- }
2151
- }
2152
- # read value if we haven't already
2153
- $oldValue = substr($$valueDataPt, $valuePtr, $oldSize) unless $readFromFile;
2154
- # get tagInfo using value if necessary
2155
- if (defined $oldInfo and not $oldInfo) {
2156
- my $unk = $et->Options(Unknown => 1);
2157
- $oldInfo = $et->GetTagInfo($tagTablePtr, $oldID, \$oldValue, $oldFormName, $oldCount);
2158
- $et->Options(Unknown => $unk);
2159
- # now that we have the value, we can resolve the Condition to finally
2160
- # determine whether we want to delete this tag or not
2161
- if ($mayDelete{$oldID} and $oldInfo and (not @newTags or $newTags[0] != $oldID)) {
2162
- my $nvHash = $et->GetNewValueHash($oldInfo, $dirName);
2163
- if (not $nvHash and $wrongDir) {
2164
- # delete from wrong directory if necessary
2165
- $nvHash = $et->GetNewValueHash($oldInfo, $wrongDir);
2166
- $nvHash and $xDelete{$oldID} = 1;
2167
- }
2168
- if ($nvHash) {
2169
- # we want to delete this tag after all, so insert it into our list
2170
- $set{$oldID} = $oldInfo;
2171
- unshift @newTags, $oldID;
2172
- }
2173
- }
2174
- }
2175
- # make sure we are handling the 'ifd' format properly
2176
- if (($oldFormat == 13 or $oldFormat == 18) and
2177
- (not $oldInfo or not $$oldInfo{SubIFD}))
2178
- {
2179
- my $str = sprintf('%s tag 0x%.4x IFD format not handled', $name, $oldID);
2180
- $et->Error($str, $inMakerNotes);
2181
- }
2182
- # override format we use to read the value if specified
2183
- if ($oldInfo) {
2184
- # check for tags which must be integers
2185
- if (($$oldInfo{IsOffset} or $$oldInfo{SubIFD}) and
2186
- not $intFormat{$oldFormName})
2187
- {
2188
- $et->Error("Invalid format ($oldFormName) for $name $$oldInfo{Name}", $inMakerNotes);
2189
- ++$index; $oldID = $newID; next; # drop this tag
2190
- }
2191
- if ($$oldInfo{Drop} and $$et{DROP_TAGS} and
2192
- ($$oldInfo{Drop} == 1 or $$oldInfo{Drop} < $oldSize))
2193
- {
2194
- ++$index; $oldID = $newID; next; # drop this tag
2195
- }
2196
- if ($$oldInfo{Format}) {
2197
- $readFormName = $$oldInfo{Format};
2198
- $readFormat = $formatNumber{$readFormName};
2199
- unless ($readFormat) {
2200
- # we aren't reading in a standard EXIF format, so rewrite in old format
2201
- $readFormName = $oldFormName;
2202
- $readFormat = $oldFormat;
2203
- }
2204
- # adjust number of items to read if format size changed
2205
- $readCount = $oldSize / $formatSize[$readFormat];
2206
- }
2207
- }
2208
- if ($oldID <= $lastTagID and not $inMakerNotes) {
2209
- my $str = $oldInfo ? "$$oldInfo{Name} tag" : sprintf('tag 0x%x',$oldID);
2210
- if ($oldID == $lastTagID) {
2211
- $et->Warn("Duplicate $str in $name");;
2212
- } else {
2213
- $et->Warn("\u$str out of sequence in $name");
2214
- }
2215
- }
2216
- $lastTagID = $oldID;
2217
- ++$index; # increment index for next time
2218
- } else {
2219
- undef $oldID; # no more existing entries
2220
- }
2221
- }
2222
- #
2223
- # write out all new tags, up to and including this one
2224
- #
2225
- $newID = $newTags[0];
2226
- my $isNew; # -1=tag is old, 0=tag same as existing, 1=tag is new
2227
- if (not defined $oldID) {
2228
- last unless defined $newID;
2229
- $isNew = 1;
2230
- } elsif (not defined $newID) {
2231
- # maker notes will have no new tags defined
2232
- if ($set{$oldID}) {
2233
- $newID = $oldID;
2234
- $isNew = 0;
2235
- } else {
2236
- $isNew = -1;
2237
- }
2238
- } else {
2239
- $isNew = $oldID <=> $newID;
2240
- }
2241
- my $newInfo = $oldInfo;
2242
- my $newFormat = $oldFormat;
2243
- my $newFormName = $oldFormName;
2244
- my $newCount = $oldCount;
2245
- my $ifdFormName;
2246
- my $newValue;
2247
- my $newValuePt = $isNew >= 0 ? \$newValue : \$oldValue;
2248
- my $isOverwriting;
2249
-
2250
- if ($isNew >= 0) {
2251
- # add, edit or delete this tag
2252
- shift @newTags; # remove from list
2253
- if ($set{$newID}) {
2254
- #
2255
- # set the new tag value (or 'next' if deleting tag)
2256
- #
2257
- $newInfo = $set{$newID};
2258
- $newCount = $$newInfo{Count};
2259
- my ($val, $newVal, $n);
2260
- my $nvHash = $et->GetNewValueHash($newInfo, $dirName);
2261
- if ($isNew > 0) {
2262
- # don't create new entry unless requested
2263
- if ($nvHash) {
2264
- next unless $$nvHash{IsCreating};
2265
- if ($$newInfo{IsOverwriting}) {
2266
- my $proc = $$newInfo{IsOverwriting};
2267
- $isOverwriting = &$proc($et, $nvHash, $val, \$newVal);
2268
- } else {
2269
- $isOverwriting = $et->IsOverwriting($nvHash);
2270
- }
2271
- } else {
2272
- next if $xDelete{$newID}; # don't create if cross deleting
2273
- $newVal = $$mandatory{$newID}; # get value for mandatory tag
2274
- $isOverwriting = 1;
2275
- }
2276
- # convert using new format
2277
- if ($$newInfo{Format}) {
2278
- $newFormName = $$newInfo{Format};
2279
- # use Writable flag to specify IFD format code
2280
- $ifdFormName = $$newInfo{Writable};
2281
- } else {
2282
- $newFormName = $$newInfo{Writable};
2283
- unless ($newFormName) {
2284
- warn("No format for $name $$newInfo{Name}\n");
2285
- next;
2286
- }
2287
- }
2288
- $newFormat = $formatNumber{$newFormName};
2289
- } elsif ($nvHash or $xDelete{$newID}) {
2290
- unless ($nvHash) {
2291
- $nvHash = $et->GetNewValueHash($newInfo, $wrongDir);
2292
- }
2293
- # read value
2294
- if (length $oldValue >= $oldSize) {
2295
- $val = ReadValue(\$oldValue, 0, $readFormName, $readCount, $oldSize);
2296
- } else {
2297
- $val = '';
2298
- }
2299
- # determine write format (by default, use 'Writable' format)
2300
- my $writable = $$newInfo{Writable};
2301
- # (or use existing format if 'Writable' not specified)
2302
- $writable = $oldFormName unless $writable and $writable ne '1';
2303
- # (and override write format with 'Format' if specified)
2304
- my $writeForm = $$newInfo{Format} || $writable;
2305
- if ($writeForm ne $newFormName) {
2306
- # write in specified format
2307
- $newFormName = $writeForm;
2308
- $newFormat = $formatNumber{$newFormName};
2309
- # use different IFD format code if necessary
2310
- if ($inMakerNotes) {
2311
- # always preserve IFD format in maker notes
2312
- $ifdFormName = $oldFormName;
2313
- } elsif ($writable ne $newFormName) {
2314
- # use specified IFD format
2315
- $ifdFormName = $writable;
2316
- }
2317
- }
2318
- if ($inMakerNotes and $readFormName ne 'string' and $readFormName ne 'undef') {
2319
- # keep same size in maker notes unless string or binary
2320
- $newCount = $oldCount * $formatSize[$oldFormat] / $formatSize[$newFormat];
2321
- }
2322
- if ($$newInfo{IsOverwriting}) {
2323
- my $proc = $$newInfo{IsOverwriting};
2324
- $isOverwriting = &$proc($et, $nvHash, $val, \$newVal);
2325
- } else {
2326
- $isOverwriting = $et->IsOverwriting($nvHash, $val);
2327
- }
2328
- }
2329
- if ($isOverwriting) {
2330
- $newVal = $et->GetNewValues($nvHash) unless defined $newVal;
2331
- # value undefined if deleting this tag
2332
- # (also delete tag if cross-deleting and this isn't a date/time shift)
2333
- if (not defined $newVal or ($xDelete{$newID} and not defined $$nvHash{Shift})) {
2334
- if ($$newInfo{RawConvInv} and defined $$nvHash{Value}) {
2335
- # error in RawConvInv, so rewrite existing tag
2336
- goto NoOverwrite; # GOTO!
2337
- }
2338
- unless ($isNew) {
2339
- ++$$et{CHANGED};
2340
- $et->VerboseValue("- $dirName:$$newInfo{Name}", $val);
2341
- }
2342
- next;
2343
- }
2344
- if ($newCount and $newCount < 0) {
2345
- # set count to number of values if variable
2346
- my @vals = split ' ',$newVal;
2347
- $newCount = @vals;
2348
- }
2349
- # convert to binary format
2350
- $newValue = WriteValue($newVal, $newFormName, $newCount);
2351
- unless (defined $newValue) {
2352
- $et->Warn("Invalid value for $dirName:$$newInfo{Name}");
2353
- goto NoOverwrite; # GOTO!
2354
- }
2355
- if (length $newValue) {
2356
- # limit maximum value length in JPEG images
2357
- # (max segment size is 65533 bytes and the min EXIF size is 96 incl an additional IFD entry)
2358
- if ($$et{FILE_TYPE} eq 'JPEG' and length($newValue) > 65436 and
2359
- $$newInfo{Name} ne 'PreviewImage')
2360
- {
2361
- my $name = $$newInfo{MakerNotes} ? 'MakerNotes' : $$newInfo{Name};
2362
- $et->Warn("$name too large to write in JPEG segment");
2363
- goto NoOverwrite; # GOTO!
2364
- }
2365
- # re-code if necessary
2366
- if ($strEnc and $newFormName eq 'string') {
2367
- $newValue = $et->Encode($newValue, $strEnc);
2368
- }
2369
- } else {
2370
- $et->Warn("Can't write zero length $$newInfo{Name} in $$tagTablePtr{GROUPS}{1}");
2371
- goto NoOverwrite; # GOTO!
2372
- }
2373
- if ($isNew >= 0) {
2374
- $newCount = length($newValue) / $formatSize[$newFormat];
2375
- ++$$et{CHANGED};
2376
- if (defined $allMandatory) {
2377
- # not all mandatory if we are writing any tag specifically
2378
- if ($nvHash) {
2379
- undef $allMandatory;
2380
- undef $deleteAll;
2381
- } else {
2382
- ++$addMandatory; # count mandatory tags that we added
2383
- }
2384
- }
2385
- if ($verbose > 1) {
2386
- $et->VerboseValue("- $dirName:$$newInfo{Name}", $val) unless $isNew;
2387
- my $str = $nvHash ? '' : ' (mandatory)';
2388
- $et->VerboseValue("+ $dirName:$$newInfo{Name}", $newVal, $str);
2389
- }
2390
- }
2391
- } else {
2392
- NoOverwrite: next if $isNew > 0;
2393
- $isNew = -1; # rewrite existing tag
2394
- }
2395
- # set format for EXIF IFD if different than conversion format
2396
- if ($ifdFormName) {
2397
- $newFormName = $ifdFormName;
2398
- $newFormat = $formatNumber{$newFormName};
2399
- }
2400
-
2401
- } elsif ($isNew > 0) {
2402
- #
2403
- # create new subdirectory
2404
- #
2405
- # newInfo may not be defined if we try to add a mandatory tag
2406
- # to a directory that doesn't support it (ie. IFD1 in RW2 images)
2407
- $newInfo = $$addDirs{$newID} or next;
2408
- # make sure we don't try to generate a new MakerNotes directory
2409
- # or a SubIFD
2410
- next if $$newInfo{MakerNotes} or $$newInfo{Name} eq 'SubIFD';
2411
- my $subTable;
2412
- if ($$newInfo{SubDirectory}{TagTable}) {
2413
- $subTable = Image::ExifTool::GetTagTable($$newInfo{SubDirectory}{TagTable});
2414
- } else {
2415
- $subTable = $tagTablePtr;
2416
- }
2417
- # create empty source directory
2418
- my %sourceDir = (
2419
- Parent => $dirName,
2420
- Fixup => new Image::ExifTool::Fixup,
2421
- );
2422
- $sourceDir{DirName} = $$newInfo{Groups}{1} if $$newInfo{SubIFD};
2423
- $newValue = $et->WriteDirectory(\%sourceDir, $subTable);
2424
- # only add new directory if it isn't empty
2425
- next unless defined $newValue and length($newValue);
2426
- # set the fixup start location
2427
- if ($$newInfo{SubIFD}) {
2428
- # subdirectory is referenced by an offset in value buffer
2429
- my $subdir = $newValue;
2430
- $newValue = Set32u(0xfeedf00d);
2431
- push @subdirs, {
2432
- DataPt => \$subdir,
2433
- Table => $subTable,
2434
- Fixup => $sourceDir{Fixup},
2435
- Offset => length($dirBuff) + 8,
2436
- Where => 'dirBuff',
2437
- };
2438
- $newFormName = 'int32u';
2439
- $newFormat = $formatNumber{$newFormName};
2440
- } else {
2441
- # subdirectory goes directly into value buffer
2442
- $sourceDir{Fixup}{Start} += length($valBuff);
2443
- # use Writable to set format, otherwise 'undef'
2444
- $newFormName = $$newInfo{Writable};
2445
- unless ($newFormName and $formatNumber{$newFormName}) {
2446
- $newFormName = 'undef';
2447
- }
2448
- $newFormat = $formatNumber{$newFormName};
2449
- push @valFixups, $sourceDir{Fixup};
2450
- }
2451
- } elsif ($$newInfo{Format} and $$newInfo{Writable} and $$newInfo{Writable} ne '1') {
2452
- # use specified write format
2453
- $newFormName = $$newInfo{Writable};
2454
- $newFormat = $formatNumber{$newFormName};
2455
- } elsif ($$addDirs{$newID} and $newInfo ne $$addDirs{$newID}) {
2456
- # this can happen if we are trying to add a directory that doesn't exist
2457
- # in this type of file (ie. try adding a SubIFD tag to an A100 image)
2458
- $isNew = -1;
2459
- }
2460
- }
2461
- if ($isNew < 0) {
2462
- # just rewrite existing tag
2463
- $newID = $oldID;
2464
- $newValue = $oldValue;
2465
- $newFormat = $oldFormat; # (just in case it changed)
2466
- $newFormName = $oldFormName;
2467
- # set offset of this entry in the directory so we can update the pointer
2468
- # and save block information to copy this large block later
2469
- if ($oldImageData) {
2470
- $$oldImageData[3] = $newStart + length($dirBuff) + 2;
2471
- push @imageData, $oldImageData;
2472
- $$origDirInfo{ImageData} = \@imageData;
2473
- }
2474
- }
2475
- if ($newInfo) {
2476
- #
2477
- # load necessary data for this tag (thumbnail image, etc)
2478
- #
2479
- if ($$newInfo{DataTag} and $isNew >= 0) {
2480
- my $dataTag = $$newInfo{DataTag};
2481
- # load data for this tag
2482
- unless (defined $offsetData{$dataTag} or $dataTag eq 'LeicaTrailer') {
2483
- # prefer tag from Composite table if it exists (otherwise
2484
- # PreviewImage data would be taken from Extra tag)
2485
- my $compInfo = $Image::ExifTool::Composite{$dataTag};
2486
- $offsetData{$dataTag} = $et->GetNewValues($compInfo || $dataTag);
2487
- my $err;
2488
- if (defined $offsetData{$dataTag}) {
2489
- my $len = length $offsetData{$dataTag};
2490
- if ($dataTag eq 'PreviewImage') {
2491
- # must set DEL_PREVIEW flag now if preview fit into IFD
2492
- $$et{DEL_PREVIEW} = 1 if $len <= 4;
2493
- } elsif ($$et{FILE_TYPE} eq 'JPEG' and $len > 60000) {
2494
- delete $offsetData{$dataTag};
2495
- $err = "$dataTag not written (too large for JPEG segment)";
2496
- }
2497
- } else {
2498
- $err = "$dataTag not found";
2499
- }
2500
- if ($err) {
2501
- $et->Warn($err) if $$newInfo{IsOffset};
2502
- delete $set{$newID}; # remove from list of tags we are setting
2503
- next;
2504
- }
2505
- }
2506
- }
2507
- #
2508
- # write maker notes
2509
- #
2510
- if ($$newInfo{MakerNotes}) {
2511
- # don't write new makernotes if we are deleting this group
2512
- if ($$et{DEL_GROUP}{MakerNotes} and
2513
- ($$et{DEL_GROUP}{MakerNotes} != 2 or $isNew <= 0))
2514
- {
2515
- if ($isNew <= 0) {
2516
- ++$$et{CHANGED};
2517
- $verbose and print $out " Deleting MakerNotes\n";
2518
- }
2519
- next;
2520
- }
2521
- my $saveOrder = GetByteOrder();
2522
- if ($isNew >= 0 and $set{$newID}) {
2523
- # we are writing a whole new maker note block
2524
- # --> add fixup information if necessary
2525
- my $nvHash = $et->GetNewValueHash($newInfo, $dirName);
2526
- if ($nvHash and $$nvHash{MAKER_NOTE_FIXUP}) {
2527
- # must clone fixup because we will be shifting it
2528
- my $makerFixup = $$nvHash{MAKER_NOTE_FIXUP}->Clone();
2529
- my $valLen = length($valBuff);
2530
- $$makerFixup{Start} += $valLen;
2531
- push @valFixups, $makerFixup;
2532
- }
2533
- } else {
2534
- # update maker notes if possible
2535
- my %subdirInfo = (
2536
- Base => $base,
2537
- DataPt => $valueDataPt,
2538
- DataPos => $valueDataPos,
2539
- DataLen => $valueDataLen,
2540
- DirStart => $valuePtr,
2541
- DirLen => $oldSize,
2542
- DirName => 'MakerNotes',
2543
- Name => $$newInfo{Name},
2544
- Parent => $dirName,
2545
- TagInfo => $newInfo,
2546
- RAF => $raf,
2547
- );
2548
- my ($subTable, $subdir, $loc, $writeProc, $notIFD);
2549
- if ($$newInfo{SubDirectory}) {
2550
- my $sub = $$newInfo{SubDirectory};
2551
- $subdirInfo{FixBase} = 1 if $$sub{FixBase};
2552
- $subdirInfo{FixOffsets} = $$sub{FixOffsets};
2553
- $subdirInfo{EntryBased} = $$sub{EntryBased};
2554
- $subdirInfo{NoFixBase} = 1 if defined $$sub{Base};
2555
- $subdirInfo{AutoFix} = $$sub{AutoFix};
2556
- }
2557
- # get the proper tag table for these maker notes
2558
- if ($oldInfo and $$oldInfo{SubDirectory}) {
2559
- $subTable = $$oldInfo{SubDirectory}{TagTable};
2560
- $subTable and $subTable = Image::ExifTool::GetTagTable($subTable);
2561
- $writeProc = $$oldInfo{SubDirectory}{WriteProc};
2562
- $notIFD = $$oldInfo{NotIFD};
2563
- } else {
2564
- $et->Warn('Internal problem getting maker notes tag table');
2565
- }
2566
- $subTable or $subTable = $tagTablePtr;
2567
- if ($writeProc and
2568
- $writeProc eq \&Image::ExifTool::MakerNotes::WriteUnknownOrPreview and
2569
- $oldValue =~ /^\xff\xd8\xff/)
2570
- {
2571
- $loc = 0;
2572
- } elsif (not $notIFD) {
2573
- # look for IFD-style maker notes
2574
- $loc = Image::ExifTool::MakerNotes::LocateIFD($et,\%subdirInfo);
2575
- }
2576
- if (defined $loc) {
2577
- # we need fixup data for this subdirectory
2578
- $subdirInfo{Fixup} = new Image::ExifTool::Fixup;
2579
- # rewrite maker notes
2580
- my $changed = $$et{CHANGED};
2581
- $subdir = $et->WriteDirectory(\%subdirInfo, $subTable, $writeProc);
2582
- if ($changed == $$et{CHANGED} and $subdirInfo{Fixup}->IsEmpty()) {
2583
- # return original data if nothing changed and no fixups
2584
- undef $subdir;
2585
- }
2586
- } elsif ($$subTable{PROCESS_PROC} and
2587
- $$subTable{PROCESS_PROC} eq \&Image::ExifTool::ProcessBinaryData)
2588
- {
2589
- my $sub = $$oldInfo{SubDirectory};
2590
- if (defined $$sub{Start}) {
2591
- #### eval Start ($valuePtr)
2592
- my $start = eval $$sub{Start};
2593
- $loc = $start - $valuePtr;
2594
- $subdirInfo{DirStart} = $start;
2595
- $subdirInfo{DirLen} -= $loc;
2596
- } else {
2597
- $loc = 0;
2598
- }
2599
- # rewrite maker notes
2600
- $subdir = $et->WriteDirectory(\%subdirInfo, $subTable);
2601
- } elsif (not $notIFD) {
2602
- my $msg = 'Maker notes could not be parsed';
2603
- if ($$et{FILE_TYPE} eq 'JPEG') {
2604
- $et->Warn($msg, 1);
2605
- } else {
2606
- $et->Error($msg, 1);
2607
- }
2608
- }
2609
- if (defined $subdir) {
2610
- next unless length $subdir;
2611
- my $valLen = length($valBuff);
2612
- # restore existing header and substitute the new
2613
- # maker notes for the old value
2614
- $newValue = substr($oldValue, 0, $loc) . $subdir;
2615
- my $makerFixup = $subdirInfo{Fixup};
2616
- my $previewInfo = $$et{PREVIEW_INFO};
2617
- if ($subdirInfo{Relative}) {
2618
- # apply a one-time fixup to $loc since offsets are relative
2619
- $$makerFixup{Start} += $loc;
2620
- # shift all offsets to be relative to new base
2621
- my $baseShift = $valueDataPos + $valuePtr + $base - $subdirInfo{Base};
2622
- $$makerFixup{Shift} += $baseShift;
2623
- $makerFixup->ApplyFixup(\$newValue);
2624
- if ($previewInfo) {
2625
- # remove all but PreviewImage fixup (since others shouldn't change)
2626
- foreach (keys %{$$makerFixup{Pointers}}) {
2627
- /_PreviewImage$/ or delete $$makerFixup{Pointers}{$_};
2628
- }
2629
- # zero pointer so we can see how it gets shifted later
2630
- $makerFixup->SetMarkerPointers(\$newValue, 'PreviewImage', 0);
2631
- # set the pointer to the start of the EXIF information
2632
- # add preview image fixup to list of value fixups
2633
- $$makerFixup{Start} += $valLen;
2634
- push @valFixups, $makerFixup;
2635
- $$previewInfo{BaseShift} = $baseShift;
2636
- $$previewInfo{Relative} = 1;
2637
- }
2638
- # don't shift anything if relative flag set to zero (Pentax patch)
2639
- } elsif (not defined $subdirInfo{Relative}) {
2640
- # shift offset base if shifted in the original image or if FixBase
2641
- # was used, but be careful of automatic FixBase with negative shifts
2642
- # since they may lead to negative (invalid) offsets (casio_edit_problem.jpg)
2643
- my $baseShift = $base - $subdirInfo{Base};
2644
- if ($subdirInfo{AutoFix}) {
2645
- $baseShift = 0;
2646
- } elsif ($subdirInfo{FixBase} and $baseShift < 0 and
2647
- # allow negative base shift if offsets are bigger (PentaxOptioWP.jpg)
2648
- (not $subdirInfo{MinOffset} or $subdirInfo{MinOffset} + $baseShift < 0))
2649
- {
2650
- my $fixBase = $et->Options('FixBase');
2651
- if (not defined $fixBase) {
2652
- my $str = $et->Options('IgnoreMinorErrors') ? 'ignored' : 'fix or ignore?';
2653
- $et->Error("MakerNotes offsets may be incorrect ($str)", 1);
2654
- } elsif ($fixBase eq '') {
2655
- $et->Warn('Fixed incorrect MakerNotes offsets');
2656
- $baseShift = 0;
2657
- }
2658
- }
2659
- $$makerFixup{Start} += $valLen + $loc;
2660
- $$makerFixup{Shift} += $baseShift;
2661
- # permanently fix makernote offset errors
2662
- $$makerFixup{Shift} += $subdirInfo{FixedBy} || 0;
2663
- push @valFixups, $makerFixup;
2664
- if ($previewInfo and not $$previewInfo{NoBaseShift}) {
2665
- $$previewInfo{BaseShift} = $baseShift;
2666
- }
2667
- }
2668
- $newValuePt = \$newValue; # write new value
2669
- }
2670
- }
2671
- SetByteOrder($saveOrder);
2672
-
2673
- # process existing subdirectory unless we are overwriting it entirely
2674
- } elsif ($$newInfo{SubDirectory} and $isNew <= 0 and not $isOverwriting
2675
- # don't edit directory if Writable is set to 0
2676
- and (not defined $$newInfo{Writable} or $$newInfo{Writable}))
2677
- {
2678
-
2679
- my $subdir = $$newInfo{SubDirectory};
2680
- if ($$newInfo{SubIFD}) {
2681
- #
2682
- # rewrite existing sub IFD's
2683
- #
2684
- my $subTable = $tagTablePtr;
2685
- if ($$subdir{TagTable}) {
2686
- $subTable = Image::ExifTool::GetTagTable($$subdir{TagTable});
2687
- }
2688
- # determine directory name for this IFD
2689
- my $subdirName = $$newInfo{Groups}{1} || $$newInfo{Name};
2690
- # all makernotes directory names must be 'MakerNotes'
2691
- $subdirName = 'MakerNotes' if $$subTable{GROUPS}{0} eq 'MakerNotes';
2692
- # must handle sub-IFD's specially since the values
2693
- # are actually offsets to subdirectories
2694
- unless ($readCount) { # can't have zero count
2695
- return undef if $et->Error("$name entry $index has zero count", 2);
2696
- next;
2697
- }
2698
- my $writeCount = 0;
2699
- my $i;
2700
- $newValue = ''; # reset value because we regenerate it below
2701
- for ($i=0; $i<$readCount; ++$i) {
2702
- my $off = $i * $formatSize[$readFormat];
2703
- my $pt = ReadValue($valueDataPt, $valuePtr + $off,
2704
- $readFormName, 1, $oldSize - $off);
2705
- my $subdirStart = $pt - $dataPos;
2706
- my $subdirBase = $base;
2707
- if ($$subdir{Base}) {
2708
- my $start = $subdirStart + $dataPos;
2709
- #### eval Base ($start,$base)
2710
- $subdirBase += eval $$subdir{Base};
2711
- }
2712
- # add IFD number if more than one
2713
- $subdirName =~ s/\d*$/$i/ if $i;
2714
- my %subdirInfo = (
2715
- Base => $subdirBase,
2716
- DataPt => $dataPt,
2717
- DataPos => $dataPos - $subdirBase + $base,
2718
- DataLen => $dataLen,
2719
- DirStart => $subdirStart,
2720
- DirName => $subdirName,
2721
- Name => $$newInfo{Name},
2722
- TagInfo => $newInfo,
2723
- Parent => $dirName,
2724
- Fixup => new Image::ExifTool::Fixup,
2725
- RAF => $raf,
2726
- Subdir => $subdir,
2727
- # set ImageData only for 1st level SubIFD's
2728
- ImageData=> $imageDataFlag eq 'Main' ? 'SubIFD' : undef,
2729
- );
2730
- # pass on header pointer only for certain sub IFD's
2731
- $subdirInfo{HeaderPtr} = $$dirInfo{HeaderPtr} if $$newInfo{SubIFD} == 2;
2732
- if ($$subdir{RelativeBase}) {
2733
- # apply one-time fixup if offsets are relative (Sony IDC hack)
2734
- delete $subdirInfo{Fixup};
2735
- delete $subdirInfo{ImageData};
2736
- }
2737
- # is the subdirectory outside our current data?
2738
- if ($subdirStart < 0 or $subdirStart + 2 > $dataLen) {
2739
- if ($raf) {
2740
- # reset SubDirectory buffer (we will load it later)
2741
- my $buff = '';
2742
- $subdirInfo{DataPt} = \$buff;
2743
- $subdirInfo{DataLen} = 0;
2744
- } else {
2745
- my @err = ("Can't read $subdirName data", $inMakerNotes);
2746
- if ($$subTable{VARS} and $$subTable{VARS}{MINOR_ERRORS}) {
2747
- $et->Warn($err[0] . '. Ignored.');
2748
- } elsif ($et->Error(@err)) {
2749
- return undef;
2750
- }
2751
- next Entry; # don't write this directory
2752
- }
2753
- }
2754
- my $subdirData = $et->WriteDirectory(\%subdirInfo, $subTable, $$subdir{WriteProc});
2755
- unless (defined $subdirData) {
2756
- # WriteDirectory should have issued an error, but check just in case
2757
- $et->Error("Error writing $subdirName") unless $$et{VALUE}{Error};
2758
- return undef;
2759
- }
2760
- unless (length $subdirData) {
2761
- next unless $inMakerNotes;
2762
- # don't delete MakerNote Sub-IFD's, write empty IFD instead
2763
- $subdirData = "\0" x 6;
2764
- # reset SubIFD ImageData and Fixup just to be safe
2765
- delete $subdirInfo{ImageData};
2766
- delete $subdirInfo{Fixup};
2767
- }
2768
- # handle data blocks that we will transfer later
2769
- if (ref $subdirInfo{ImageData}) {
2770
- push @imageData, @{$subdirInfo{ImageData}};
2771
- $$origDirInfo{ImageData} = \@imageData;
2772
- }
2773
- # temporarily set value to subdirectory index
2774
- # (will set to actual offset later when we know what it is)
2775
- $newValue .= Set32u(0xfeedf00d);
2776
- my ($offset, $where);
2777
- if ($readCount > 1) {
2778
- $offset = length($valBuff) + $i * 4;
2779
- $where = 'valBuff';
2780
- } else {
2781
- $offset = length($dirBuff) + 8;
2782
- $where = 'dirBuff';
2783
- }
2784
- # add to list of subdirectories we will append later
2785
- push @subdirs, {
2786
- DataPt => \$subdirData,
2787
- Table => $subTable,
2788
- Fixup => $subdirInfo{Fixup},
2789
- Offset => $offset,
2790
- Where => $where,
2791
- ImageData => $subdirInfo{ImageData},
2792
- };
2793
- ++$writeCount; # count number of subdirs written
2794
- }
2795
- next unless length $newValue;
2796
- # must change location of subdir offset if we deleted
2797
- # a directory and only one remains
2798
- if ($writeCount < $readCount and $writeCount == 1) {
2799
- $subdirs[-1]{Where} = 'dirBuff';
2800
- $subdirs[-1]{Offset} = length($dirBuff) + 8;
2801
- }
2802
- # set new format to int32u for IFD
2803
- $newFormName = $$newInfo{FixFormat} || 'int32u';
2804
- $newFormat = $formatNumber{$newFormName};
2805
- $newValuePt = \$newValue;
2806
-
2807
- } elsif ((not defined $$subdir{Start} or
2808
- $$subdir{Start} =~ /\$valuePtr/) and
2809
- $$subdir{TagTable})
2810
- {
2811
- #
2812
- # rewrite other existing subdirectories ('$valuePtr' type only)
2813
- #
2814
- # set subdirectory Start and Base
2815
- my $subdirStart = $valuePtr;
2816
- if ($$subdir{Start}) {
2817
- #### eval Start ($valuePtr)
2818
- $subdirStart = eval $$subdir{Start};
2819
- # must adjust directory size if start changed
2820
- $oldSize -= $subdirStart - $valuePtr;
2821
- }
2822
- my $subdirBase = $base;
2823
- if ($$subdir{Base}) {
2824
- my $start = $subdirStart + $valueDataPos;
2825
- #### eval Base ($start,$base)
2826
- $subdirBase += eval $$subdir{Base};
2827
- }
2828
- my $subFixup = new Image::ExifTool::Fixup;
2829
- my %subdirInfo = (
2830
- Base => $subdirBase,
2831
- DataPt => $valueDataPt,
2832
- DataPos => $valueDataPos - $subdirBase + $base,
2833
- DataLen => $valueDataLen,
2834
- DirStart => $subdirStart,
2835
- DirName => $$subdir{DirName},
2836
- DirLen => $oldSize,
2837
- Parent => $dirName,
2838
- Fixup => $subFixup,
2839
- RAF => $raf,
2840
- TagInfo => $newInfo,
2841
- );
2842
- unless ($oldSize) {
2843
- # replace with dummy data if empty to prevent WriteDirectory
2844
- # routines from accessing data they shouldn't
2845
- my $tmp = '';
2846
- $subdirInfo{DataPt} = \$tmp;
2847
- $subdirInfo{DataLen} = 0;
2848
- $subdirInfo{DirStart} = 0;
2849
- $subdirInfo{DataPos} += $subdirStart;
2850
- }
2851
- my $subTable = Image::ExifTool::GetTagTable($$subdir{TagTable});
2852
- my $oldOrder = GetByteOrder();
2853
- SetByteOrder($$subdir{ByteOrder}) if $$subdir{ByteOrder};
2854
- $newValue = $et->WriteDirectory(\%subdirInfo, $subTable, $$subdir{WriteProc});
2855
- SetByteOrder($oldOrder);
2856
- if (defined $newValue) {
2857
- my $hdrLen = $subdirStart - $valuePtr;
2858
- if ($hdrLen) {
2859
- $newValue = substr($$valueDataPt, $valuePtr, $hdrLen) . $newValue;
2860
- $$subFixup{Start} += $hdrLen;
2861
- }
2862
- $newValuePt = \$newValue;
2863
- } else {
2864
- $newValuePt = \$oldValue;
2865
- }
2866
- unless (length $$newValuePt) {
2867
- # don't delete a previously empty makernote directory
2868
- next if $oldSize or not $inMakerNotes;
2869
- }
2870
- if ($$subFixup{Pointers} and $subdirInfo{Base} == $base) {
2871
- $$subFixup{Start} += length $valBuff;
2872
- push @valFixups, $subFixup;
2873
- } else {
2874
- # apply fixup in case we added a header ($hdrLen above)
2875
- $subFixup->ApplyFixup(\$newValue);
2876
- }
2877
- }
2878
-
2879
- } elsif ($$newInfo{OffsetPair}) {
2880
- #
2881
- # keep track of offsets
2882
- #
2883
- my $dataTag = $$newInfo{DataTag} || '';
2884
- if ($dataTag eq 'CanonVRD') {
2885
- # must decide now if we will write CanonVRD information
2886
- my $hasVRD;
2887
- if ($$et{NEW_VALUE}{$Image::ExifTool::Extra{CanonVRD}}) {
2888
- # adding or deleting as a block
2889
- $hasVRD = $et->GetNewValues('CanonVRD') ? 1 : 0;
2890
- } elsif ($$et{DEL_GROUP}{CanonVRD} or
2891
- $$et{DEL_GROUP}{Trailer})
2892
- {
2893
- $hasVRD = 0; # deleting as a group
2894
- } else {
2895
- $hasVRD = ($$newValuePt ne "\0\0\0\0");
2896
- }
2897
- if ($hasVRD) {
2898
- # add a fixup, and set this offset later
2899
- $dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
2900
- } else {
2901
- # there is (or will soon be) no VRD information, so set pointer to zero
2902
- $newValue = "\0" x length($$newValuePt);
2903
- $newValuePt = \$newValue;
2904
- }
2905
- } elsif ($dataTag eq 'OriginalDecisionData') {
2906
- # handle Canon OriginalDecisionData (no associated length tag)
2907
- # - I'm going out of my way here to preserve data which is
2908
- # invalidated anyway by our edits
2909
- my $odd;
2910
- my $oddInfo = $Image::ExifTool::Composite{OriginalDecisionData};
2911
- if ($oddInfo and $$et{NEW_VALUE}{$oddInfo}) {
2912
- $odd = $et->GetNewValues($dataTag);
2913
- if ($verbose > 1) {
2914
- print $out " - $dirName:$dataTag\n" if $$newValuePt ne "\0\0\0\0";
2915
- print $out " + $dirName:$dataTag\n" if $odd;
2916
- }
2917
- ++$$et{CHANGED};
2918
- } elsif ($$newValuePt ne "\0\0\0\0") {
2919
- if (length($$newValuePt) == 4) {
2920
- require Image::ExifTool::Canon;
2921
- my $offset = Get32u($newValuePt,0);
2922
- # absolute offset in JPEG images only
2923
- $offset += $base unless $$et{FILE_TYPE} eq 'JPEG';
2924
- $odd = Image::ExifTool::Canon::ReadODD($et, $offset);
2925
- $odd = $$odd if ref $odd;
2926
- } else {
2927
- $et->Error("Invalid $$newInfo{Name}",1);
2928
- }
2929
- }
2930
- if ($odd) {
2931
- my $newOffset = length($valBuff);
2932
- # (ODD offset is absolute in JPEG, so add base offset!)
2933
- $newOffset += $base if $$et{FILE_TYPE} eq 'JPEG';
2934
- $newValue = Set32u($newOffset);
2935
- $dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
2936
- $valBuff .= $odd; # add original decision data
2937
- } else {
2938
- $newValue = "\0\0\0\0";
2939
- }
2940
- $newValuePt = \$newValue;
2941
- } else {
2942
- my $offsetInfo = $offsetInfo[$ifd];
2943
- # save original values (for updating TIFF_END later)
2944
- my @vals;
2945
- if ($isNew <= 0) {
2946
- my $oldOrder = GetByteOrder();
2947
- # Minolta A200 stores these in the wrong byte order!
2948
- SetByteOrder($$newInfo{ByteOrder}) if $$newInfo{ByteOrder};
2949
- @vals = ReadValue(\$oldValue, 0, $readFormName, $readCount, $oldSize);
2950
- SetByteOrder($oldOrder);
2951
- }
2952
- # only support int32 pointers (for now)
2953
- if ($formatSize[$newFormat] != 4 and $$newInfo{IsOffset}) {
2954
- $isNew > 0 and warn("Internal error (Offset not int32)"), return undef;
2955
- $newCount != $readCount and warn("Wrong count!"), return undef;
2956
- # change to int32
2957
- $newFormName = 'int32u';
2958
- $newFormat = $formatNumber{$newFormName};
2959
- $newValue = WriteValue(join(' ',@vals), $newFormName, $newCount);
2960
- unless (defined $newValue) {
2961
- warn "Internal error writing offsets for $$newInfo{Name}\n";
2962
- return undef;
2963
- }
2964
- }
2965
- $offsetInfo or $offsetInfo = $offsetInfo[$ifd] = { };
2966
- # save location of valuePtr in new directory
2967
- # (notice we add 10 instead of 8 for valuePtr because
2968
- # we will put a 2-byte count at start of directory later)
2969
- my $ptr = $newStart + length($dirBuff) + 10;
2970
- $newCount or $newCount = 1; # make sure count is set for offsetInfo
2971
- # save value pointer and value count for each tag
2972
- $$offsetInfo{$newID} = [$newInfo, $ptr, $newCount, \@vals, $newFormat];
2973
- }
2974
-
2975
- } elsif ($$newInfo{DataMember}) {
2976
-
2977
- # save any necessary data members (Make, Model, etc)
2978
- my $formatStr = $newFormName;
2979
- my $count = $newCount;
2980
- # change to specified format if necessary
2981
- if ($$newInfo{Format} and $$newInfo{Format} ne $formatStr) {
2982
- $formatStr = $$newInfo{Format};
2983
- my $format = $formatNumber{$formatStr};
2984
- # adjust number of items for new format size
2985
- $count = int(length($$newValuePt) / $formatSize[$format]) if $format;
2986
- }
2987
- my $val = ReadValue($newValuePt,0,$formatStr,$count,length($$newValuePt));
2988
- my $conv = $$newInfo{RawConv};
2989
- if ($conv) {
2990
- # let the RawConv store the (possibly converted) data member
2991
- if (ref $conv eq 'CODE') {
2992
- &$conv($val, $et);
2993
- } else {
2994
- my ($self, $tag, $taginfo) = ($et, $$newInfo{Name}, $newInfo);
2995
- #### eval RawConv ($self, $val, $tag, $tagInfo)
2996
- eval $conv;
2997
- }
2998
- } else {
2999
- $$et{$$newInfo{DataMember}} = $val;
3000
- }
3001
- }
3002
- }
3003
- #
3004
- # write out the directory entry
3005
- #
3006
- my $newSize = length($$newValuePt);
3007
- my $fsize = $formatSize[$newFormat];
3008
- my $offsetVal;
3009
- $newCount = int(($newSize + $fsize - 1) / $fsize); # set proper count
3010
- if ($newSize > 4) {
3011
- # zero-pad to an even number of bytes (required by EXIF standard)
3012
- # and make sure we are a multiple of the format size
3013
- while ($newSize & 0x01 or $newSize < $newCount * $fsize) {
3014
- $$newValuePt .= "\0";
3015
- ++$newSize;
3016
- }
3017
- my $entryBased;
3018
- if ($$dirInfo{EntryBased} or ($newInfo and $$newInfo{EntryBased})) {
3019
- $entryBased = 1;
3020
- $offsetVal = Set32u(length($valBuff) - length($dirBuff));
3021
- } else {
3022
- $offsetVal = Set32u(length $valBuff);
3023
- }
3024
- my ($dataTag, $putFirst);
3025
- ($dataTag, $putFirst) = @$newInfo{'DataTag','PutFirst'} if $newInfo;
3026
- if ($dataTag) {
3027
- if ($dataTag eq 'PreviewImage' and ($$et{FILE_TYPE} eq 'JPEG' or
3028
- $$et{GENERATE_PREVIEW_INFO}))
3029
- {
3030
- # hold onto the PreviewImage until we can determine if it fits
3031
- $$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
3032
- Data => $$newValuePt,
3033
- Fixup => new Image::ExifTool::Fixup,
3034
- };
3035
- $$et{PREVIEW_INFO}{ChangeBase} = 1 if $$newInfo{ChangeBase};
3036
- if ($$newInfo{IsOffset} and $$newInfo{IsOffset} eq '2') {
3037
- $$et{PREVIEW_INFO}{NoBaseShift} = 1;
3038
- }
3039
- # use original preview size if we will attempt to load it later
3040
- $newCount = $oldCount if $$newValuePt eq 'LOAD_PREVIEW';
3041
- $$newValuePt = '';
3042
- } elsif ($dataTag eq 'LeicaTrailer' and $$et{LeicaTrailer}) {
3043
- $$newValuePt = '';
3044
- }
3045
- }
3046
- if ($putFirst and $$dirInfo{HeaderPtr}) {
3047
- my $hdrPtr = $$dirInfo{HeaderPtr};
3048
- # place this value immediately after the TIFF header
3049
- $offsetVal = Set32u(length $$hdrPtr);
3050
- $$hdrPtr .= $$newValuePt;
3051
- } else {
3052
- $valBuff .= $$newValuePt; # add value data to buffer
3053
- # must save a fixup pointer for every pointer in the directory
3054
- if ($entryBased) {
3055
- $entryBasedFixup or $entryBasedFixup = new Image::ExifTool::Fixup;
3056
- $entryBasedFixup->AddFixup(length($dirBuff) + 8, $dataTag);
3057
- } else {
3058
- $dirFixup->AddFixup(length($dirBuff) + 8, $dataTag);
3059
- }
3060
- }
3061
- } else {
3062
- $offsetVal = $$newValuePt; # save value in offset if 4 bytes or less
3063
- # must pad value with zeros if less than 4 bytes
3064
- $newSize < 4 and $offsetVal .= "\0" x (4 - $newSize);
3065
- }
3066
- # write the directory entry
3067
- $dirBuff .= Set16u($newID) . Set16u($newFormat) .
3068
- Set32u($newCount) . $offsetVal;
3069
- # update flag to keep track of mandatory tags
3070
- while (defined $allMandatory) {
3071
- if (defined $$mandatory{$newID}) {
3072
- # values must correspond to mandatory values
3073
- my $form = $$newInfo{Format} || $newFormName;
3074
- my $mandVal = WriteValue($$mandatory{$newID}, $form, $newCount);
3075
- if (defined $mandVal and $mandVal eq $$newValuePt) {
3076
- ++$allMandatory; # count mandatory tags
3077
- last;
3078
- }
3079
- }
3080
- undef $deleteAll;
3081
- undef $allMandatory;
3082
- }
3083
- }
3084
- if ($ignoreCount) {
3085
- my $y = $ignoreCount > 1 ? 'ies' : 'y';
3086
- my $verb = $$dirInfo{FixBase} ? 'Ignored' : 'Removed';
3087
- $et->Warn("$verb $ignoreCount invalid entr$y from $name", 1);
3088
- }
3089
- if ($fixCount) {
3090
- my $s = $fixCount > 1 ? 's' : '';
3091
- $et->Warn("Fixed invalid count$s for $fixCount $name tag$s", 1);
3092
- }
3093
- #..............................................................................
3094
- # write directory counts and nextIFD pointer and add value data to end of IFD
3095
- #
3096
- # determine now if there is or will be another IFD after this one
3097
- my $nextIfdOffset;
3098
- if ($dirEnd + 4 <= $dataLen) {
3099
- $nextIfdOffset = Get32u($dataPt, $dirEnd);
3100
- } else {
3101
- $nextIfdOffset = 0;
3102
- }
3103
- my $isNextIFD = ($$dirInfo{Multi} and ($nextIfdOffset or
3104
- # account for the case where we will create the next IFD
3105
- # (IFD1 only, but not in TIFF-format images)
3106
- ($dirName eq 'IFD0' and $$et{ADD_DIRS}{'IFD1'} and
3107
- $$et{FILE_TYPE} ne 'TIFF')));
3108
- # calculate number of entries in new directory
3109
- my $newEntries = length($dirBuff) / 12;
3110
- # delete entire directory if we deleted a tag and only mandatory tags remain or we
3111
- # attempted to create a directory with only mandatory tags and there is no nextIFD
3112
- if ($allMandatory and not $isNextIFD and ($newEntries < $numEntries or $numEntries == 0)) {
3113
- $newEntries = 0;
3114
- $dirBuff = '';
3115
- $valBuff = '';
3116
- undef $dirFixup; # no fixups in this directory
3117
- ++$deleteAll if defined $deleteAll;
3118
- $verbose > 1 and print $out " - $allMandatory mandatory tag(s)\n";
3119
- $$et{CHANGED} -= $addMandatory; # didn't change these after all
3120
- }
3121
- if ($ifd and not $newEntries) {
3122
- $verbose and print $out " Deleting IFD1\n";
3123
- last; # don't write IFD1 if empty
3124
- }
3125
- # apply one-time fixup for entry-based offsets
3126
- if ($entryBasedFixup) {
3127
- $$entryBasedFixup{Shift} = length($dirBuff) + 4;
3128
- $entryBasedFixup->ApplyFixup(\$dirBuff);
3129
- undef $entryBasedFixup;
3130
- }
3131
- # add directory entry count to start of IFD and next IFD pointer to end
3132
- # (temporarily set next IFD pointer to zero)
3133
- $newData .= Set16u($newEntries) . $dirBuff . Set32u(0);
3134
- # get position of value data in newData
3135
- my $valPos = length($newData);
3136
- # go back now and set next IFD pointer if this isn't the first IFD
3137
- if ($nextIfdPos) {
3138
- # set offset to next IFD
3139
- Set32u($newStart, \$newData, $nextIfdPos);
3140
- $fixup->AddFixup($nextIfdPos,'NextIFD'); # add fixup for this offset in newData
3141
- }
3142
- # remember position of 'next IFD' pointer so we can set it next time around
3143
- $nextIfdPos = $valPos - 4;
3144
- # add value data after IFD
3145
- $newData .= $valBuff;
3146
- #
3147
- # add any subdirectories, adding fixup information
3148
- #
3149
- if (@subdirs) {
3150
- my $subdir;
3151
- foreach $subdir (@subdirs) {
3152
- my $len = length($newData); # position of subdirectory in data
3153
- my $subdirFixup = $$subdir{Fixup};
3154
- if ($subdirFixup) {
3155
- $$subdirFixup{Start} += $len;
3156
- $fixup->AddFixup($subdirFixup);
3157
- }
3158
- my $imageData = $$subdir{ImageData};
3159
- my $blockSize = 0;
3160
- # must also update start position for ImageData fixups
3161
- if (ref $imageData) {
3162
- my $blockInfo;
3163
- foreach $blockInfo (@$imageData) {
3164
- my ($pos, $size, $pad, $entry, $subFix) = @$blockInfo;
3165
- if ($subFix) {
3166
- $$subFix{Start} += $len;
3167
- # save expected image data offset for calculating shift later
3168
- $$subFix{BlockLen} = length(${$$subdir{DataPt}}) + $blockSize;
3169
- }
3170
- $blockSize += $size + $pad;
3171
- }
3172
- }
3173
- $newData .= ${$$subdir{DataPt}}; # add subdirectory to our data
3174
- undef ${$$subdir{DataPt}}; # free memory now
3175
- # set the pointer
3176
- my $offset = $$subdir{Offset};
3177
- # if offset is in valBuff, it was added to the end of dirBuff
3178
- # (plus 4 bytes for nextIFD pointer)
3179
- $offset += length($dirBuff) + 4 if $$subdir{Where} eq 'valBuff';
3180
- $offset += $newStart + 2; # get offset in newData
3181
- # check to be sure we got the right offset
3182
- unless (Get32u(\$newData, $offset) == 0xfeedf00d) {
3183
- $et->Error("Internal error while rewriting $name");
3184
- return undef;
3185
- }
3186
- # set the offset to the subdirectory data
3187
- Set32u($len, \$newData, $offset);
3188
- $fixup->AddFixup($offset); # add fixup for this offset in newData
3189
- }
3190
- }
3191
- # add fixup for all offsets in directory according to value data position
3192
- # (which is at the end of this directory)
3193
- if ($dirFixup) {
3194
- $$dirFixup{Start} = $newStart + 2;
3195
- $$dirFixup{Shift} = $valPos - $$dirFixup{Start};
3196
- $fixup->AddFixup($dirFixup);
3197
- }
3198
- # add valueData fixups, adjusting for position of value data
3199
- my $valFixup;
3200
- foreach $valFixup (@valFixups) {
3201
- $$valFixup{Start} += $valPos;
3202
- $fixup->AddFixup($valFixup);
3203
- }
3204
- # stop if no next IFD pointer
3205
- last unless $isNextIFD; # stop unless scanning for multiple IFD's
3206
- if ($nextIfdOffset) {
3207
- # continue with next IFD
3208
- $dirStart = $nextIfdOffset - $dataPos;
3209
- } else {
3210
- # create IFD1 if necessary
3211
- $verbose and print $out " Creating IFD1\n";
3212
- my $ifd1 = "\0" x 2; # empty IFD1 data (zero entry count)
3213
- $dataPt = \$ifd1;
3214
- $dirStart = 0;
3215
- $dirLen = $dataLen = 2;
3216
- }
3217
- # increment IFD name
3218
- my $ifdNum = $dirName =~ s/(\d+)$// ? $1 : 0;
3219
- $dirName .= $ifdNum + 1;
3220
- $name =~ s/\d+$//;
3221
- $name .= $ifdNum + 1;
3222
- $$et{DIR_NAME} = $$et{PATH}[-1] = $dirName;
3223
- next unless $nextIfdOffset;
3224
-
3225
- # guard against writing the same directory twice
3226
- my $addr = $nextIfdOffset + $base;
3227
- if ($$et{PROCESSED}{$addr}) {
3228
- $et->Error("$name pointer references previous $$et{PROCESSED}{$addr} directory", 1);
3229
- last;
3230
- }
3231
- $$et{PROCESSED}{$addr} = $name;
3232
-
3233
- if ($dirName eq 'SubIFD1' and not ValidateIFD($dirInfo, $dirStart)) {
3234
- if ($$et{TIFF_TYPE} eq 'TIFF') {
3235
- $et->Error('Ignored bad IFD linked from SubIFD', 1);
3236
- } elsif ($verbose) {
3237
- $et->Warn('Ignored bad IFD linked from SubIFD');
3238
- }
3239
- last; # don't write bad IFD
3240
- }
3241
- if ($$et{DEL_GROUP}{$dirName}) {
3242
- $verbose and print $out " Deleting $dirName\n";
3243
- $raf and $et->Error("Deleting $dirName also deletes subsequent" .
3244
- " IFD's and possibly image data", 1);
3245
- ++$$et{CHANGED};
3246
- if ($$et{DEL_GROUP}{$dirName} == 2 and
3247
- $$et{ADD_DIRS}{$dirName})
3248
- {
3249
- my $emptyIFD = "\0" x 2; # start with empty IFD
3250
- $dataPt = \$emptyIFD;
3251
- $dirStart = 0;
3252
- $dirLen = $dataLen = 2;
3253
- } else {
3254
- last; # don't write this IFD (or any subsequent IFD)
3255
- }
3256
- } else {
3257
- $verbose and print $out " Rewriting $name\n";
3258
- }
3259
- }
3260
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3261
-
3262
- # do our fixups now so we can more easily calculate offsets below
3263
- $fixup->ApplyFixup(\$newData);
3264
- #
3265
- # determine total block size for deferred data
3266
- #
3267
- my $numBlocks = scalar @imageData; # save this so we scan only existing blocks later
3268
- my $blockSize = 0; # total size of blocks to copy later
3269
- my $blockInfo;
3270
- foreach $blockInfo (@imageData) {
3271
- my ($pos, $size, $pad) = @$blockInfo;
3272
- $blockSize += $size + $pad;
3273
- }
3274
- #
3275
- # copy over image data for IFD's, starting with the last IFD first
3276
- #
3277
- if (@offsetInfo) {
3278
- my $ttwLen; # length of MRW TTW segment
3279
- my @writeLater; # write image data last
3280
- for ($ifd=$#offsetInfo; $ifd>=-1; --$ifd) {
3281
- # build list of offsets to process
3282
- my @offsetList;
3283
- if ($ifd >= 0) {
3284
- my $offsetInfo = $offsetInfo[$ifd] or next;
3285
- # patch Panasonic RAW/RW2 StripOffsets/StripByteCounts if necessary
3286
- my $stripOffsets = $$offsetInfo{0x111};
3287
- if ($stripOffsets and $$stripOffsets[0]{PanasonicHack}) {
3288
- require Image::ExifTool::PanasonicRaw;
3289
- my $err = Image::ExifTool::PanasonicRaw::PatchRawDataOffset($offsetInfo, $raf, $ifd);
3290
- $err and $et->Error($err);
3291
- }
3292
- my $tagID;
3293
- # loop through all tags in reverse order so we save thumbnail
3294
- # data before main image data if both exist in the same IFD
3295
- foreach $tagID (reverse sort keys %$offsetInfo) {
3296
- my $tagInfo = $$offsetInfo{$tagID}[0];
3297
- next unless $$tagInfo{IsOffset}; # handle byte counts with offsets
3298
- my $sizeInfo = $$offsetInfo{$$tagInfo{OffsetPair}};
3299
- $sizeInfo or $et->Error("No size tag for $dirName:$$tagInfo{Name}"), next;
3300
- my $dataTag = $$tagInfo{DataTag};
3301
- # write TIFF image data (strips or tiles) later if requested
3302
- if ($raf and defined $$origDirInfo{ImageData} and
3303
- ($tagID == 0x111 or $tagID == 0x144 or
3304
- # also defer writing of other big data such as JpgFromRaw in NEF
3305
- ($$sizeInfo[3][0] and
3306
- # (calculate approximate combined size of all blocks)
3307
- $$sizeInfo[3][0] * scalar(@{$$sizeInfo[3]}) > 1000000)) and
3308
- # but don't defer writing if replacing with new value
3309
- (not defined $dataTag or not defined $offsetData{$dataTag}))
3310
- {
3311
- push @writeLater, [ $$offsetInfo{$tagID}, $sizeInfo ];
3312
- } else {
3313
- push @offsetList, [ $$offsetInfo{$tagID}, $sizeInfo ];
3314
- }
3315
- }
3316
- } else {
3317
- last unless @writeLater;
3318
- @offsetList = @writeLater;
3319
- }
3320
- my $offsetPair;
3321
- foreach $offsetPair (@offsetList) {
3322
- my ($tagInfo, $offsets, $count, $oldOffset) = @{$$offsetPair[0]};
3323
- my ($cntInfo, $byteCounts, $count2, $oldSize, $format) = @{$$offsetPair[1]};
3324
- # must be the same number of offset and byte count values
3325
- unless ($count == $count2) {
3326
- $et->Error("Offsets/ByteCounts disagree on count for $$tagInfo{Name}");
3327
- return undef;
3328
- }
3329
- my $formatStr = $formatName[$format];
3330
- # follow pointer to value data if necessary
3331
- $count > 1 and $offsets = Get32u(\$newData, $offsets);
3332
- my $n = $count * $formatSize[$format];
3333
- $n > 4 and $byteCounts = Get32u(\$newData, $byteCounts);
3334
- if ($byteCounts < 0 or $byteCounts + $n > length($newData)) {
3335
- $et->Error("Error reading $$tagInfo{Name} byte counts");
3336
- return undef;
3337
- }
3338
- # get offset base and data pos (abnormal for some preview images)
3339
- my ($dbase, $dpos, $wrongBase, $subIfdDataFixup);
3340
- if ($$tagInfo{IsOffset} eq '2') {
3341
- $dbase = $firstBase;
3342
- $dpos = $dataPos + $base - $firstBase;
3343
- } else {
3344
- $dbase = $base;
3345
- $dpos = $dataPos;
3346
- }
3347
- # use different base if necessary for some offsets (Minolta A200)
3348
- if ($$tagInfo{WrongBase}) {
3349
- my $self = $et;
3350
- #### eval WrongBase ($self)
3351
- $wrongBase = eval $$tagInfo{WrongBase} || 0;
3352
- $dbase += $wrongBase;
3353
- $dpos -= $wrongBase;
3354
- } else {
3355
- $wrongBase = 0;
3356
- }
3357
- my $oldOrder = GetByteOrder();
3358
- my $dataTag = $$tagInfo{DataTag};
3359
- # use different byte order for values of this offset pair if required (Minolta A200)
3360
- SetByteOrder($$tagInfo{ByteOrder}) if $$tagInfo{ByteOrder};
3361
- # transfer the data referenced by all offsets of this tag
3362
- for ($n=0; $n<$count; ++$n) {
3363
- my ($oldEnd, $size);
3364
- if (@$oldOffset and @$oldSize) {
3365
- # calculate end offset of this block
3366
- $oldEnd = $$oldOffset[$n] + $$oldSize[$n];
3367
- # update TIFF_END as if we read this data from file
3368
- UpdateTiffEnd($et, $oldEnd + $dbase);
3369
- }
3370
- my $offsetPos = $offsets + $n * 4;
3371
- my $byteCountPos = $byteCounts + $n * $formatSize[$format];
3372
- if ($$tagInfo{PanasonicHack}) {
3373
- # use actual raw data length (may be different than StripByteCounts!)
3374
- $size = $$oldSize[$n];
3375
- } else {
3376
- # use size of new data
3377
- $size = ReadValue(\$newData, $byteCountPos, $formatStr, 1, 4);
3378
- }
3379
- my $offset = $$oldOffset[$n];
3380
- if (defined $offset) {
3381
- $offset -= $dpos;
3382
- } elsif ($size != 0xfeedfeed) {
3383
- $et->Error('Internal error (no offset)');
3384
- return undef;
3385
- }
3386
- my $newOffset = length($newData) - $wrongBase;
3387
- my $buff;
3388
- # look for 'feed' code to use our new data
3389
- if ($size == 0xfeedfeed) {
3390
- unless (defined $dataTag) {
3391
- $et->Error("No DataTag defined for $$tagInfo{Name}");
3392
- return undef;
3393
- }
3394
- unless (defined $offsetData{$dataTag}) {
3395
- $et->Error("Internal error (no $dataTag)");
3396
- return undef;
3397
- }
3398
- if ($count > 1) {
3399
- $et->Error("Can't modify $$tagInfo{Name} with count $count");
3400
- return undef;
3401
- }
3402
- $buff = $offsetData{$dataTag};
3403
- if ($formatSize[$format] != 4) {
3404
- $et->Error("$$cntInfo{Name} is not int32");
3405
- return undef;
3406
- }
3407
- # set the data size
3408
- $size = length($buff);
3409
- Set32u($size, \$newData, $byteCountPos);
3410
- } elsif ($ifd < 0) {
3411
- # pad if necessary (but don't pad contiguous image blocks)
3412
- my $pad = 0;
3413
- ++$pad if $size & 0x01 and ($n+1 >= $count or not $oldEnd or
3414
- $oldEnd != $$oldOffset[$n+1]);
3415
- # preserve original image padding if specified
3416
- if ($$origDirInfo{PreserveImagePadding} and $n+1 < $count and
3417
- $oldEnd and $$oldOffset[$n+1] > $oldEnd)
3418
- {
3419
- $pad = $$oldOffset[$n+1] - $oldEnd;
3420
- }
3421
- # copy data later
3422
- push @imageData, [$offset+$dbase+$dpos, $size, $pad];
3423
- $newOffset += $blockSize; # data comes after other deferred data
3424
- # create fixup for SubIFD ImageData
3425
- if ($imageDataFlag eq 'SubIFD' and not $subIfdDataFixup) {
3426
- $subIfdDataFixup = new Image::ExifTool::Fixup;
3427
- $imageData[-1][4] = $subIfdDataFixup;
3428
- }
3429
- $size += $pad; # account for pad byte if necessary
3430
- # return ImageData list
3431
- $$origDirInfo{ImageData} = \@imageData;
3432
- } elsif ($offset >= 0 and $offset+$size <= $dataLen) {
3433
- # take data from old dir data buffer
3434
- $buff = substr($$dataPt, $offset, $size);
3435
- } elsif ($$et{TIFF_TYPE} eq 'MRW') {
3436
- # TTW segment must be an even 4 bytes long, so pad now if necessary
3437
- my $n = length $newData;
3438
- $buff = ($n & 0x03) ? "\0" x (4 - ($n & 0x03)) : '';
3439
- $size = length($buff);
3440
- # data exists after MRW TTW segment
3441
- $ttwLen = length($newData) + $size unless defined $ttwLen;
3442
- $newOffset = $offset + $dpos + $ttwLen - $dataLen;
3443
- } elsif ($raf and $raf->Seek($offset+$dbase+$dpos,0) and
3444
- $raf->Read($buff,$size) == $size)
3445
- {
3446
- # (data was read OK)
3447
- # patch incorrect ThumbnailOffset in Sony A100 1.00 ARW images
3448
- if ($$et{TIFF_TYPE} eq 'ARW' and $$tagInfo{Name} eq 'ThumbnailOffset' and
3449
- $$et{Model} eq 'DSLR-A100' and $buff !~ /^\xff\xd8\xff/)
3450
- {
3451
- my $pos = $offset + $dbase + $dpos;
3452
- my $try;
3453
- if ($pos < 0x10000 and $raf->Seek($pos+0x10000,0) and
3454
- $raf->Read($try,$size) == $size and $try =~ /^\xff\xd8\xff/)
3455
- {
3456
- $buff = $try;
3457
- $et->Warn('Adjusted incorrect A100 ThumbnailOffset', 1);
3458
- } else {
3459
- $et->Error('Invalid ThumbnailImage');
3460
- }
3461
- }
3462
- } elsif ($$tagInfo{Name} eq 'ThumbnailOffset' and $offset>=0 and $offset<$dataLen) {
3463
- # Grrr. The Canon 350D writes the thumbnail with an incorrect byte count
3464
- my $diff = $offset + $size - $dataLen;
3465
- $et->Warn("ThumbnailImage runs outside EXIF data by $diff bytes (truncated)",1);
3466
- # set the size to the available data
3467
- $size -= $diff;
3468
- unless (WriteValue($size, $formatStr, 1, \$newData, $byteCountPos)) {
3469
- warn 'Internal error writing thumbnail size';
3470
- }
3471
- # get the truncated image
3472
- $buff = substr($$dataPt, $offset, $size);
3473
- } elsif ($$tagInfo{Name} eq 'PreviewImageStart' and $$et{FILE_TYPE} eq 'JPEG') {
3474
- # try to load the preview image using the specified offset
3475
- undef $buff;
3476
- my $r = $$et{RAF};
3477
- if ($r and not $raf) {
3478
- my $tell = $r->Tell();
3479
- # read and validate
3480
- undef $buff unless $r->Seek($offset+$base+$dataPos,0) and
3481
- $r->Read($buff,$size) == $size and
3482
- $buff =~ /^.\xd8\xff[\xc4\xdb\xe0-\xef]/s;
3483
- $r->Seek($tell, 0) or $et->Error('Seek error'), return undef;
3484
- }
3485
- # set flag if we must load PreviewImage
3486
- $buff = 'LOAD_PREVIEW' unless defined $buff;
3487
- } else {
3488
- my $dataName = $dataTag || $$tagInfo{Name};
3489
- return undef if $et->Error("Error reading $dataName data in $name", $inMakerNotes);
3490
- $buff = '';
3491
- }
3492
- if ($$tagInfo{Name} eq 'PreviewImageStart') {
3493
- if ($$et{FILE_TYPE} eq 'JPEG' and not $$tagInfo{MakerPreview}) {
3494
- # hold onto the PreviewImage until we can determine if it fits
3495
- $$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
3496
- Data => $buff,
3497
- Fixup => new Image::ExifTool::Fixup,
3498
- };
3499
- if ($$tagInfo{IsOffset} and $$tagInfo{IsOffset} eq '2') {
3500
- $$et{PREVIEW_INFO}{NoBaseShift} = 1;
3501
- }
3502
- if ($offset >= 0 and $offset+$size <= $dataLen) {
3503
- # set flag indicating this preview wasn't in a trailer
3504
- $$et{PREVIEW_INFO}{WasContained} = 1;
3505
- }
3506
- $buff = '';
3507
- } elsif ($$et{TIFF_TYPE} eq 'ARW' and $$et{Model} eq 'DSLR-A100') {
3508
- # the A100 double-references the same preview, so ignore the
3509
- # second one (the offset and size will be patched later)
3510
- next if $$et{A100PreviewLength};
3511
- $$et{A100PreviewLength} = length $buff if defined $buff;
3512
- }
3513
- }
3514
- # update offset accordingly and add to end of new data
3515
- Set32u($newOffset, \$newData, $offsetPos);
3516
- # add a pointer to fix up this offset value (marked with DataTag name)
3517
- $fixup->AddFixup($offsetPos, $dataTag);
3518
- # also add to subIfdDataFixup if necessary
3519
- $subIfdDataFixup->AddFixup($offsetPos, $dataTag) if $subIfdDataFixup;
3520
- # must also (sometimes) update StripOffsets in Panasonic RW2 images
3521
- my $otherPos = $$offsetPair[0][5];
3522
- if ($otherPos and $$tagInfo{PanasonicHack}) {
3523
- Set32u($newOffset, \$newData, $otherPos);
3524
- $fixup->AddFixup($otherPos, $dataTag);
3525
- }
3526
- if ($ifd >= 0) {
3527
- # buff length must be even (Note: may have changed since $size was set)
3528
- $buff .= "\0" if length($buff) & 0x01;
3529
- $newData .= $buff; # add this strip to the data
3530
- } else {
3531
- $blockSize += $size; # keep track of total size
3532
- }
3533
- }
3534
- SetByteOrder($oldOrder);
3535
- }
3536
- }
3537
- # verify that nothing else got written after determining TTW length
3538
- if (defined $ttwLen and $ttwLen != length($newData)) {
3539
- $et->Error('Internal error writing MRW TTW');
3540
- }
3541
- }
3542
- #
3543
- # set offsets and generate fixups for tag values which were too large for memory
3544
- #
3545
- $blockSize = 0;
3546
- foreach $blockInfo (@imageData) {
3547
- my ($pos, $size, $pad, $entry, $subFix) = @$blockInfo;
3548
- if (defined $entry) {
3549
- my $format = Get16u(\$newData, $entry + 2);
3550
- if ($format < 1 or $format > 13) {
3551
- $et->Error('Internal error copying huge value');
3552
- last;
3553
- } else {
3554
- # set count and offset in directory entry
3555
- Set32u($size / $formatSize[$format], \$newData, $entry + 4);
3556
- Set32u(length($newData)+$blockSize, \$newData, $entry + 8);
3557
- $fixup->AddFixup($entry + 8);
3558
- # create special fixup for SubIFD data
3559
- if ($imageDataFlag eq 'SubIFD') {
3560
- my $subIfdDataFixup = new Image::ExifTool::Fixup;
3561
- $subIfdDataFixup->AddFixup($entry + 8);
3562
- # save fixup in imageData list
3563
- $$blockInfo[4] = $subIfdDataFixup;
3564
- }
3565
- # must reset entry pointer so we don't use it again in a parent IFD!
3566
- $$blockInfo[3] = undef;
3567
- }
3568
- }
3569
- # apply additional shift required for contained SubIFD image data offsets
3570
- if ($subFix and defined $$subFix{BlockLen} and $numBlocks > 0) {
3571
- # our offset expects the data at the end of the SubIFD block (BlockLen + Start),
3572
- # but it will actually be at length($newData) + $blockSize. So adjust
3573
- # accordingly (and subtract an extra Start because this shift is applied later)
3574
- $$subFix{Shift} += length($newData) - $$subFix{BlockLen} - 2 * $$subFix{Start} + $blockSize;
3575
- $subFix->ApplyFixup(\$newData);
3576
- }
3577
- $blockSize += $size + $pad;
3578
- --$numBlocks;
3579
- }
3580
- #
3581
- # apply final shift to new data position if this is the top level IFD
3582
- #
3583
- unless ($$dirInfo{Fixup}) {
3584
- my $hdrPtr = $$dirInfo{HeaderPtr};
3585
- my $newDataPos = $hdrPtr ? length $$hdrPtr : $$dirInfo{NewDataPos} || 0;
3586
- # adjust CanonVRD offset to point to end of regular TIFF if necessary
3587
- # (NOTE: This will be incorrect if multiple trailers exist,
3588
- # but it is unlikely that it could ever be correct in this case anyway.
3589
- # Also, this doesn't work for JPEG images (but CanonDPP doesn't set
3590
- # this when editing JPEG images anyway))
3591
- $fixup->SetMarkerPointers(\$newData, 'CanonVRD', length($newData) + $blockSize);
3592
- if ($newDataPos) {
3593
- $$fixup{Shift} += $newDataPos;
3594
- $fixup->ApplyFixup(\$newData);
3595
- }
3596
- # save fixup for adjusting Leica trailer offset if necessary
3597
- $$et{LeicaTrailer}{Fixup}->AddFixup($fixup) if $$et{LeicaTrailer};
3598
- # save fixup for PreviewImage in JPEG file if necessary
3599
- my $previewInfo = $$et{PREVIEW_INFO};
3600
- if ($previewInfo) {
3601
- my $pt = \$$previewInfo{Data}; # image data or 'LOAD_PREVIEW' flag
3602
- # now that we know the size of the EXIF data, first test to see if our new image fits
3603
- # inside the EXIF segment (remember about the TIFF and EXIF headers: 8+6 bytes)
3604
- if (($$pt ne 'LOAD_PREVIEW' and length($$pt) + length($newData) + 14 <= 0xfffd and
3605
- not $$previewInfo{IsTrailer}) or
3606
- $$previewInfo{IsShort}) # must fit in this segment if using short pointers
3607
- {
3608
- # It fits! (or must exist in EXIF segment), so fixup the
3609
- # PreviewImage pointers and stuff the preview image in here
3610
- my $newPos = length($newData) + $newDataPos;
3611
- $newPos += ($$previewInfo{BaseShift} || 0);
3612
- if ($$previewInfo{Relative}) {
3613
- # calculate our base by looking at how far the pointer got shifted
3614
- $newPos -= ($fixup->GetMarkerPointers(\$newData, 'PreviewImage') || 0);
3615
- }
3616
- $fixup->SetMarkerPointers(\$newData, 'PreviewImage', $newPos);
3617
- $newData .= $$pt;
3618
- # set flag to delete old preview unless it was contained in the EXIF
3619
- $$et{DEL_PREVIEW} = 1 unless $$et{PREVIEW_INFO}{WasContained};
3620
- delete $$et{PREVIEW_INFO}; # done with our preview data
3621
- } else {
3622
- # Doesn't fit, or we still don't know, so save fixup information
3623
- # and put the preview at the end of the file
3624
- $$previewInfo{Fixup} or $$previewInfo{Fixup} = new Image::ExifTool::Fixup;
3625
- $$previewInfo{Fixup}->AddFixup($fixup);
3626
- }
3627
- } elsif (defined $newData and $deleteAll) {
3628
- $newData = ''; # delete both IFD0 and IFD1 since only mandatory tags remain
3629
- } elsif ($$et{A100PreviewLength}) {
3630
- # save preview image start for patching A100 quirks later
3631
- $$et{A100PreviewStart} = $fixup->GetMarkerPointers(\$newData, 'PreviewImage');
3632
- }
3633
- # save location of last IFD for use in Canon RAW header
3634
- if ($newDataPos == 16) {
3635
- my @ifdPos = $fixup->GetMarkerPointers(\$newData,'NextIFD');
3636
- $$origDirInfo{LastIFD} = pop @ifdPos;
3637
- }
3638
- # recrypt SR2 SubIFD data if necessary
3639
- my $key = $$et{SR2SubIFDKey};
3640
- if ($key) {
3641
- my $start = $fixup->GetMarkerPointers(\$newData, 'SR2SubIFDOffset');
3642
- my $len = $$et{SR2SubIFDLength};
3643
- # (must subtract 8 for size of TIFF header)
3644
- if ($start and $start - 8 + $len <= length $newData) {
3645
- require Image::ExifTool::Sony;
3646
- Image::ExifTool::Sony::Decrypt(\$newData, $start - 8, $len, $key);
3647
- }
3648
- }
3649
- }
3650
- # return empty string if no entries in directory
3651
- # (could be up to 10 bytes and still be empty)
3652
- $newData = '' if defined $newData and length($newData) < 12;
3653
-
3654
- return $newData; # return our directory data
3655
- }
3656
-
3657
- 1; # end
3658
-
3659
- __END__
3660
-
3661
- =head1 NAME
3662
-
3663
- Image::ExifTool::WriteExif.pl - Write EXIF meta information
3664
-
3665
- =head1 SYNOPSIS
3666
-
3667
- This file is autoloaded by Image::ExifTool::Exif.
3668
-
3669
- =head1 DESCRIPTION
3670
-
3671
- This file contains routines to write EXIF metadata.
3672
-
3673
- =head1 AUTHOR
3674
-
3675
- Copyright 2003-2013, Phil Harvey (phil at owl.phy.queensu.ca)
3676
-
3677
- This library is free software; you can redistribute it and/or modify it
3678
- under the same terms as Perl itself.
3679
-
3680
- =head1 SEE ALSO
3681
-
3682
- L<Image::ExifTool::Exif(3pm)|Image::ExifTool::Exif>,
3683
- L<Image::ExifTool(3pm)|Image::ExifTool>
3684
-
3685
- =cut