Changeset 266 for branches/highdpi/Packages/CevoComponents/ScreenTools.pas

Timestamp:

Jun 26, 2020, 1:13:34 AM (4 years ago)

Author:

chronos

Message:

• Added: Application BeforeFinalization handler to free forms before finalization.

File:

• branches/highdpi/Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -406 +406 @@
     jtex := TDpiJpegImage.Create;
     try
-      jtex.LoadFromFile(Path);
-    except
-      Result := False;
-    end;
-    if Result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      Bmp.SetSize(jtex.Width, jtex.Height);
-      Bmp.Canvas.Draw(0, 0, jtex);
-    end;
-    jtex.Free;
+      try
+        jtex.LoadFromFile(Path);
+      except
+        Result := False;
+      end;
+      if Result then
+      begin
+        if Options and gfNoGamma = 0 then
+          bmp.PixelFormat := pf24bit;
+        Bmp.SetSize(jtex.Width, jtex.Height);
+        Bmp.Canvas.Draw(0, 0, jtex);
+      end;
+    finally
+      FreeAndNil(jtex);
+    end;
   end
   else
   if ExtractFileExt(Path) = '.png' then begin
     Png := TDpiPortableNetworkGraphic.Create;
-    Png.PixelFormat := Bmp.PixelFormat;
     try
-      Png.LoadFromFile(Path);
-    except
-      Result := False;
-    end;
-    if Result then
-    begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      bmp.SetSize(Png.Width, Png.Height);
-      if (Png.RawImage.Description.Format = ricfGray) then
-      begin
-        // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
-        Bmp.PixelFormat := pf24bit;
-        CopyGray8BitTo24bitBitmap(Bmp, Png);
-      end
-      else
-        Bmp.Canvas.draw(0, 0, Png);
-    end;
-    Png.Free;
-  end
-  else
+      Png.PixelFormat := Bmp.PixelFormat;
+      try
+        Png.LoadFromFile(Path);
+      except
+        Result := False;
+        end;
+      if Result then begin
+        if Options and gfNoGamma = 0 then
+          bmp.PixelFormat := pf24bit;
+        bmp.SetSize(Png.Width, Png.Height);
+        if (Png.RawImage.Description.Format = ricfGray) then
+        begin
+          // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
+          Bmp.PixelFormat := pf24bit;
+          CopyGray8BitTo24bitBitmap(Bmp, Png);
+        end else
+          Bmp.Canvas.draw(0, 0, Png);
+      end;
+    finally
+      FreeAndNil(Png);
+    end;
+  end else
   if ExtractFileExt(Path) = '.bmp' then begin
     try
@@ -455 +458 @@
         bmp.PixelFormat := pf24bit;
     end;
-  end
-  else
+  end else
     raise Exception.Create('Unsupported image file type ' + ExtractFileExt(Path));
 
@@ -1728 +1730 @@
   RestoreResolution;
   for I := 0 to nGrExt - 1 do begin
-    GrExt[I].Data.Free;
-    GrExt[I].Mask.Free;
+    FreeAndNil(GrExt[I].Data);
+    FreeAndNil(GrExt[I].Mask);
     FreeMem(GrExt[I]);
   end;