Changeset 15 for trunk

Timestamp:

Sep 22, 2014, 11:06:27 PM (10 years ago)

Author:

chronos

Message:

• Added: Memory leaks reporting in debug mode.
• Fixed: Various memory leaks in bitmap, color and colorformat classes.

Location:

trunk

Files:

• ColorFormats/UColorRGBA8.pas (modified) (1 diff)
• LibrePaint.lpi (modified) (2 diffs)
• LibrePaint.lpr (modified) (2 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UGraphic.pas (modified) (7 diffs)
• UMemory.pas (modified) (2 diffs)

trunk/ColorFormats/UColorRGBA8.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UGraphic, UMemory;
+  Classes, SysUtils, Graphics, UGraphic;
 
 type

trunk/LibrePaint.lpi

@@ -170 +170 @@
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>
@@ -176 +179 @@
       </Options>
     </Linking>
+    <Other>
+      <CustomOptions Value="-dDEBUG"/>
+    </Other>
   </CompilerOptions>
   <Debugging>

trunk/LibrePaint.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UCore, UGraphic, UProject, UMemory, UFormNew, UFormMain,
+  SysUtils, Forms, UCore, UGraphic, UProject, UMemory, UFormNew, UFormMain,
   UColorRGBA8, UColorGray8, UColorGray1, UColorGray4, UColorRGB565
   { you can add units after this };
@@ -14 +14 @@
 {$R *.res}
 
+{$IFDEF DEBUG}
+const
+  HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
+
 begin
+  {$IFDEF DEBUG}
+  // Heap trace
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
+
   RequireDerivedFormResource := True;
   Application.Initialize;

trunk/UCore.lfm

@@ -1 +1 @@
 object Core: TCore
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   OldCreateOrder = False
   Height = 491

trunk/UCore.pas

@@ -57 +57 @@
     procedure AZoomOutExecute(Sender: TObject);
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     { private declarations }
@@ -94 +95 @@
 end;
 
+procedure TCore.DataModuleDestroy(Sender: TObject);
+begin
+  Project.Free;
+end;
+
 procedure TCore.Init;
 begin
   // Set default
+  Project.Bitmap.ColorFormat := ColorManager.Formats[0];
   Project.Bitmap.Size := Point(200, 100);
   if ColorManager.FormatCount > 0 then
@@ -114 +121 @@
     Project.Bitmap.BackgroundColor.FromTColor(clBlack);
     Project.Bitmap.DPI := FormNew.SpinEditDPI.Value;
-    AZoomAll.Execute;;
+    AZoomAll.Execute;
   end;
 end;

trunk/UGraphic.pas

@@ -51 +51 @@
     procedure Assign(Source: TGColor); virtual;
     constructor Create;
+    destructor Destroy; override;
     property Channels[Channel: TGColorChannel]: TGColor read GetChannel;
     property Data: TBitMemory read FData;
@@ -339 +340 @@
   if FColorFormat = AValue then Exit;
   FColorFormat := AValue;
-  FData.Size := FColorFormat.BitDepth;
+  if Assigned(FColorFormat) then
+    FData.Size := FColorFormat.BitDepth
+    else FData.Size := 0;
 end;
 
@@ -406 +409 @@
 begin
   FData := TBitMemory.Create;
-  Format := TGColorFormat.Create;
+  Format := nil;
+end;
+
+destructor TGColor.Destroy;
+begin
+  FData.Free;
+  inherited Destroy;
 end;
 
@@ -566 +575 @@
   X, Y: Integer;
   Color: TGColor;
+  Color2: TGColor;
 begin
   for Y := 0 to Size.Y div 2 - 1 do
     for X := 0 to Size.X - 1 do begin
       Color := Pixels[X, Y];
-      Pixels[X, Y] := Pixels[X, Size.Y - 1 - Y];
+      Color2 := Pixels[X, Size.Y - 1 - Y];
+      Pixels[X, Y] := Color2;
+      Color2.Free;
       Pixels[X, Size.Y - 1 - Y] := Color;
       Color.Free;
@@ -580 +592 @@
   X, Y: Integer;
   Color: TGColor;
+  Color2: TGColor;
 begin
   for Y := 0 to Size.Y - 1 do
     for X := 0 to Size.X div 2 - 1 do begin
       Color := Pixels[X, Y];
-      Pixels[X, Y] := Pixels[Size.X - 1 - X, Y];
+      Color2 := Pixels[Size.X - 1 - X, Y];
+      Pixels[X, Y] := Color2;
+      Color2.Free;
       Pixels[Size.X - 1 - X, Y] := Color;
       Color.Free;
@@ -608 +623 @@
   FData := TBitMemory.Create;
   FBackgroundColor := TGColor.Create;
-  ColorFormat := TGColorFormat.Create;
-  FBackgroundColor.Format := ColorFormat;
-  FBackgroundColor.FromTColor(clBlack);
+  ColorFormat := nil;
   Canvas := TGCanvas.Create;
   Canvas.Bitmap := Self;
@@ -617 +630 @@
 destructor TGBitmap.Destroy;
 begin
+  FBackgroundColor.Free;
+  Canvas.Free;
   Size := Point(0, 0);
   FData.Free;

trunk/UMemory.pas

@@ -89 +89 @@
     procedure SetItem(Index: Integer; AValue: Byte); override;
   public
+    constructor Create;
+    destructor Destroy; override;
     function GetInteger: Integer; override;
     procedure SetInteger(Value: Integer); override;
@@ -203 +205 @@
 end;
 
+constructor TBitMemory.Create;
+begin
+  FData := nil;
+end;
+
+destructor TBitMemory.Destroy;
+begin
+  FreeMem(FData);
+  inherited Destroy;
+end;
+
 { TBitBlock }