From eb43c124e5ef17ce68168db4b5de389973564050 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 12 Mar 2019 22:23:37 +0000
Subject: [PATCH] fpexif: Fix encoding of IPTC string tags.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6831 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpexif/fpeexifdata.pas      | 5 -----
 components/fpexif/fpeiptcreadwrite.pas | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/fpexif/fpeexifdata.pas b/components/fpexif/fpeexifdata.pas
index c209ba0f7..bca2d1a31 100644
--- a/components/fpexif/fpeexifdata.pas
+++ b/components/fpexif/fpeexifdata.pas
@@ -75,11 +75,6 @@ type
     constructor Create(ABigEndian: Boolean);
     destructor Destroy; override;
 
-    {
-    function AddMakerNoteTag(AIndex: Integer; ATagID: TTagID; ATagName: String;
-      AData: TBytes; ACount: Integer; ALkUpTbl: String = '';
-      AFormatStr: String = ''; ATagType: TTagType = ttUInt8): Integer; overload;
-      }
     function AddMakerNoteTag(AIndex: Integer; ATagID: TTagID; ATagName: String;
       ADataValue: Integer; ALkupTbl: String = ''; AFormatStr: String = '';
       ATagType: TTagType = ttUInt16): Integer; overload;
diff --git a/components/fpexif/fpeiptcreadwrite.pas b/components/fpexif/fpeiptcreadwrite.pas
index bb98abddc..2103018f6 100644
--- a/components/fpexif/fpeiptcreadwrite.pas
+++ b/components/fpexif/fpeiptcreadwrite.pas
@@ -86,7 +86,7 @@ type
 implementation
 
 uses
-  fpeStrConsts;
+  lConvEncoding, fpeStrConsts;
 
 type
   // http://search.cpan.org/dist/Image-MetaData-JPEG/lib/Image/MetaData/JPEG/Structures.pod#Structure_of_an_IPTC_data_block
@@ -161,6 +161,7 @@ begin
          {$IFDEF FPC}
           SetLength(s, len);
           Move(ABuffer[AStart], s[1], len);
+          s := ConvertEncoding(s, GuessEncoding(s), encodingUTF8);
          {$ELSE}
           SetLength(sa,len);
           Move(ABuffer[AStart], sa[1], len);