Changeset 33 for trunk/Packages

Timestamp:

Jan 5, 2017, 11:48:36 PM (8 years ago)

Author:

chronos

Message:

• Added: Remember last used image size and color format.
• Added: Automatically create blank image.

Location:

trunk/Packages/FastGraphics

Files:

• UFGraphics.pas (modified) (5 diffs)
• UGGraphics.pas (modified) (2 diffs)

trunk/Packages/FastGraphics/UFGraphics.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UGGraphics, UPixmapSpecialized, Contnrs;
+  Classes, SysUtils, Graphics, UGGraphics, UPixmapSpecialized, Fgl;
 
 type
@@ -81 +81 @@
   end;
 
+  TColorFormats  = class(TFPGObjectList<TColorFormat>)
+  end;
+
   TColorFormatClass = class of TColorFormat;
 
@@ -87 +90 @@
   TColorFormatManager = class
   private
-    FFormats: TObjectList; // TList<TColorFormat>
+    FFormats: TColorFormats;
     function GetFormat(Index: Integer): TColorFormat;
   public
     constructor Create; virtual;
-     destructor Destroy; override;
+    destructor Destroy; override;
+    function FindByName(Name: string): Integer;
     procedure RegisterFormat(Format: TColorFormatClass);
     function FormatCount: Integer;
-    property Formats[Index: Integer]: TColorFormat read GetFormat;
+    property Formats: TColorFormats read FFormats;
   end;
 
@@ -261 +265 @@
 constructor TColorFormatManager.Create;
 begin
-  FFormats := TObjectList.Create;
+  FFormats := TColorFormats.Create;
 end;
 
@@ -268 +272 @@
   FreeAndNil(FFormats);
   inherited Destroy;
+end;
+
+function TColorFormatManager.FindByName(Name: string): Integer;
+var
+  I: Integer;
+begin
+  Result := -1;
+  for I := 0 to FFormats.Count - 1 do begin
+    if FFormats[I].Name = Name then begin
+      Result := I;
+      Break;
+    end;
+  end;
 end;
 

trunk/Packages/FastGraphics/UGGraphics.pas

@@ -203 +203 @@
   PixelPtrMin: PInteger;
   PixelRowPtr: PInteger;
-  P: TPixelFormat;
   RawImage: TRawImage;
   BytePerPixel: Integer;
@@ -218 +217 @@
       for X := Rect.Left to Rect.Right - 1 do begin
         if (X >= 0) and (X < FSize.X) and (Y >= 0) and (Y < FSize.Y) and
-        (PixelPtr < PixelPtrMax) and (PixelPtr > PixelPtrMin) then
+        (PixelPtr < PixelPtrMax) and (PixelPtr >= PixelPtrMin) then begin
           PixelPtr^ := ColorConvertFunc(Pixels[X, Y]);
+        end;
         Inc(PByte(PixelPtr), BytePerPixel);
-
       end;
       Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);