Changeset 8 for trunk

Timestamp:

Sep 19, 2014, 9:47:22 AM (10 years ago)

Author:

chronos

Message:

• Modified: To support generic custom user defined runtime color formats TGColor have to reference directly TGColorFormat class. Also it is faster as we don't need to create instance of TGColorFormat from TGColorFormatClass.

But used color formats can't be freed or their parameters modified.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (2 diffs)
• LibrePaint.lpi (modified) (1 diff)
• UCore.pas (modified) (1 diff)
• UGraphic.pas (modified) (15 diffs)

trunk/Forms/UFormNew.pas

@@ -47 +47 @@
   ColorFormat: TGColorFormat;
 begin
-  ColorFormat := ColorManager.Formats[ComboBoxColorFormat.ItemIndex].Create;
-  LabelMemRequire.Caption := IntToStr(SpinEditWidth.Value * SpinEditHeight.Value * ColorFormat.GetBitDepth div 8) + ' bytes';
-  ColorFormat.Free;
+  ColorFormat := ColorManager.Formats[ComboBoxColorFormat.ItemIndex];
+  LabelMemRequire.Caption := IntToStr(SpinEditWidth.Value * SpinEditHeight.Value *
+    ColorFormat.GetBitDepth div 8) + ' bytes';
 end;
 
@@ -59 +59 @@
   ComboBoxColorFormat.Clear;
   for I := 0 to ColorManager.FormatCount - 1 do begin
-    ColorFormat := ColorManager.Formats[I].Create;
+    ColorFormat := ColorManager.Formats[I];
     ComboBoxColorFormat.AddItem(ColorFormat.GetName, nil);
-    ColorFormat.Free;
   end;
   if ComboBoxColorFormat.Items.Count > 0 then

trunk/LibrePaint.lpi

@@ -99 +99 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormNew"/>
       </Unit4>
       <Unit5>

trunk/UCore.pas

@@ -74 +74 @@
 begin
   if FormNew.ShowModal = mrOk then begin
-    Project.Bitmap.ColorFormat := TGColorFormat;
+    Project.Bitmap.ColorFormat := TGColorFormat.Create;
 
     Project.FileName := 'New image';

trunk/UGraphic.pas

@@ -36 +36 @@
   TGColor = class
   private
-    FColorFormat: TGColorFormatClass;
+    FColorFormat: TGColorFormat;
     FData: PByte;
     function GetChannel(Channel: TGColorChannel): TGColor;
-    procedure SetColorFormat(AValue: TGColorFormatClass);
+    procedure SetColorFormat(AValue: TGColorFormat);
     procedure LoadData(BitmapData: Pointer); virtual;
     procedure SaveData(BitmapData: Pointer); virtual;
@@ -50 +50 @@
     property Data: PByte read FData;
   published
-    property Format: TGColorFormatClass read FColorFormat write SetColorFormat;
+    property Format: TGColorFormat read FColorFormat write SetColorFormat;
   end;
 
@@ -59 +59 @@
     FBackgroundColor: TGColor;
     FCanvas: TGCanvas;
-    FColorFormat: TGColorFormatClass;
+    FColorFormat: TGColorFormat;
     FDPI: Integer;
     FSize: TPoint;
@@ -66 +66 @@
     function GetSize: TPoint;
     procedure SetBackgroundColor(AValue: TGColor);
-    procedure SetColorFormat(AValue: TGColorFormatClass);
+    procedure SetColorFormat(AValue: TGColorFormat);
     procedure SetPixel(X, Y: Integer; AValue: TGColor);
     procedure SetSize(AValue: TPoint);
@@ -81 +81 @@
     property BackgroundColor: TGColor read FBackgroundColor write SetBackgroundColor;
     property DPI: Integer read FDPI write FDPI;
-    property ColorFormat: TGColorFormatClass read FColorFormat write SetColorFormat;
+    property ColorFormat: TGColorFormat read FColorFormat write SetColorFormat;
     property Size: TPoint read FSize write SetSize;
     property Pixels[X, Y: Integer]: TGColor read GetPixel write SetPixel;
