exiftool_vendored 12.70.0 → 12.72.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 27401 tags, with 17199 unique tag names.
+They contain a total of 27451 tags, with 17222 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -63,7 +63,8 @@ writable directly, but is written automatically by ExifTool (often when a
 corresponding L<Composite|Image::ExifTool::TagNames/Composite Tags> or
 L<Extra|Image::ExifTool::TagNames/Extra Tags> tag is written). A colon
 (C<:>) indicates a I<Mandatory> tag which may be added automatically when
-writing.  Normally MakerNotes tags may not be deleted individually, but a
+writing (use the API NoMandatory option to avoid creating mandatory EXIF
+tags).  Normally MakerNotes tags may not be deleted individually, but a
 caret (C<^>) indicates a I<Deletable> MakerNotes tag.
 
 The HTML version of these tables also lists possible B<Values> for
@@ -482,6 +483,7 @@ for the official EXIF 2.32 specification.
   0x0214   ReferenceBlackWhite       IFD0       rational64u[6]
   0x022f   StripRowCounts            -          no
   0x02bc   ApplicationNotes          IFD0       XMP
+  0x0303   RenderingIntent           -          no
   0x03e7   USPTOMiscellaneous        -          no
   0x1000   RelatedImageFileFormat    InteropIFD string!
   0x1001   RelatedImageWidth         InteropIFD int16u!
@@ -814,6 +816,8 @@ for the official EXIF 2.32 specification.
   0x9403   WaterDepth                ExifIFD    rational64s
   0x9404   Acceleration              ExifIFD    rational64u
   0x9405   CameraElevationAngle      ExifIFD    rational64s
+  0x9999   XiaomiSettings            ExifIFD    JSON
+  0x9a00   XiaomiModel               ExifIFD    string!
   0x9c9b   XPTitle                   IFD0       int8u
   0x9c9c   XPComment                 IFD0       int8u
   0x9c9d   XPAuthor                  IFD0       int8u
@@ -8873,7 +8877,7 @@ CameraInfo tags for the EOS R6.
 
 =head3 Canon CameraInfoG5XII Tags
 
-CameraInfo tags for the EOS R6.
+CameraInfo tags for the PowerShot G5 X Mark II.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -9464,6 +9468,7 @@ These tags are used by many EOS M and PowerShot models.
     255    ColorCalib2?                         Canon ColorCalib2
     264    PerChannelBlackLevel                 int16s[4]
     333    PerChannelBlackLevel                 int16s[4]
+    662    SpecularWhiteLevel                   int16u
    1385    NormalWhiteLevel                     int16u
    1386    SpecularWhiteLevel                   int16u
 
@@ -10122,6 +10127,7 @@ This information is new in images from the EOS 7D.
       4    LongExposureNoiseReduction           int32s
       5    HighISONoiseReduction                int32s
      10    DigitalLensOptimizer                 int32s
+     11    DualPixelRaw                         int32s
 
 =head3 Canon LensInfo Tags
 
@@ -12038,6 +12044,9 @@ group name for these tags is "M-RAW".
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0001   RawImageNumber                       no
+  0x0005   ExposureTime                         no
+  0x0006   FNumber                              no
+  0x0007   ISO                                  no
 
 =head3 FujiFilm FFMV Tags
 
@@ -15028,6 +15037,7 @@ These tags are extracted from encrypted data in images from the D6.
   Index1   Tag Name                             Writable
   ------   --------                             --------
      36    IntervalShooting                     int16u~
+     43    ImageArea                            int8u
 
 =head3 Nikon IntervalInfoD6 Tags
 
@@ -15081,6 +15091,7 @@ These tags are extracted from encrypted data in images from the Z7II.
   Index1   Tag Name                             Writable
   ------   --------                             --------
      36    IntervalShooting                     int16u~
+     43    ImageArea                            int8u
 
 =head3 Nikon PortraitInfoZ7II Tags
 
@@ -15306,8 +15317,8 @@ These tags are extracted from encrypted data in images from the Z9.
   ------   --------                             --------
    3048    AFAreaInitialXPosition               int8s~
    3049    AFAreaInitialYPosition               int8s~
