Changeset 14 for trunk/UGraphic.pas

Timestamp:

Sep 22, 2014, 5:40:17 PM (10 years ago)

Author:

chronos

Message:

• Modified: Color format properties are now initialized as variables instead by executing function.

File:

• trunk/UGraphic.pas (modified) (8 diffs)

trunk/UGraphic.pas

@@ -15 +15 @@
   TGBitmap = class;
 
+  TGColorFormatChannel = record
+    BitWidth: Integer;
+    Position: Integer;
+  end;
+
   { TGColorFormat }
 
   TGColorFormat = class
-    function GetBitDepth: Integer; virtual;
-    function GetPixelSize: Integer; virtual;
-    function GetName: string; virtual;
-    function GetChannelBitPos(Channel: TGColorChannel): Integer; virtual;
-    function GetChannelBitWidth(Channel: TGColorChannel): Integer; virtual;
+    BitDepth: Integer;
+    Name: string;
+    Channels: array[TGColorChannel] of TGColorFormatChannel;
+    constructor Create; virtual;
     function GetChannelStateCount(Channel: TGColorChannel): Integer; virtual;
     function ChannelUsed(Channel: TGColorChannel): Boolean;
@@ -233 +237 @@
 { TGColorFormat }
 
-function TGColorFormat.GetBitDepth: Integer;
-begin
-  Result := 0;
-end;
-
-function TGColorFormat.GetPixelSize: Integer;
-begin
-  Result := 0;
-end;
-
-function TGColorFormat.GetName: string;
-begin
-  Result := '';
-end;
-
-function TGColorFormat.GetChannelBitPos(Channel: TGColorChannel): Integer;
-begin
-
-end;
-
-function TGColorFormat.GetChannelBitWidth(Channel: TGColorChannel): Integer;
-begin
-  Result := 0;
+constructor TGColorFormat.Create;
+var
+  Channel: TGColorChannel;
+begin
+  Name := '';
+  BitDepth := 0;
+  for Channel := Low(TGColorChannel) to High(TGColorChannel) do begin
+    Channels[Channel].BitWidth := 0;
+    Channels[Channel].Position := 0;
+  end;
 end;
 
 function TGColorFormat.GetChannelStateCount(Channel: TGColorChannel): Integer;
 begin
-  Result := 1 shl GetChannelBitWidth(Channel);
+  Result := 1 shl Channels[Channel].BitWidth;
 end;
 
 function TGColorFormat.ChannelUsed(Channel: TGColorChannel): Boolean;
 begin
-  Result := GetChannelBitWidth(Channel) > 0;
+  Result := Channels[Channel].BitWidth > 0;
 end;
 
@@ -275 +266 @@
   Channel := TBitMemory.Create;
 
-  if GetChannelBitWidth(ccRed) > 0 then begin
-    Channel.Size := GetChannelBitWidth(ccRed);
-    Color.Data.ReadBlock(Channel, GetChannelBitPos(ccRed));
+  if Channels[ccRed].BitWidth > 0 then begin
+    Channel.Size := Channels[ccRed].BitWidth;
+    Color.Data.ReadBlock(Channel, Channels[ccRed].Position);
     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));
+  if Channels[ccGreen].BitWidth > 0 then begin
+    Channel.Size := Channels[ccGreen].BitWidth;
+    Color.Data.ReadBlock(Channel, Channels[ccGreen].Position);
     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));
+  if Channels[ccBlue].BitWidth > 0 then begin
+    Channel.Size := Channels[ccBlue].BitWidth;
+    Color.Data.ReadBlock(Channel, Channels[ccBlue].Position);
     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));
+  if Channels[ccGray].BitWidth > 0 then begin
+    Channel.Size := Channels[ccGray].BitWidth;
+    Color.Data.ReadBlock(Channel, Channels[ccGray].Position);
     Result := $010101 * Trunc(Channel.GetInteger * 255 / (GetChannelStateCount(ccGray) - 1));
   end;
@@ -309 +300 @@
   Channel := TBitMemory.Create;
 
-  if GetChannelBitWidth(ccRed) > 0 then begin
-    Channel.Size := GetChannelBitWidth(ccRed);
+  if Channels[ccRed].BitWidth > 0 then begin
+    Channel.Size := Channels[ccRed].BitWidth;
     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);
