Changeset 9 for trunk/UGraphic.pas

Timestamp:

Sep 21, 2014, 8:11:48 PM (10 years ago)

Author:

chronos

Message:

• Modified: Not TGBitmap and TGColor data are stored as TBitMemory to support color formats with lower bit width size then 8.

Location:

trunk

Files:

• . (modified) (1 prop)
• UGraphic.pas (modified) (20 diffs)

trunk

@@ -2 +2 @@
 LibrePaint
 lib
+backup

@@ -2 +2 @@
 LibrePaint
 lib
+backup

trunk/UGraphic.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, Contnrs;
+  Classes, SysUtils, Graphics, Contnrs, UMemory;
 
 type
@@ -13 +13 @@
   TGColor = class;
   TGCanvas = class;
-
-  TGColorClass = class of TGColor;
+  TGBitmap = class;
 
   { TGColorFormat }
@@ -24 +23 @@
     function GetChannelBitPos(Channel: TGColorChannel): Integer; virtual;
     function GetChannelBitWidth(Channel: TGColorChannel): Integer; virtual;
+    function GetChannelStateCount(Channel: TGColorChannel): Integer; virtual;
     function ChannelUsed(Channel: TGColorChannel): Boolean;
     function ColorToTColor(Color: TGColor): TColor; virtual;
     procedure ColorFromTColor(GColor: TGColor; Color: TColor); virtual;
-    function GetColorClass: TGColorClass; virtual;
   end;
 
@@ -37 +36 @@
   private
     FColorFormat: TGColorFormat;
-    FData: PByte;
+    FData: TBitMemory;
     function GetChannel(Channel: TGColorChannel): TGColor;
     procedure SetColorFormat(AValue: TGColorFormat);
-    procedure LoadData(BitmapData: Pointer); virtual;
-    procedure SaveData(BitmapData: Pointer); virtual;
+    procedure LoadData(Bitmap: TGBitmap; Position: Integer); virtual;
+    procedure SaveData(Bitmap: TGBitmap; Position: Integer); virtual;
   public
     function ToTColor: TColor;
@@ -48 +47 @@
     constructor Create;
     property Channels[Channel: TGColorChannel]: TGColor read GetChannel;
-    property Data: PByte read FData;
+    property Data: TBitMemory read FData;
   published
     property Format: TGColorFormat read FColorFormat write SetColorFormat;
@@ -62 +61 @@
     FDPI: Integer;
     FSize: TPoint;
-    FData: PByte;
+    FData: TBitMemory;
     function GetPixel(X, Y: Integer): TGColor;
     function GetSize: TPoint;
@@ -69 +68 @@
     procedure SetPixel(X, Y: Integer; AValue: TGColor);
     procedure SetSize(AValue: TPoint);
-    function GetPixelDataPos(X, Y: Integer): Pointer;
+    function GetPixelDataPos(X, Y: Integer): Integer;
+    procedure CheckLimits(X, Y: Integer);
   public
     function GetDataSize: Integer;
@@ -79 +79 @@
     constructor Create; virtual;
     destructor Destroy; override;
+    property Data: TBitMemory read FData;
     property BackgroundColor: TGColor read FBackgroundColor write SetBackgroundColor;
     property DPI: Integer read FDPI write FDPI;
@@ -253 +254 @@
 end;
 
+function TGColorFormat.GetChannelStateCount(Channel: TGColorChannel): Integer;
+begin
+  Result := 1 shl GetChannelBitWidth(Channel);
+end;
+
 function TGColorFormat.ChannelUsed(Channel: TGColorChannel): Boolean;
 begin
@@ -259 +265 @@
 
 function TGColorFormat.ColorToTColor(Color: TGColor): TColor;
-begin
-  Result := clBlack;
+var
+  Channel: TBitMemory;
+begin
+  Result := 0;
+  Channel := TBitMemory.Create;
+
+  if GetChannelBitWidth(ccRed) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccRed);
+    Color.Data.ReadBlock(Channel, GetChannelBitPos(ccRed));
+    Result := Result or (Trunc(Channel.GetInteger * 255 / (GetChannelStateCount(ccRed) - 1)) shl 0);
+  end;
+
+  if GetChannelBitWidth(ccGreen) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccGreen);
+    Color.Data.ReadBlock(Channel, GetChannelBitPos(ccGreen));
+    Result := Result or (Trunc(Channel.GetInteger * 255 / (GetChannelStateCount(ccGreen) - 1)) shl 8);
+  end;
+
+  if GetChannelBitWidth(ccBlue) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccBlue);
+    Color.Data.ReadBlock(Channel, GetChannelBitPos(ccBlue));
+    Result := Result or (Trunc(Channel.GetInteger * 255 / (GetChannelStateCount(ccBlue) - 1)) shl 16);
+  end;
+
+  if GetChannelBitWidth(ccGray) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccGray);
+    Color.Data.ReadBlock(Channel, GetChannelBitPos(ccGray));
+    Result := $010101 * Trunc(Channel.GetInteger * 255 / (GetChannelStateCount(ccGray) - 1));
+  end;
+
+  Channel.Free;
 end;
 
 procedure TGColorFormat.ColorFromTColor(GColor: TGColor; Color: TColor);
