ver.2.6.0

- Added support for Windows 11
- Updated Image32 Library
- Fixed resize content

Author: carloBarazzetta

Ext/SVGIconImageList/Image32/source/Img32.CQ.pas

@@ -2,8 +2,8 @@
 
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Version   :  3.0                                                             *
-* Date      :  20 July 2021                                                    *
+* Version   :  4.0                                                             *
+* Date      :  22 December 2021                                                *
 * Website   :  http://www.angusj.com                                           *
 * Copyright :  Angus Johnson 2019-2021                                         *
 * Purpose   :  GIF file format extension for TImage32                          *
@@ -114,10 +114,16 @@ procedure TImageFormat_GIF.SaveToStream(stream: TStream; img32: TImage32);
   gif: TGIFImage;
 begin
   gif := TGIFImage.Create;
+  with gif.Bitmap do
   try
-    gif.Bitmap.Width := img32.Width;
-    gif.Bitmap.Height := img32.Height;
-    img32.CopyToDc(gif.Bitmap.Canvas.Handle,0,0, false);
+    Width := img32.Width;
+    Height := img32.Height;
+    if GetCurrentThreadId <> MainThreadID then Canvas.Lock;
+    try
+      img32.CopyToDc(gif.Bitmap.Canvas.Handle,0,0, false);
+    finally
+      if GetCurrentThreadId <> MainThreadID then Canvas.Unlock;
+    end;
     gif.SaveToStream(stream);
   finally
     gif.Free;

Ext/SVGIconImageList/Image32/source/Img32.Draw.pas

@@ -2,8 +2,8 @@
 
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Version   :  3.2                                                             *
-* Date      :  19 August 2021                                                  *
+* Version   :  4.0                                                             *
+* Date      :  22 December 2021                                                *
 * Website   :  http://www.angusj.com                                           *
 * Copyright :  Angus Johnson 2019-2021                                         *
 * Purpose   :  JPG/JPEG file format extension for TImage32                     *
@@ -67,8 +67,15 @@ function TImageFormat_JPG.LoadFromStream(stream: TStream; img32: TImage32): Bool
   try
     jpeg.LoadFromStream(stream);
     if jpeg.Empty then Exit;
+
     with TJpegImageHack(jpeg).Bitmap do
+    try
+      if GetCurrentThreadId <> MainThreadID then Canvas.Lock;
       img32.CopyFromDC(Canvas.Handle, Rect(0,0, Width, Height));
+    finally
+      if GetCurrentThreadId <> MainThreadID then Canvas.Unlock;
+    end;
+
     result := true;
   finally
     jpeg.Free;
@@ -84,15 +91,22 @@ procedure TImageFormat_JPG.SaveToStream(stream: TStream; img32: TImage32);
   Jpeg: TJpegImage;
 begin
   Jpeg := TJpegImage.Create;
+  with TJpegImageHack(jpeg) do
   try
-    TJpegImageHack(jpeg).NewImage;
-    TJpegImageHack(jpeg).NewBitmap;
-    TJpegImageHack(jpeg).Bitmap.Width := img32.Width;
-    TJpegImageHack(jpeg).Bitmap.Height := img32.Height;
-    img32.CopyToDc(TJpegImageHack(jpeg).Bitmap.Canvas.Handle,0,0, false);
-    Jpeg.SaveToStream(stream);
+    NewImage;
+    NewBitmap;
+    Bitmap.Width := img32.Width;
+    Bitmap.Height := img32.Height;
+
+    if GetCurrentThreadId <> MainThreadID then Bitmap.Canvas.Lock;
+    try
+      img32.CopyToDc(Bitmap.Canvas.Handle, 0, 0, false);
+    finally
+      if GetCurrentThreadId <> MainThreadID then Bitmap.Canvas.Unlock;
+    end;
+    SaveToStream(stream);
   finally
-    Jpeg.Free;
+    Free;
   end;
 end;
 //------------------------------------------------------------------------------