paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-08 14:19:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: resolve the warning regarding uninitialized ScreenImage

Browse Source 
git-svn-id: trunk@58452 -
This commit is contained in:
dmitry 2018-07-07 04:39:48 +00:00
parent 2242dbf42a
commit 4f1334064a
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -221,6 +221,7 @@ implementation
{$R ../../cursor_hourglass.res}
uses
dl,dynlibs,
CocoaCaret,
CocoaThemes;

23
lcl/interfaces/cocoa/cocoalclintf.inc
View File

@ -527,6 +527,14 @@ end;
http://developer.apple.com/qa/qa2007/qa1509.html
------------------------------------------------------------------------------}
var
_CGDisplayCreateImage : function ( displayID: CGDirectDisplayID ): CGImageRef; cdecl = nil;
function CGDisplayCreateImageNone( displayID: CGDirectDisplayID ): CGImageRef; cdecl;
begin
Result := nil;
end;
function TCocoaWidgetSet.RawImage_FromDevice(out ARawImage: TRawImage; ADC: HDC; const ARect: TRect): Boolean;
var
CBC: TCocoaBitmapContext absolute ADC;
@ -548,19 +556,24 @@ begin
{ Get's a screenshot }
displayID := CGMainDisplayID();
{$IF not defined(MAC_OS_X_VERSION_MIN_REQUIRED) or (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)}
if not Assigned(@_CGDisplayCreateImage) then begin
Pointer(_CGDisplayCreateImage) := GetProcAddress(TLibHandle(RTLD_DEFAULT), 'CGDisplayCreateImage');
if not Assigned(@_CGDisplayCreateImage) then
Pointer(_CGDisplayCreateImage) := @CGDisplayCreateImageNone;
end;
ScreenImage := CGDisplayCreateImage(displayID);
{$ENDIF}
{ Fills the image description }
ARawImage.Init;
FillStandardDescription(ARawImage.Description);
ARawImage.Description.Height := CGImageGetHeight(ScreenImage);
ARawImage.Description.Width := CGImageGetWidth(ScreenImage);
if Assigned(ScreenImage) then begin
ARawImage.Description.Height := CGImageGetHeight(ScreenImage);
ARawImage.Description.Width := CGImageGetWidth(ScreenImage);
ARawImage.Data := GetImagePixelData(ScreenImage, ARawImage.DataSize);
end;
ARawImage.Mask := nil;
{ Copies the image data to a local buffer }
ARawImage.Data := GetImagePixelData(ScreenImage, ARawImage.DataSize);
{ clean-up }
CGImageRelease(ScreenImage);