-   3050    AFAreaInitialWidth                   no
-   3051    AFAreaInitialHeight                  no
+   3050    AFAreaInitialWidth                   int8u
+   3051    AFAreaInitialHeight                  int8u
 
 =head3 Nikon AutoCaptureInfo Tags
 
@@ -16179,7 +16190,27 @@ cameras such as the Z6 and Z7, and NRW images from some Coolpix cameras.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
-  [no tags known]
+  0x0005   DistortionInfo                       Nikon DistortionInfo
+  0x0006   VignetteInfo                         Nikon VignetteInfo
+
+=head3 Nikon DistortionInfo Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    DistortionCorrectionVersion          string[4]
+      4    DistortionCorrection                 int8u
+     20    RadialDistortionCoefficient1         rational64s~
+     28    RadialDistortionCoefficient2         rational64s~
+     36    RadialDistortionCoefficient3         rational64s~
+
+=head3 Nikon VignetteInfo Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    VignetteCorrectionVersion            string[4]
+     36    VignetteCoefficient1                 rational64s~
+     52    VignetteCoefficient2                 rational64s~
+     68    VignetteCoefficient3                 rational64s~
 
 =head3 Nikon AVI Tags
 
@@ -20623,6 +20654,7 @@ such as the Galaxy S4.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  'mdln'   SamsungModel                         no
   'svss'   SamsungSvss                          Samsung svss
 
 =head3 Samsung svss Tags
@@ -20806,6 +20838,43 @@ defined below, ExifTool will extract any information found here.
   'thum'   ThumbnailImage                       no
   'ucmt'   Comment                              no
 
+=head3 Ricoh RDTA Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0000   Accelerometer                        no
+  0x0010   TimeStamp                            no
+
+=head3 Ricoh RDTB Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0000   Gyroscope                            no
+  0x0010   TimeStamp                            no
+
+=head3 Ricoh RDTC Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0000   MagneticField                        no
+  0x0010   TimeStamp                            no
+
+=head3 Ricoh RDTG Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0000   TimeStamp                            no
+  0x0064   FrameNumber                          no
+
+=head3 Ricoh RDTL Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0000   GPSDateTime                          no
+  0x0008   GPSLatitude                          no
+  0x0010   GPSLongitude                         no
+  0x0018   GPSAltitude                          no
+
 =head2 Sigma Tags
 
 These tags are written by Sigma/Foveon cameras.  In the early days Sigma was
@@ -21012,6 +21081,7 @@ MakerNotes.
   0x2036   Clarity                              int32s
   0x2037   FocusFrameSize                       no
   0x2039   JPEG-HEIFSwitch                      int16u
+  0x2044   HiddenInfo                           Sony HiddenInfo
   0x204a   FocusLocation2                       int16u[4]
   0x3000   ShotInfo                             Sony ShotInfo
   0x900b   Tag900b                              Sony Tag900b
@@ -21984,6 +22054,13 @@ option is used.
      58    FocalPlaneAFPointLocation14          int16u[2]
      62    FocalPlaneAFPointLocation15          int16u[2]
 
+=head3 Sony HiddenInfo Tags
+
+  Index4   Tag Name                             Writable
+  ------   --------                             --------
+      0    HiddenDataOffset                     int32u
+      1    HiddenDataLength                     int32u
+
 =head3 Sony ShotInfo Tags
 
   Index1   Tag Name                             Writable
@@ -22992,6 +23069,41 @@ information.
       2    DynamicRange                         no
       4    HintMaxOutputValue                   no
 
+=head2 JSON Tags
+
+Other than a few tags in the table below, JSON tags have not been
+pre-defined.  However, ExifTool will read any existing tags from basic
+JSON-formatted files.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  ON1_SettingsData                              PLIST
+  ON1_SettingsMetadataCreated                   no
+  ON1_SettingsMetadataModified                  no
+  ON1_SettingsMetadataName                      no
+  ON1_SettingsMetadataPluginID                  no
+  ON1_SettingsMetadataTimestamp                 no
+  ON1_SettingsMetadataUsage                     no
+  ON1_SettingsMetadataVisibleToUser             no
+
+=head2 CBOR Tags
+
+The tags below are extracted from CBOR (Concise Binary Object
+Representation) metadata.  The C2PA specification uses this format for some
+metadata.  As well as these tags, ExifTool will read any existing tags.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  AuthorIdentifier                              no
+  AuthorName                                    no
+  DocumentID                                    no
+  Format                                        no
+  InstanceID                                    no
+  Relationship                                  no
+  ThumbnailHash                                 no+
+  ThumbnailURL                                  no
+  Title                                         no
+
 =head2 PLIST Tags
 
 Apple Property List tags.  ExifTool reads both XML and binary-format PLIST