+    GColor.Data.WriteBlock(Channel, Channels[ccRed].Position);
+  end;
+
+  if Channels[ccGreen].BitWidth > 0 then begin
+    Channel.Size := Channels[ccGreen].BitWidth;
     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);
+    GColor.Data.WriteBlock(Channel, Channels[ccGreen].Position);
+  end;
+
+  if Channels[ccBlue].BitWidth > 0 then begin
+    Channel.Size := Channels[ccBlue].BitWidth;
     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);
+    GColor.Data.WriteBlock(Channel, Channels[ccBlue].Position);
+  end;
+
+  if Channels[ccGray].BitWidth > 0 then begin
+    Channel.Size := Channels[ccGray].BitWidth;
     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));
+    GColor.Data.WriteBlock(Channel, Channels[ccGray].Position);
   end;
 
@@ -348 +339 @@
   if FColorFormat = AValue then Exit;
   FColorFormat := AValue;
-  FData.Size := FColorFormat.GetPixelSize;
+  FData.Size := FColorFormat.BitDepth;
 end;
 
@@ -377 +368 @@
   Channel := TBitMemory.Create;
 
-  if Format.GetChannelBitWidth(ccRed) > 0 then begin
-    Channel.Size := Format.GetChannelBitWidth(ccRed);
-    Data.ReadBlock(Channel, Format.GetChannelBitPos(ccRed));
+  if Format.Channels[ccRed].BitWidth > 0 then begin
+    Channel.Size := Format.Channels[ccRed].BitWidth;
+    Data.ReadBlock(Channel, Format.Channels[ccRed].Position);
     Channel.Invert;
-    Data.WriteBlock(Channel, Format.GetChannelBitPos(ccRed));
-  end;
-
-  if Format.GetChannelBitWidth(ccGreen) > 0 then begin
-    Channel.Size := Format.GetChannelBitWidth(ccGreen);
-    Data.ReadBlock(Channel, Format.GetChannelBitPos(ccGreen));
+    Data.WriteBlock(Channel, Format.Channels[ccRed].Position);
+  end;
+
+  if Format.Channels[ccGreen].BitWidth > 0 then begin
+    Channel.Size := Format.Channels[ccGreen].BitWidth;
+    Data.ReadBlock(Channel, Format.Channels[ccGreen].Position);
     Channel.Invert;
-    Data.WriteBlock(Channel, Format.GetChannelBitPos(ccGreen));
-  end;
-
-  if Format.GetChannelBitWidth(ccBlue) > 0 then begin
-    Channel.Size := Format.GetChannelBitWidth(ccBlue);
-    Data.ReadBlock(Channel, Format.GetChannelBitPos(ccBlue));
+    Data.WriteBlock(Channel, Format.Channels[ccGreen].Position);
+  end;
+
+  if Format.Channels[ccBlue].BitWidth > 0 then begin
+    Channel.Size := Format.Channels[ccBlue].BitWidth;
+    Data.ReadBlock(Channel, Format.Channels[ccBlue].Position);
     Channel.Invert;
-    Data.WriteBlock(Channel, Format.GetChannelBitPos(ccBlue));
-  end;
-
-  if Format.GetChannelBitWidth(ccGray) > 0 then begin
-    Channel.Size := Format.GetChannelBitWidth(ccGray);
-    Data.ReadBlock(Channel, Format.GetChannelBitPos(ccGray));
+    Data.WriteBlock(Channel, Format.Channels[ccBlue].Position);
+  end;
+
+  if Format.Channels[ccGray].BitWidth > 0 then begin
+    Channel.Size := Format.Channels[ccGray].BitWidth;
+    Data.ReadBlock(Channel, Format.Channels[ccGray].Position);
     Channel.Invert;
-    Data.WriteBlock(Channel, Format.GetChannelBitPos(ccGray));
+    Data.WriteBlock(Channel, Format.Channels[ccGray].Position);
   end;
 
@@ -462 +453 @@
 function TGBitmap.GetPixelDataPos(X, Y: Integer): Integer;
 begin
-  Result := X * FColorFormat.GetPixelSize + Y * FColorFormat.GetPixelSize * FSize.X;
+  Result := X * FColorFormat.BitDepth + Y * FColorFormat.BitDepth * FSize.X;
 end;
 
@@ -496 +487 @@
 function TGBitmap.GetDataSize: Integer;
 begin
-  Result := Size.X * Size.Y * FColorFormat.GetPixelSize;
+  Result := Size.X * Size.Y * FColorFormat.BitDepth;
 end;