-begin
-  FillChar(GColor.Data^, GetPixelSize, 0);
-end;
-
-function TGColorFormat.GetColorClass: TGColorClass;
-begin
-  Result := TGColor;
+var
+  Channel: TBitMemory;
+begin
+  GColor.Data.Clear(0);
+  Channel := TBitMemory.Create;
+
+  if GetChannelBitWidth(ccRed) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccRed);
+    Channel.SetInteger(((Color shr 0) and $ff) * GetChannelStateCount(ccRed) div 256);
+    GColor.Data.WriteBlock(Channel, GetChannelBitPos(ccRed));
+  end;
+
+  if GetChannelBitWidth(ccGreen) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccGreen);
+    Channel.SetInteger(((Color shr 8) and $ff) * GetChannelStateCount(ccGreen) div 256);
+    GColor.Data.WriteBlock(Channel, GetChannelBitPos(ccGreen));
+  end;
+
+  if GetChannelBitWidth(ccBlue) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccBlue);
+    Channel.SetInteger(((Color shr 16) and $ff) * GetChannelStateCount(ccBlue) div 256);
+    GColor.Data.WriteBlock(Channel, GetChannelBitPos(ccBlue));
+  end;
+
+  if GetChannelBitWidth(ccGray) > 0 then begin
+    Channel.Size := GetChannelBitWidth(ccGray);
+    Channel.SetInteger((((Color shr 16) and $ff) + ((Color shr 8) and $ff) + ((Color shr 0) and $ff))
+      * GetChannelStateCount(ccGray) div (3 * 256));
+    GColor.Data.WriteBlock(Channel, GetChannelBitPos(ccGray));
+  end;
+
+  Channel.Free;
 end;
 
@@ -284 +344 @@
   if FColorFormat = AValue then Exit;
   FColorFormat := AValue;
-  ReAllocMem(FData, FColorFormat.GetPixelSize);
-end;
-
-procedure TGColor.LoadData(BitmapData: Pointer);
-begin
-  Move(BitmapData^, FData^, FColorFormat.GetPixelSize);
-end;
-
-procedure TGColor.SaveData(BitmapData: Pointer);
-begin
-  Move(FData^, BitmapData^, FColorFormat.GetPixelSize);
+  FData.Size := FColorFormat.GetPixelSize;
+end;
+
+procedure TGColor.LoadData(Bitmap: TGBitmap; Position: Integer);
+begin
+  Bitmap.Data.ReadBlock(FData, Position);
+end;
+
+procedure TGColor.SaveData(Bitmap: TGBitmap; Position: Integer);
+begin
+  Bitmap.Data.WriteBlock(FData, Position);
 end;
 
@@ -313 +373 @@
 constructor TGColor.Create;
 begin
+  FData := TBitMemory.Create;
   Format := TGColorFormat.Create;
 end;
@@ -320 +381 @@
 function TGBitmap.GetPixel(X, Y: Integer): TGColor;
 begin
+  CheckLimits(X, Y);
   Result := TGColor.Create;
   Result.Format := ColorFormat;
-  Result.LoadData(GetPixelDataPos(X, Y));
+  Result.LoadData(Self, GetPixelDataPos(X, Y));
 end;
 
@@ -340 +402 @@
   if FColorFormat = AValue then Exit;
   FColorFormat := AValue;
-  ReAllocMem(FData, GetDataSize);
+  FData.Size := GetDataSize;
   FBackgroundColor.Format := ColorFormat;
 end;
@@ -346 +408 @@
 procedure TGBitmap.SetPixel(X, Y: Integer; AValue: TGColor);
 begin
-  AValue.SaveData(GetPixelDataPos(X, Y));
+  CheckLimits(X, Y);
+  FData.WriteBlock(AValue.Data, GetPixelDataPos(X, Y));
 end;
 
@@ -353 +416 @@
   if (FSize.X = AValue.X) and (FSize.Y = AValue.Y) then Exit;
   FSize := AValue;
-  ReAllocMem(FData, GetDataSize);
-end;
-
-function TGBitmap.GetPixelDataPos(X, Y: Integer): Pointer;
-begin
-  Result := FData + X * FColorFormat.GetPixelSize + Y * FColorFormat.GetPixelSize * FSize.X;
+  FData.Size := GetDataSize;
+end;
+
+function TGBitmap.GetPixelDataPos(X, Y: Integer): Integer;
+begin
+  Result := X * FColorFormat.GetPixelSize + Y * FColorFormat.GetPixelSize * FSize.X;
+end;
+
+procedure TGBitmap.CheckLimits(X, Y: Integer);
+begin
+  if (X < 0) or (Y < 0) or (X >= Size.X) or (Y >= Size.Y) then
+    raise Exception.Create('Out of range');
 end;
 
@@ -399 +468 @@
   X, Y: Integer;
   Color: TGColor;
+  F: Cardinal;
 begin
   Color := TGColor.Create;
@@ -405 +475 @@
     for X := 0 to Size.X - 1 do begin
       Color.FromTColor(System.Random($ffffff));
+      F := Cardinal(Color.Data.GetInteger);
+
       Pixels[X, Y] := Color;
     end;
@@ -440 +512 @@
 constructor TGBitmap.Create;
 begin
-  FData := GetMem(0);
+  FData := TBitMemory.Create;
   FBackgroundColor := TGColor.Create;
   ColorFormat := TGColorFormat.Create;
@@ -451 +523 @@
 destructor TGBitmap.Destroy;
 begin
+  Size := Point(0, 0);
+  FData.Free;
   inherited Destroy;
-  Size := Point(0, 0);
 end;
 

@@ -2 +2 @@
 LibrePaint
 lib
+backup