@@ -23850,6 +23962,7 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  'AALP'   AudioLevel                           no
   'ACCL'   Accelerometer                        no
   'ALLD'   AutoLowLightDuration                 no
   'ATTD'   Attitude                             no
@@ -23857,6 +23970,7 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'AUDO'   AudioSetting                         no
   'BPOS'   Controller?                          no
   'CASN'   CameraSerialNumber                   no
+  'CORI'   CameraOrientation                    no
   'CSEN'   CoyoteSense                          no
   'CYTS'   CoyoteStatus                         no
   'DEVC'   DeviceContainer                      GoPro GPMF
@@ -23874,10 +23988,14 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'GLPI'   GPSPos                               GoPro GLPI
   'GPRI'   GPSRaw?                              GoPro GPRI
   'GPS5'   GPSInfo                              GoPro GPS5
+  'GPSA'   GPSAltitudeSystem                    no
   'GPSF'   GPSMeasureMode                       no
   'GPSP'   GPSHPositioningError                 no
   'GPSU'   GPSDateTime                          no
+  'GRAV'   GravityVector                        no
   'GYRO'   Gyroscope                            no
+  'HUES'   PrediminantHue                       no
+  'IORI'   ImageOrientation                     no
   'ISOE'   ISOSpeeds                            no
   'ISOG'   ImageSensorGain                      no
   'KBAT'   BatteryStatus                        GoPro KBAT
@@ -23886,6 +24004,7 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'MINF'   Model                                no
   'MTRX'   AccelerometerMatrix                  no
   'MUID'   MediaUniqueID                        no
+  'MWET'   MicrophoneWet                        no
   'OREN'   AutoRotation                         no
   'ORIN'   InputOrientation                     no
   'ORIO'   OutputOrientation                    no
@@ -23901,6 +24020,7 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'RATE'   Rate                                 no
   'RMRK'   Comments                             no
   'SCAL'   ScaleFactor?                         no
+  'SCEN'   SceneClassification                  no
   'SCPR'   ScaledPressure                       no
   'SHUT'   ExposureTimes                        no
   'SIMU'   ScaledIMU                            no
@@ -23919,7 +24039,9 @@ L<https://github.com/gopro/gpmf-parser> for details about this format.
   'VFOV'   FieldOfView                          no
   'VFRH'   VisualFlightRulesHUD                 no
   'WBAL'   ColorTemperatures                    no
+  'WNDM'   WindProcessing                       no
   'WRGB'   WhiteBalanceRGB                      no
+  'YAVG'   LumaAverage                          no
 
 =head3 GoPro GLPI Tags
 
@@ -25405,41 +25527,6 @@ Information extracted from the JUMBF description box.
       8    DisplayYResolutionUnit               no
       9    DisplayXResolutionUnit               no
 
-=head2 JSON Tags
-
-Other than a few tags in the table below, JSON tags have not been
-pre-defined.  However, ExifTool will read any existing tags from basic
-JSON-formatted files.
-
-  Tag Name                                      Writable
-  --------                                      --------
-  ON1_SettingsData                              PLIST
-  ON1_SettingsMetadataCreated                   no
-  ON1_SettingsMetadataModified                  no
-  ON1_SettingsMetadataName                      no
-  ON1_SettingsMetadataPluginID                  no
-  ON1_SettingsMetadataTimestamp                 no
-  ON1_SettingsMetadataUsage                     no
-  ON1_SettingsMetadataVisibleToUser             no
-
-=head2 CBOR Tags
-
-The tags below are extracted from CBOR (Concise Binary Object
-Representation) metadata.  The C2PA specification uses this format for some
-metadata.  As well as these tags, ExifTool will read any existing tags.
-
-  Tag Name                                      Writable
-  --------                                      --------
-  AuthorIdentifier                              no
-  AuthorName                                    no
-  DocumentID                                    no
-  Format                                        no
-  InstanceID                                    no
-  Relationship                                  no
-  ThumbnailHash                                 no+
-  ThumbnailURL                                  no
-  Title                                         no
-
 =head2 APP12 Tags
 
 =head3 APP12 PictureInfo Tags