@@ -93 +93 @@
   private
     FFormats: TObjectList; // TList<TGColorFormatClass>
-    function GetFormat(Index: Integer): TGColorFormatClass;
+    function GetFormat(Index: Integer): TGColorFormat;
   public
     constructor Create; virtual;
@@ -99 +99 @@
     procedure RegisterFormat(Format: TGColorFormatClass);
     function FormatCount: Integer;
-    property Formats[Index: Integer]: TGColorFormatClass read GetFormat;
+    property Formats[Index: Integer]: TGColorFormat read GetFormat;
   end;
 
@@ -200 +200 @@
 { TGColorManager }
 
-function TGColorManager.GetFormat(Index: Integer): TGColorFormatClass;
-begin
-  Result := TGColorFormatClass(FFormats[Index])
+function TGColorManager.GetFormat(Index: Integer): TGColorFormat;
+begin
+  Result := TGColorFormat(FFormats[Index])
 end;
 
@@ -208 +208 @@
 begin
   FFormats := TObjectList.Create;
-  FFormats.OwnsObjects := False;
 end;
 
@@ -219 +218 @@
 procedure TGColorManager.RegisterFormat(Format: TGColorFormatClass);
 begin
-  FFormats.Add(TObject(Format));
+  FFormats.Add(Format.Create);
 end;
 
@@ -281 +280 @@
 end;
 
-procedure TGColor.SetColorFormat(AValue: TGColorFormatClass);
-var
-  F: TGColorFormat;
+procedure TGColor.SetColorFormat(AValue: TGColorFormat);
 begin
   if FColorFormat = AValue then Exit;
   FColorFormat := AValue;
-  F := FColorFormat.Create;
-  ReAllocMem(FData, F.GetPixelSize);
-  F.Free;
+  ReAllocMem(FData, FColorFormat.GetPixelSize);
 end;
 
 procedure TGColor.LoadData(BitmapData: Pointer);
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Move(BitmapData^, FData^, F.GetPixelSize);
-  F.Free;
+begin
+  Move(BitmapData^, FData^, FColorFormat.GetPixelSize);
 end;
 
 procedure TGColor.SaveData(BitmapData: Pointer);
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Move(FData^, BitmapData^, F.GetPixelSize);
-  F.Free;
+begin
+  Move(FData^, BitmapData^, FColorFormat.GetPixelSize);
 end;
 
 function TGColor.ToTColor: TColor;
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Result := F.ColorToTColor(Self);
-  F.Free;
+begin
+  Result := FColorFormat.ColorToTColor(Self);
 end;
 
 procedure TGColor.FromTColor(Color: TColor);
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  F.ColorFromTColor(Self, Color);
-  F.Free;
+begin
+  FColorFormat.ColorFromTColor(Self, Color);
 end;
 
@@ -334 +313 @@
 constructor TGColor.Create;
 begin
-  Format := TGColorFormat;
+  Format := TGColorFormat.Create;
 end;
 
@@ -357 +336 @@
 end;
 
-procedure TGBitmap.SetColorFormat(AValue: TGColorFormatClass);
+procedure TGBitmap.SetColorFormat(AValue: TGColorFormat);
 begin
   if FColorFormat = AValue then Exit;
@@ -378 +357 @@
 
 function TGBitmap.GetPixelDataPos(X, Y: Integer): Pointer;
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Result := FData + X * F.GetPixelSize + Y * F.GetPixelSize * FSize.X;
-  F.Free;
+begin
+  Result := FData + X * FColorFormat.GetPixelSize + Y * FColorFormat.GetPixelSize * FSize.X;
 end;
 
 function TGBitmap.GetDataSize: Integer;
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Result := Size.X * Size.Y * F.GetPixelSize;
-  F.Free;
+begin
+  Result := Size.X * Size.Y * FColorFormat.GetPixelSize;
 end;
 
@@ -471 +442 @@
   FData := GetMem(0);
   FBackgroundColor := TGColor.Create;
-  ColorFormat := TGColorFormat;
+  ColorFormat := TGColorFormat.Create;
   FBackgroundColor.Format := ColorFormat;
   FBackgroundColor.FromTColor(clBlack);