From 5d8c0d9f2d15f8c545ed76d23c93b83fae316492 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 9 Dec 2017 08:42:30 +0000 Subject: [PATCH] fpexif: minor changes git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6092 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpexif/fpeexifdata.pas | 2 +- components/fpexif/fpemetadata.pas | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/fpexif/fpeexifdata.pas b/components/fpexif/fpeexifdata.pas index b952f4c9c..e7b0d1db0 100644 --- a/components/fpexif/fpeexifdata.pas +++ b/components/fpexif/fpeexifdata.pas @@ -291,7 +291,7 @@ begin AddULongTag (P+$0116, 'RowsPerStrip', 1, rsRowsPerStrip); AddULongTag (P+$0117, 'StripByteCounts', 1, rsStripByteCounts); AddUShortTag (P+$0118, 'MinSampleValue', 1, rsMinSampleValue); - AddUShortTag (P+$0119, 'MaxSampleValue', 1, rsMaxSampleValue); + AddUShortTag (P+$0119, 'MaxSampleValue', 1, rsMaxSampleValue); AddURationalTag(P+$011A, 'XResolution', 1, rsXResolution); AddURationalTag(T+$011A, 'ThumbnailXResolution', 1, rsXResolution); AddURationalTag(P+$011B, 'YResolution', 1, rsYResolution); diff --git a/components/fpexif/fpemetadata.pas b/components/fpexif/fpemetadata.pas index 37d8dc9c0..c4b3314bf 100644 --- a/components/fpexif/fpemetadata.pas +++ b/components/fpexif/fpemetadata.pas @@ -452,6 +452,11 @@ begin exit; while p < streamsize do begin + // The basic structure of the jpeg segments is + // $FF ..... identifier (sometimes repeated) + // marker .. segment identifier (1 byte) + // size .... size of the segment in bytes (2 bytes), including size field + // data .... data of the segment, (size)-2 bytes. repeat marker := ReadByte(AStream); until marker <> $FF;