@@ -29154,7 +29241,7 @@ for the official specification.
 The tags below are extracted from timed metadata in QuickTime and other
 formats of video files when the ExtractEmbedded option is used.  Although
 most of these tags are combined into the single table below, ExifTool
-currently reads 66 different formats of timed GPS metadata from video files.
+currently reads 67 different formats of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -29359,6 +29446,7 @@ changed via the config file.
                 FrameReadoutTime                yes
   'camera.identifier' CameraIdentifier          yes
   'collection.user' UserCollection              yes
+  'com.android.capture.fps' AndroidCaptureFPS   yes
   'com.android.version' AndroidVersion          yes
   'com.apple.photos.captureMode' CaptureMode    yes
   'comment'     Comment                         yes
@@ -29377,6 +29465,7 @@ changed via the config file.
   'direction.motion' CameraMotion               yes
   'director'    Director                        yes
   'displayname' DisplayName                     yes
+  'encoder'     Encoder                         yes
   'genre'       Genre                           yes
   'information' Information                     yes
   'keywords'    Keywords                        yes
@@ -30336,6 +30425,11 @@ the config file.
                MakerNotePentaxUnknown           string
   'PXTH'       PentaxPreview                    Pentax PXTH
   'QVMI'       CasioQVMI                        EXIF
+  'RDTA'       RicohRDTA                        Ricoh RDTA
+  'RDTB'       RicohRDTB                        Ricoh RDTB
+  'RDTC'       RicohRDTC                        Ricoh RDTC
+  'RDTG'       RicohRDTG                        Ricoh RDTG
+  'RDTL'       RicohRDTL                        Ricoh RDTL
   'RMKN'       RicohRMKN                        EXIF
   'RTHU'       PreviewImage                     no
   'SDLN'       PlayMode                         string
@@ -31376,6 +31470,15 @@ ARCore accelerometer data.
   ------   --------                             --------
   [no tags known]
 
+=head2 AAC Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'Bit016-017'         ProfileType              no
+  'Bit018-021'         SampleRate               no
+  'Bit023-025'         Channels                 no
+  'Encoder'            Encoder                  no
+
 =head2 Ogg Tags
 
 ExifTool extracts the following types of information from Ogg files.  See
@@ -39590,6 +39693,8 @@ values, may created via the ExifTool configuration file.
   GPSLongitudeRef      XMP-exif:GPSLongitude    no
   GPSPosition          GPSLatitude              yes!
                        GPSLongitude
+  HiddenData           Sony:HiddenDataOffset    no
+                       Sony:HiddenDataLength
   HyperfocalDistance   FocalLength              no
                        Aperture
                        CircleOfConfusion

data/bin/lib/Image/ExifTool/WriteExif.pl

@@ -569,6 +569,7 @@ sub WriteExif($$$)
     my $imageDataFlag = $$dirInfo{ImageData} || '';
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
+    my $noMandatory = $et->Options('NoMandatory');
     my ($nextIfdPos, %offsetData, $inMakerNotes);
     my (@offsetInfo, %validateInfo, %xDelete, $strEnc);
     my $deleteAll = 0;
@@ -698,8 +699,8 @@ sub WriteExif($$$)
         }
 
         # initialize variables to handle mandatory tags
