Changeset 22

Timestamp:

Dec 22, 2016, 1:13:04 PM (8 years ago)

Author:

chronos

Message:

• Modified: RGB8 related code moved to UColorRGB8 unit.

Location:

branches/gbitmap

Files:

• ColorFormats/UColorRGB8.pas (modified) (4 diffs)
• GImage.pas (modified) (3 diffs)
• UFormMain.pas (modified) (1 diff)
• UPixmapSpecialized.pas (modified) (4 diffs)

branches/gbitmap/ColorFormats/UColorRGB8.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, GPixmap, GImage;
+  Classes, SysUtils, GPixmap, GImage, Graphics;
 
 type
@@ -14 +14 @@
     constructor Create; override;
   end;
+
+  { TColorRGB8 }
+
+  TColorRGB8 = record
+    R: Byte;
+    B: Byte;
+    G: Byte;
+    function Create(R, G, B: Byte): TColorRGB8;
+  end;
+
+  TPixmapRGB8 = class(TGPixmap<TColorRGB8>)
+    function RGB8ToColor(Value: TColorRGB8): TColor;
+  end;
+
+  { TBColorRGB8 }
+
+  TBColorRGB8 = class(TBColor)
+    Value: TColorRGB8;
+    constructor Create(Color: TColorRGB8);
+    procedure SetColorName(ColorName: TColorName); override;
+    procedure SetRandom; override;
+  end;
+
+  { TBImageRGB8 }
+
+  TBImageRGB8 = class(TBImage)
+  private
+    FillCallBack: TGetColorPos;
+    function FillGetColor(Position: TPoint): TColorRGB8;
+  protected
+    procedure SetSize(AValue: TPoint); override;
+  public
+    Pixmap: TPixmapRGB8;
+    procedure Fill(Color: IBColor); override;
+    procedure Fill(Func: TGetColorPos); override;
+    procedure PaintToCanvas(Canvas: TCanvas); override;
+    function GetDataSize: Integer; override;
+    constructor Create; override;
+    destructor Destroy; override;
+  end;
+
 
 
@@ -25 +66 @@
   BitDepth := 24;
   Name := 'RGB8';
+  BackendImageClass := TBImageRGB8;
+  BackendColorClass := TBColorRGB8;
   AddChannel('Red', 0, 8);
   AddChannel('Green', 8, 8);
@@ -30 +73 @@
 end;
 
+{ TColorRGB8 }
+
+function TColorRGB8.Create(R, G, B: Byte): TColorRGB8;
+begin
+  Result.R := R;
+  Result.G := G;
+  Result.B := B;
+end;
+
+{ TPixmapRGB8 }
+
+function TPixmapRGB8.RGB8ToColor(Value: TColorRGB8): TColor;
+begin
+  Result := (Value.R shl 16) or (Value.G shl 8) or (Value.B shl 0);
+end;
+
+{ TBColorRGB8 }
+
+constructor TBColorRGB8.Create(Color: TColorRGB8);
+begin
+  Value := Color;
+end;
+
+procedure TBColorRGB8.SetColorName(ColorName: TColorName);
+begin
+  case ColorName of
+    cnBlack: Value := TColorRGB8.Create(0, 0, 0);
+    cnGray: Value := TColorRGB8.Create($80, $80, $80);
+    cnSilver: Value := TColorRGB8.Create($C0, $C0, $C0);
+    cnWhite: Value := TColorRGB8.Create($ff, $ff, $ff);
+    else Value := TColorRGB8.Create(0, 0, 0);;
+  end;
+end;
+
+procedure TBColorRGB8.SetRandom;
+begin
+  Value := TColorRGB8.Create(Random(256), Random(256), Random(256));
+end;
+
+{ TBImageRGB8 }
+
+function TBImageRGB8.FillGetColor(Position: TPoint): TColorRGB8;
+begin
+  Result := (FillCallBack(Position) as TBColorRGB8).Value;
+end;
+
+procedure TBImageRGB8.SetSize(AValue: TPoint);
+begin
+  inherited;
+  Pixmap.Size := AValue;
+end;
+
+procedure TBImageRGB8.Fill(Color: IBColor);
+begin
+  if Color is TBColorRGB8 then
+    Pixmap.Fill((Color as TBColorRGB8).Value);
+end;
+
+procedure TBImageRGB8.Fill(Func: TGetColorPos);
+begin
+  FillCallBack := Func;
+  Pixmap.Fill(FillGetColor);
+end;
+
+procedure TBImageRGB8.PaintToCanvas(Canvas: TCanvas);
+begin
+  Pixmap.PaintToCanvas(Canvas, Pixmap.RGB8ToColor);
+end;
+
+function TBImageRGB8.GetDataSize: Integer;
+begin
+  Result := Pixmap.GetDataSize;
+end;
+
+constructor TBImageRGB8.Create;
+begin
+  Pixmap := TPixmapRGB8.Create;
+end;
+
+destructor TBImageRGB8.Destroy;
+begin
+  FreeAndNil(Pixmap);
+  inherited Destroy;
+end;
+
+
 end.
 

