Changeset 522 for GraphicTest/Packages/Graphics32/GR32_Filters.pas

Timestamp:

Apr 17, 2019, 10:42:18 AM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Graphics32 library.

Location:

GraphicTest/Packages/Graphics32

Files:

• . (modified) (1 prop)
• GR32_Filters.pas (modified) (9 diffs)

GraphicTest/Packages/Graphics32/GR32_Filters.pas

@@ -50 +50 @@
   Windows,
 {$ENDIF}
-  Classes, SysUtils, GR32, GR32_Blend, GR32_System, GR32_Bindings;
+  Classes, SysUtils, GR32;
 
 { Basic processing }
@@ -83 +83 @@
 
 uses
+  {$IFDEF COMPILERXE2_UP}Types, {$ENDIF} GR32_System, GR32_Bindings,
   GR32_Lowlevel;
 
@@ -89 +90 @@
   SEmptySource = 'The source is nil';
   SEmptyDestination = 'Destination is nil';
-  SNoInPlace = 'In-place operation is not supported here';
 
 type
@@ -115 +115 @@
     (@@LogicalMaskLineOr)
   );
-  
+
   LOGICAL_MASK_LINE_EX: array[TLogicalOperator] of ^TLogicalMaskLineEx = (
     (@@LogicalMaskLineXorEx),
@@ -181 +181 @@
   with Dst do
   begin
-    IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
+    GR32.IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
     if (SrcRect.Right < SrcRect.Left) or (SrcRect.Bottom < SrcRect.Top) then Exit;
 
@@ -187 +187 @@
     DstY := Clamp(DstY, 0, Height);
 
-    DstRect.TopLeft := Point(DstX, DstY);
+    DstRect.TopLeft := GR32.Point(DstX, DstY);
     DstRect.Right := DstX + SrcRect.Right - SrcRect.Left;
     DstRect.Bottom := DstY + SrcRect.Bottom - SrcRect.Top;
 
-    IntersectRect(DstRect, DstRect, BoundsRect);
-    IntersectRect(DstRect, DstRect, ClipRect);
+    GR32.IntersectRect(DstRect, DstRect, BoundsRect);
+    GR32.IntersectRect(DstRect, DstRect, ClipRect);
     if (DstRect.Right < DstRect.Left) or (DstRect.Bottom < DstRect.Top) then Exit;
 
@@ -480 +480 @@
   with Dst do
   begin
-    IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
+    GR32.IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
     if (SrcRect.Right < SrcRect.Left) or (SrcRect.Bottom < SrcRect.Top) then Exit;
 
@@ -486 +486 @@
     DstY := Clamp(DstY, 0, Height);
 
-    DstRect.TopLeft := Point(DstX, DstY);
+    DstRect.TopLeft := GR32.Point(DstX, DstY);
     DstRect.Right := DstX + SrcRect.Right - SrcRect.Left;
     DstRect.Bottom := DstY + SrcRect.Bottom - SrcRect.Top;
 
-    IntersectRect(DstRect, DstRect, Dst.BoundsRect);
-    IntersectRect(DstRect, DstRect, Dst.ClipRect);
-    if (DstRect.Right < DstRect.Left) or (DstRect.Bottom < DstRect.Top) then Exit;
-
+    GR32.IntersectRect(DstRect, DstRect, Dst.BoundsRect);
+    GR32.IntersectRect(DstRect, DstRect, Dst.ClipRect);
+    if (DstRect.Right < DstRect.Left) or (DstRect.Bottom < DstRect.Top) then
+      Exit;
 
     if not MeasuringMode then
@@ -530 +530 @@
   with ABitmap do
   begin
-    IntersectRect(ARect, ARect, BoundsRect);
-    IntersectRect(ARect, ARect, ClipRect);
+    GR32.IntersectRect(ARect, ARect, BoundsRect);
+    GR32.IntersectRect(ARect, ARect, ClipRect);
     if (ARect.Right < ARect.Left) or (ARect.Bottom < ARect.Top) then Exit;