-        my $mandatory = $mandatory{$dirName};
-        my ($allMandatory, $addMandatory);
+        my ($mandatory, $allMandatory, $addMandatory);
+        $mandatory = $mandatory{$dirName} unless $noMandatory;
         if ($mandatory) {
             # use X/Y resolution values from JFIF if available
             if ($dirName eq 'IFD0' and defined $$et{JFIFYResolution}) {
@@ -1152,7 +1153,7 @@ Entry:  for (;;) {
                     }
                     my $nvHash;
                     $nvHash = $et->GetNewValueHash($curInfo, $dirName) if $isNew >= 0;
-                    unless ($nvHash or defined $$mandatory{$newID}) {
+                    unless ($nvHash or (defined $$mandatory{$newID} and not $noMandatory)) {
                         goto NoWrite unless $wrongDir;  # GOTO !
                         # delete stuff from the wrong directory if setting somewhere else
                         $nvHash = $et->GetNewValueHash($curInfo, $wrongDir);
@@ -2235,6 +2236,19 @@ NoOverwrite:            next if $isNew > 0;
 
     # do our fixups now so we can more easily calculate offsets below
     $fixup->ApplyFixup(\$newData);
+    # write Sony HiddenData now if this is an ARW file
+    if ($$et{HiddenData} and not $$dirInfo{Fixup} and $$et{FILE_TYPE} eq 'TIFF') {
+        $fixup->SetMarkerPointers(\$newData, 'HiddenData', length($newData));
+        my $hbuf;
+        my $hd = $$et{HiddenData};
+        if ($raf->Seek($$hd{Offset}, 0) and $raf->Read($hbuf, $$hd{Size}) == $$hd{Size} and
+            $hbuf =~ /^\x55\x26\x11\x05\0/)
+        {
+            $newData .= $hbuf;
+        } else {
+            $et->Error('Error copying hidden data', 1);
+        }
+    }
 #
 # determine total block size for deferred data
 #
@@ -2625,8 +2639,9 @@ NoOverwrite:            next if $isNew > 0;
             $$fixup{Shift} += $newDataPos;
             $fixup->ApplyFixup(\$newData);
         }
-        # save fixup for adjusting Leica trailer offset if necessary
+        # save fixup for adjusting Leica trailer and Sony HiddenData offsets if necessary
         $$et{LeicaTrailer}{Fixup}->AddFixup($fixup) if $$et{LeicaTrailer};
+        $$et{HiddenData}{Fixup}->AddFixup($fixup) if $$et{HiddenData};
         # save fixup for PreviewImage in JPEG file if necessary
         my $previewInfo = $$et{PREVIEW_INFO};
         if ($previewInfo) {

data/bin/lib/Image/ExifTool/Writer.pl

@@ -690,6 +690,12 @@ TAG: foreach $tagInfo (@matchingTags) {
             $writeProc = $$src{WRITE_PROC} unless $writeProc;
         }
         {
+            # make sure module is loaded if the writeProc is a string
+            unless (ref $writeProc) {
+                my $module = $writeProc;
+                $module =~ s/::\w+$//;
+                eval "require $module";
+            }
             no strict 'refs';
             next unless $writeProc and &$writeProc();
         }
@@ -3239,9 +3245,15 @@ sub InsertTagValues($$$;$$$)
                     $tag = $docGrp . ':' . $tag;
                     $lcTag = lc $tag;
                 }
-                my $et = $self;
+                my ($et, $fileTags) = ($self, $foundTags);
                 if ($tag =~ s/(\bfile\d+)://i) {
-                    $et = $$self{ALT_EXIFTOOL}{ucfirst lc $1} or $et=$self, $tag = 'no_alt_file';
+                    $et = $$self{ALT_EXIFTOOL}{ucfirst lc $1};
+                    if ($et) {
+                        $fileTags = $$et{FoundTags};
+                    } else {
+                        $et = $self;
+                        $tag = 'no_alt_file';
+                    }
                 }
                 if ($lcTag eq 'all') {
                     $val = 1;   # always some tag available
@@ -3252,11 +3264,11 @@ sub InsertTagValues($$$;$$$)
                     ($group, $tag) = ($1, $2);
                     if (lc $tag eq 'all') {
                         # see if any tag from the specified group exists
-                        my $match = $et->GroupMatches($group, $foundTags);
+                        my $match = $et->GroupMatches($group, $fileTags);
                         $val = $match ? 1 : 0;
                     } else {
                         # find the specified tag
-                        my @matches = grep /^$tag(\s|$)/i, @$foundTags;
+                        my @matches = grep /^$tag(\s|$)/i, @$fileTags;
                         @matches = $et->GroupMatches($group, \@matches);
                         foreach $tg (@matches) {
                             if (defined $val and $tg =~ / \((\d+)\)$/) {
@@ -3276,7 +3288,7 @@ sub InsertTagValues($$$;$$$)
                     $val = $et->GetValue($tag, $type);
                     unless (defined $val) {
                         # check for tag name with different case
-                        ($tg) = grep /^$tag$/i, @$foundTags;
+                        ($tg) = grep /^$tag$/i, @$fileTags;
                         if (defined $tg) {
                             $val = $et->GetValue($tg, $type);
                             $tag = $tg;
@@ -3927,7 +3939,7 @@ sub RemoveNewValuesForGroup($$)
             my $wgrp = $$nvHash{WriteGroup};
             # use group1 if write group is not specific
             $wgrp = $grp1 if $wgrp eq $grp0;
-            if (grep /^($grp0|$wgrp)$/i, @groups) {
+            if ($grp0 eq '*' or $wgrp eq '*' or grep /^($grp0|$wgrp)$/i, @groups) {
                 $out and print $out "Removed new value for $wgrp:$$tagInfo{Name}\n";
                 # remove from linked list
                 $self->RemoveNewValueHash($nvHash, $tagInfo);
@@ -4663,9 +4675,18 @@ sub DumpUnknownTrailer($$)
     # account for preview/MPF image trailer
     my $prePos = $$self{VALUE}{PreviewImageStart} || $$self{PreviewImageStart};
     my $preLen = $$self{VALUE}{PreviewImageLength} || $$self{PreviewImageLength};
+    my $hidPos = $$self{VALUE}{HiddenDataOffset};
+    my $hidLen = $$self{VALUE}{HiddenDataLength};
     my $tag = 'PreviewImage';
     my $mpImageNum = 0;
     my (%image, $lastOne);
+    # add HiddenData to list of known trailer blocks
+    if ($hidPos and $hidLen) {
+        # call ReadHiddenData to validate hidden data and fix offset if necessary
+        require Image::ExifTool::Sony;
+        my $datPt = Image::ExifTool::Sony::ReadHiddenData($self, $hidPos, $hidLen);
+        $image{$hidPos} = ['HiddenData', $hidLen] if $datPt;
+    }
     for (;;) {
         # add to Preview block list if valid and in the trailer
         $image{$prePos} = [$tag, $preLen] if $prePos and $preLen and $prePos+$preLen > $pos;
@@ -5780,13 +5801,16 @@ sub WriteJPEG($$)
                         }
                     }
                     # switch to buffered output if required
-                    if (($$self{PREVIEW_INFO} or $$self{LeicaTrailer}) and not $oldOutfile) {
+                    if (($$self{PREVIEW_INFO} or $$self{LeicaTrailer} or $$self{HiddenData}) and
+                        not $oldOutfile)
+                    {
                         $writeBuffer = '';
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
                         # account for segment, EXIF and TIFF headers
                         $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
                         $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
+                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, 0xe1, $exifAPP1hdr, \$buff, 'EXIF');
@@ -5932,7 +5956,9 @@ sub WriteJPEG($$)
             my $delPreview = $$self{DEL_PREVIEW};
             $trailInfo = IdentifyTrailer($raf) unless $$delGroup{Trailer};
             my $nvTrail = $self->GetNewValueHash($Image::ExifTool::Extra{Trailer});
-            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail) {
+            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail or
+                $$self{HiddenData})
+            {
                 # blindly copy the rest of the file
                 while ($raf->Read($buff, 65536)) {
                     Write($outfile, $buff) or $err = 1, last;
@@ -5962,7 +5988,7 @@ sub WriteJPEG($$)
                 $endedWithFF = substr($buff, 65535, 1) eq "\xff" ? 1 : 0;
             }
             # remember position of last data copied
-            $endPos = $raf->Tell() - length($buff);
+            $endPos = $$self{TrailerStart} = $raf->Tell() - length($buff);
             # write new trailer if specified
             if ($nvTrail) {
                 # access new value directly to avoid copying a potentially very large data block
@@ -5976,6 +6002,34 @@ sub WriteJPEG($$)
                 }
                 last;   # all done
             }
+            # copy HiddenData if necessary
+            if ($$self{HiddenData}) {
+                my $pad;
+                my $hd = $$self{HiddenData};
+                my $hdOff = $$hd{Offset} + $$hd{Base};
+                require Image::ExifTool::Sony;
+                # read HiddenData, updating $hdOff with actual offset if necessary
+                my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $$hd{Size});
+                if ($dataPt) {
+                    # preserve padding to avoid invalidating MPF pointers (yuk!)
+                    my $padLen = $hdOff - $endPos;
+                    unless ($padLen >= 0 and $raf->Seek($endPos,0) and $raf->Read($pad,$padLen)==$padLen) {
+                        $self->Error('Error reading HiddenData padding',1);
+                        $pad = '';
+                    }
+                    $endPos += length($pad) + length($$dataPt); # update end position
+                } else {
+                    $$dataPt = $pad = '';
+                }
+                my $fixup = $$self{HiddenData}{Fixup};
+                # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
+                $fixup->SetMarkerPointers($outfile, 'HiddenData', length($$outfile) + length($pad) - 10);
+                # clean up and write the buffered data
+                $outfile = $oldOutfile;
+                undef $oldOutfile;
+                Write($outfile, $writeBuffer, $pad, $$dataPt) or $err = 1;
+                undef $writeBuffer;
+            }
             # rewrite existing trailers
             if ($trailInfo) {
                 my $tbuf = '';
@@ -6085,7 +6139,7 @@ sub WriteJPEG($$)
                     $delPreview = 1;    # remove old preview
                 }
             }
-            # copy over preview image if necessary
+            # copy over preview image (or other data) if necessary
             unless ($delPreview) {
                 my $extra;
                 if ($trailInfo) {
@@ -6252,13 +6306,16 @@ sub WriteJPEG($$)
                         }
                     }
                     # switch to buffered output if required
-                    if (($$self{PREVIEW_INFO} or $$self{LeicaTrailer}) and not $oldOutfile) {
+                    if (($$self{PREVIEW_INFO} or $$self{LeicaTrailer} or $$self{HiddenData}) and
+                        not $oldOutfile)
+                    {
                         $writeBuffer = '';
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
                         # must account for segment, EXIF and TIFF headers
                         $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
                         $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
+                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, $marker, $exifAPP1hdr, $segDataPt, 'EXIF');
@@ -7123,14 +7180,24 @@ sub WriteBinaryData($$$)
             # ignore if offset is zero (eg. Ricoh DNG uses this to indicate no preview)
             next unless $offset;
             $fixup->AddFixup($entry, $$tagInfo{DataTag}, $format);
-            # handle the preview image now if this is a JPEG file
-            next unless $$self{FILE_TYPE} eq 'JPEG' and $$tagInfo{DataTag} and
-                $$tagInfo{DataTag} eq 'PreviewImage' and defined $$tagInfo{OffsetPair};
+            next unless $$tagInfo{DataTag} and defined $$tagInfo{OffsetPair};
             # NOTE: here we assume there are no var-sized tags between the
             # OffsetPair tags.  If this ever becomes possible we must recalculate
             # $varSize for the OffsetPair tag here!
             $entry = $$tagInfo{OffsetPair} * $increment + $varSize;
             my $size = ReadValue($dataPt, $entry, $format, 1, $dirLen-$entry);
+            next unless defined $size;
+            if ($$tagInfo{DataTag} eq 'HiddenData') {
+                $$self{HiddenData} = {
+                    Offset => $offset,
+                    Size   => $size,
+                    Fixup  => new Image::ExifTool::Fixup,
+                    Base   => $$dirInfo{Base},
+                };
+                next;
+            }
+            # handle the preview image now if this is a JPEG file
+            next unless $$tagInfo{DataTag} eq 'PreviewImage' and $$self{FILE_TYPE} eq 'JPEG';
             my $previewInfo = $$self{PREVIEW_INFO};
             $previewInfo or $previewInfo = $$self{PREVIEW_INFO} = {
                 Fixup => new Image::ExifTool::Fixup,