paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 17:18:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patches from bugs #23866 and #23864, fixes 64 bits and fpc 2.7.1 issues

Browse Source 
git-svn-id: trunk@40287 -
This commit is contained in:
sekelsenmat 2013-02-13 07:11:48 +00:00
parent 593c4d27df
commit 1fa926c402
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/customdrawn/cocoagdiobjects.pas
View File

@ -569,7 +569,7 @@ end;
var
ATSUDirectUPP : ATSUDirectLayoutOperationOverrideUPP = nil; //NewATSUDirectLayoutOperationOverrideUPP(@ATSUCallback)
function ATSUCallback(iCurrentOperation: ATSULayoutOperationSelector; iLineRef: ATSULineRef; iRefCon: UInt32; iOperationCallbackParameterPtr: UnivPtr;
function ATSUCallback(iCurrentOperation: ATSULayoutOperationSelector; iLineRef: ATSULineRef; iRefCon: URefCon; iOperationCallbackParameterPtr: UnivPtr;
var oCallbackStatus: ATSULayoutOperationCallbackStatus ): OSStatus; {$ifdef DARWIN}mwpascal;{$endif}
var
Buffer : TASTUITextLayout;

4
lcl/interfaces/customdrawn/customdrawnlclintf_cocoa.inc
View File

@ -166,7 +166,7 @@ var
screenshotImage: CGImageRef;
lRect: CGRect;
lScreenRawImage: TRawImage;
lDataLength: Integer;
lDataLength: SizeInt;
begin
Result := True;
@ -183,7 +183,7 @@ begin
// Now copy the data
ScreenImage.GetRawImage(lScreenRawImage, False);
ARawImage.CreateData(False);
lDataLength := Min(lScreenRawImage.DataSize, ARawImage.DataSize);
lDataLength := Min(Int64(lScreenRawImage.DataSize), Int64(ARawImage.DataSize));
System.Move(lScreenRawImage.Data^, ARawImage.Data^, lDataLength);
end;