Delphi/Delphi-OpenCV
1
0
Fork 0
mirror of https://github.com/Laex/Delphi-OpenCV.git synced 2024-11-15 07:45:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from micha137/fmxgraphics-only-from-xe5

Browse Source 
Fix compilation of the FMX package with Delphis older than XE5
This commit is contained in:
Laentir Valetov 2017-09-15 22:18:16 +04:00 committed by GitHub
commit 404651d945
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/component/ocv.comp.ViewFMX.pas
View File

@ -193,7 +193,9 @@ begin
if Assigned(OnBeforePaint) then if Assigned(OnBeforePaint) then
OnBeforePaint(Self, FImage); OnBeforePaint(Self, FImage);
{$IFDEF DELPHIXE5_UP}
IPLImageToFMXBitmap(FImage.IpImage, BackBuffer); IPLImageToFMXBitmap(FImage.IpImage, BackBuffer);
{$IFEND}
Canvas.DrawBitmap(BackBuffer, RectF(0, 0, BackBuffer.Width, BackBuffer.Height), PaintRect, 1, True); Canvas.DrawBitmap(BackBuffer, RectF(0, 0, BackBuffer.Width, BackBuffer.Height), PaintRect, 1, True);
if Assigned(OnAfterPaint) then if Assigned(OnAfterPaint) then

11
source/ocv.fmxutils.pas
View File

@ -3,15 +3,21 @@ unit ocv.fmxutils;
interface interface
Uses Uses
ocv.core.types_c, ocv.core.types_c
FMX.Graphics; {$IFDEF DELPHIXE5_UP}
, FMX.Graphics
{$IFEND}
;
{$IFDEF DELPHIXE5_UP}
procedure IPLImageToFMXBitmap(const IpImage: pIplImage; const FMXBitmap: TBitmap); inline; procedure IPLImageToFMXBitmap(const IpImage: pIplImage; const FMXBitmap: TBitmap); inline;
{$IFEND}
implementation implementation
Uses FMX.Types; Uses FMX.Types;
{$IFDEF DELPHIXE5_UP}
procedure IPLImageToFMXBitmap(const IpImage: pIplImage; const FMXBitmap: TBitmap); inline; procedure IPLImageToFMXBitmap(const IpImage: pIplImage; const FMXBitmap: TBitmap); inline;
Var Var
BitmapData: TBitmapData; BitmapData: TBitmapData;
@ -56,5 +62,6 @@ begin
FreeMem(SrcData); FreeMem(SrcData);
end; end;
end; end;
{$IFEND}
end. end.