Changeset 36 for trunk/Packages

Timestamp:

May 4, 2018, 1:36:00 PM (7 years ago)

Author:

chronos

Message:

• Modified: Drawing using pen with connected lines instead of individual pixels.
• Added: Negative image function for RGB8 format.

Location:

trunk/Packages/FastGraphics

Files:

• ColorFormats/UColorRGB8.pas (modified) (5 diffs)
• UFGraphics.pas (modified) (3 diffs)
• UGGraphics.pas (modified) (1 diff)

trunk/Packages/FastGraphics/ColorFormats/UColorRGB8.pas

@@ -47 +47 @@
     FillCallBack: TGetColorPos;
     function FillGetColor(Position: TPoint): TColorRGB8;
+    function NegativeFunc(Position: TPoint): TColorRGB8;
   protected
     function GetPixel(X, Y: Integer): IBColor;  override;
@@ -55 +56 @@
     procedure Mirror; override;
     procedure Flip; override;
+    procedure Negative; override;
     procedure Fill(Color: IBColor); override;
     procedure Fill(Func: TGetColorPos); override;
+    procedure Line(P1, P2: TPoint; Color: IBColor); override;
     procedure PaintToCanvas(Canvas: TCanvas); override;
     procedure PaintToCanvas(Canvas: TCanvas; Rect: TRect); override;
@@ -143 +146 @@
 end;
 
+function TBPixmapRGB8.NegativeFunc(Position: TPoint): TColorRGB8;
+var
+  C: TColorRGB8;
+begin
+  C := Pixmap.Pixels[Position.X, Position.Y];
+  Result.R := 255 - C.R;
+  Result.G := 255 - C.G;
+  Result.B := 255 - C.B;
+end;
+
 function TBPixmapRGB8.GetPixel(X, Y: Integer): IBColor;
 begin
@@ -169 +182 @@
 end;
 
+procedure TBPixmapRGB8.Negative;
+begin
+  Pixmap.Fill(NegativeFunc);
+end;
+
 procedure TBPixmapRGB8.Fill(Color: IBColor);
 begin
@@ -181 +199 @@
 end;
 
+procedure TBPixmapRGB8.Line(P1, P2: TPoint; Color: IBColor);
+begin
+  Pixmap.Canvas.Pen.Color := (Color as TBColorRGB8).Value;
+  Pixmap.Canvas.Pen.MoveTo(P1);
+  Pixmap.Canvas.Pen.LineTo(P2);
+end;
+
 procedure TBPixmapRGB8.PaintToCanvas(Canvas: TCanvas);
 begin

trunk/Packages/FastGraphics/UFGraphics.pas

@@ -42 +42 @@
     procedure Mirror; virtual;
     procedure Flip; virtual;
+    procedure Negative; virtual;
     procedure Fill(Color: IBColor); virtual; overload;
     procedure Fill(Func: TGetColorPos); virtual; overload;
@@ -391 +392 @@
 procedure TBImage.Mirror;
 begin
-
 end;
 
 procedure TBImage.Flip;
+begin
+end;
+
+procedure TBImage.Negative;
 begin
 end;
@@ -505 +509 @@
 procedure TFPixmap.Negative;
 begin
-
+  FBackend.Negative;
 end;
 

trunk/Packages/FastGraphics/UGGraphics.pas

@@ -344 +344 @@
       for X := 0 to FSize.X - 1 do begin
         if (X >= 0) and (X < FSize.X) and (Y >= 0) and (Y < FSize.Y) then
-          PInteger(DstPtr.Pixel)^ := ColorConvertFunc(PInteger(SrcPtr.Pixel)^);
+          PGColor(DstPtr.Pixel)^ := ColorConvertFunc(PInteger(SrcPtr.Pixel)^);
         SrcPtr.NextPixel;
         DstPtr.NextPixel;