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

fpexif: Some cleanup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6842 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-04-09 09:24:20 +00:00
parent 3b457821b0
commit 26982a47e9
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpexif/fpemakernotecanon.pas
View File

@ -67,8 +67,10 @@ resourcestring
'4:Single,5:Continuous,6:Manual focus,16:Pan focus,256:AF+MF,'+ '4:Single,5:Continuous,6:Manual focus,16:Pan focus,256:AF+MF,'+
'512:Movie snap focus,519:Movie servo AF'; '512:Movie snap focus,519:Movie servo AF';
rsCanonGenLkup = '65535:Low,0:Normal,1:High'; rsCanonGenLkup = '65535:Low,0:Normal,1:High';
{
rsCanonImgStabLkup = '0:Off,1:On,2:Shoot only,3:Panning,4:Dynamic,256:Off,'+ rsCanonImgStabLkup = '0:Off,1:On,2:Shoot only,3:Panning,4:Dynamic,256:Off,'+
'257:On,258:Shoot only,259:Panning,260:Dynamic'; '257:On,258:Shoot only,259:Panning,260:Dynamic';
}
rsCanonISOLkup = '0:Not used,15:auto,16:50,17:100,18:200,19:400'; rsCanonISOLkup = '0:Not used,15:auto,16:50,17:100,18:200,19:400';
rsCanonMacroLkup = '1:Macro,2:Normal'; rsCanonMacroLkup = '1:Macro,2:Normal';
rsCanonMeterLkup = '0:Default,1:Spot,2:Average,3:Evaluative,4:Partial,'+ rsCanonMeterLkup = '0:Default,1:Spot,2:Average,3:Evaluative,4:Partial,'+

4
components/fpexif/fpemakernotecasio.pas
View File

@ -20,7 +20,7 @@ type
implementation implementation
uses uses
fpeStrConsts, fpeUtils, fpeExifData; fpeStrConsts, fpeExifData;
resourcestring resourcestring
rsCasioAFMode2Lkup = '0:Off,1:Spot,2:Multi,3:Face detection,4:Tracking,5:Intelligent'; rsCasioAFMode2Lkup = '0:Off,1:Spot,2:Multi,3:Face detection,4:Tracking,5:Intelligent';
@ -57,8 +57,10 @@ resourcestring
rsCasioFlashModeLkup = '1:Auto,2:On,3:Off,4:Red-eye reduction'; rsCasioFlashModeLkup = '1:Auto,2:On,3:Off,4:Red-eye reduction';
rsCasioFocusingModeLkup = '2:Macro,3:Auto focus,4:Manual focus,5:Infinity'; rsCasioFocusingModeLkup = '2:Macro,3:Auto focus,4:Manual focus,5:Infinity';
rsCasioFocusMode2Lkup = '0:Normal,1:Macro'; rsCasioFocusMode2Lkup = '0:Normal,1:Macro';
{
rsCasioFocusMode22Lkup = '0:Manual,1:Focus lock,2:Macro,3:Single-area auto focus,'+ rsCasioFocusMode22Lkup = '0:Manual,1:Focus lock,2:Macro,3:Single-area auto focus,'+
'5:Infinity,6:Multi-area auto focus,8:Super macro'; '5:Infinity,6:Multi-area auto focus,8:Super macro';
}
rsCasioImageSize2Lkup = '0:640 x 480,4:1600 x 1200,5:2048 x 1536,'+ rsCasioImageSize2Lkup = '0:640 x 480,4:1600 x 1200,5:2048 x 1536,'+
'20:2288 x 1712,21:2592 x 1944,22:2304 x 1728,36:3008 x 2008'; '20:2288 x 1712,21:2592 x 1944,22:2304 x 1728,36:3008 x 2008';
rsCasioImageStabilization2Lkup = '0:Off,1:On,2:Best shot,3:Movie anti-shake'; rsCasioImageStabilization2Lkup = '0:Off,1:On,2:Best shot,3:Movie anti-shake';

3
components/fpexif/fpemakernotenikon.pas
View File

@ -259,7 +259,6 @@ function TNikonMakerNoteReader.AddTag(AStream: TStream;
const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer; const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer;
var var
tagDef: TTagDef; tagDef: TTagDef;
p: PByte;
t: TTagID; t: TTagID;
idx: Integer; idx: Integer;
b: Byte; b: Byte;
@ -327,7 +326,7 @@ begin
idx := 0; idx := 0;
AddMakerNoteStringTag(idx, t, 'BarometerInfoVersion', AData, 6); AddMakerNoteStringTag(idx, t, 'BarometerInfoVersion', AData, 6);
inc(idx, 6); inc(idx, 6);
Move(AData[idx], r, SizeOf(r)); Move(AData[idx], r{%H-}, SizeOf(r));
r.Numerator := FixEndian32(r.Numerator); r.Numerator := FixEndian32(r.Numerator);
r.Denominator := FixEndian32(r.Denominator); r.Denominator := FixEndian32(r.Denominator);
AddMakerNoteTag(idx, t, 'Altitude', r.Numerator/r.Denominator, '', ttSRational); AddMakerNoteTag(idx, t, 'Altitude', r.Numerator/r.Denominator, '', ttSRational);

1
components/fpexif/fpemakernoteolympus.pas
View File

@ -407,7 +407,6 @@ function TOlympusMakerNoteReader.AddTag(AStream: TStream;
const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer; const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer;
var var
tagDef: TTagDef; tagDef: TTagDef;
p: PByte;
t: TTagID; t: TTagID;
w: Word; w: Word;
begin begin