pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpexif: Fix encoding of IPTC string tags.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6831 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-03-12 22:23:37 +00:00
parent 0105538d1e
commit eb43c124e5
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/fpexif/fpeexifdata.pas
View File

@@ -75,11 +75,6 @@ type
constructor Create(ABigEndian: Boolean); constructor Create(ABigEndian: Boolean);
destructor Destroy; override; 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; function AddMakerNoteTag(AIndex: Integer; ATagID: TTagID; ATagName: String;
ADataValue: Integer; ALkupTbl: String = ''; AFormatStr: String = ''; ADataValue: Integer; ALkupTbl: String = ''; AFormatStr: String = '';
ATagType: TTagType = ttUInt16): Integer; overload; ATagType: TTagType = ttUInt16): Integer; overload;

3
components/fpexif/fpeiptcreadwrite.pas
View File

@@ -86,7 +86,7 @@ type
implementation implementation
uses uses
fpeStrConsts; lConvEncoding, fpeStrConsts;
type type
// http://search.cpan.org/dist/Image-MetaData-JPEG/lib/Image/MetaData/JPEG/Structures.pod#Structure_of_an_IPTC_data_block // 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} {$IFDEF FPC}
SetLength(s, len); SetLength(s, len);
Move(ABuffer[AStart], s[1], len); Move(ABuffer[AStart], s[1], len);
s := ConvertEncoding(s, GuessEncoding(s), encodingUTF8);
{$ELSE} {$ELSE}
SetLength(sa,len); SetLength(sa,len);
Move(ABuffer[AStart], sa[1], len); Move(ABuffer[AStart], sa[1], len);