branches/gbitmap/GImage.pas

@@ -24 +24 @@
 
   IBColorClass = class of TBColor;
-
-  { TBColorRGB8 }
-
-  TBColorRGB8 = class(TBColor)
-    Value: TColorRGB8;
-    constructor Create(Color: TColorRGB8);
-    procedure SetColorName(ColorName: TColorName); override;
-    procedure SetRandom; override;
-  end;
 
   { TBImage }
@@ -57 +48 @@
 
   TBPixmapClass = class of TBImage;
-
-  { TBImageRGB8 }
-
-  TBImageRGB8 = class(TBImage)
-  protected
-    procedure SetSize(AValue: TPoint); override;
-  public
-    Pixmap: TGPixmap<TColorRGB8>;
-    procedure Fill(Color: IBColor); override;
-    constructor Create;
-    destructor Destroy; override;
-  end;
 
   { TColorFormatChannel }
@@ -267 +246 @@
 end;
 
-{ TBColorRGB8 }
-
-constructor TBColorRGB8.Create(Color: TColorRGB8);
-begin
-  Value := Color;
-end;
-
-procedure TBColorRGB8.SetColorName(ColorName: TColorName);
-begin
-  case ColorName of
-    cnBlack: Value := TColorRGB8.Create(0, 0, 0);
-    cnGray: Value := TColorRGB8.Create($80, $80, $80);
-    cnSilver: Value := TColorRGB8.Create($C0, $C0, $C0);
-    cnWhite: Value := TColorRGB8.Create($ff, $ff, $ff);
-    else Value := TColorRGB8.Create(0, 0, 0);;
-  end;
-end;
-
-procedure TBColorRGB8.SetRandom;
-begin
-  Value := TColorRGB8.Create(Random(256), Random(256), Random(256));
-end;
-
-{ TBImageRGB8 }
-
-procedure TBImageRGB8.SetSize(AValue: TPoint);
-begin
-  inherited;
-  Pixmap.Size := AValue;
-end;
-
-procedure TBImageRGB8.Fill(Color: IBColor);
-begin
-  if Color is TBColorRGB8 then
-    Pixmap.Fill((Color as TBColorRGB8).Value);
-end;
-
-constructor TBImageRGB8.Create;
-begin
-  Pixmap := TGPixmap<TColorRGB8>.Create;
-end;
-
-destructor TBImageRGB8.Destroy;
-begin
-  FreeAndNil(Pixmap);
-  inherited Destroy;
-end;
-
 { TBImage }
 

branches/gbitmap/UFormMain.pas

@@ -276 +276 @@
   with Image do begin
     Size := Point(100, 100);
-    ColorFormat := ColorFormatManager.Formats[1];
+    ColorFormat := ColorFormatManager.Formats[5];
     Fill(GImage.TColor.Create(ColorFormat, cnWhite));
     Pixels[0, 0] := GImage.TColor.Create(ColorFormat, cnBlack);

branches/gbitmap/UPixmapSpecialized.pas

@@ -11 +11 @@
   TColorGray16 = Word;
   TColorGray32 = Cardinal;
-
-  { TColorRGB8 }
-
-  TColorRGB8 = record
-    R: Byte;
-    B: Byte;
-    G: Byte;
-    function Create(R, G, B: Byte): TColorRGB8;
-  end;
 
   { TColorRGB16 }
@@ -40 +31 @@
   TPixmapGray32 = class(TGPixmap<TColorGray32>)
     function Gray32ToColor(Value: TColorGray32): TColor;
-  end;
-
-  TPixmapRGB8 = class(TGPixmap<TColorRGB8>)
-    function RGB8ToColor(Value: TColorRGB8): TColor;
   end;
 
@@ -68 +55 @@
 end;
 
-{ TColorRGB8 }
-
-function TColorRGB8.Create(R, G, B: Byte): TColorRGB8;
-begin
-  Result.R := R;
-  Result.G := G;
-  Result.B := B;
-end;
-
 function TPixmapGray16.Gray16ToColor(Value: TColorGray16): TColor;
 begin
@@ -87 +65 @@
   Value := (Value shr 24) and $ff;
   Result := (Value shl 16) or (Value shl 8) or (Value shl 0);
-end;
-
-function TPixmapRGB8.RGB8ToColor(Value: TColorRGB8): TColor;
-begin
-  Result := (Value.R shl 16) or (Value.G shl 8) or (Value.B shl 0);
 end;