Changeset 108 for trunk/UContactImage.pas

Timestamp:

Feb 11, 2022, 11:31:42 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Do not update interface in contact properties if the listview doesn't have handle yet.
• Added: Synced update of full name and name parts in contact form.
• Modified: Improved image loading code by image format.

File:

• trunk/UContactImage.pas (modified) (7 diffs)

trunk/UContactImage.pas

@@ -9 +9 @@
 
 type
-  TContactImageFormat = (ifBmp, ifJpeg, ifPng, ifGif);
+  TContactImageFormat = (ifNone, ifBmp, ifJpeg, ifPng, ifGif);
 
   { TContactImage }
@@ -64 +64 @@
     (ContactProperty.Attributes.IndexOf('png') <> -1) then Result := ifPng
   else
-    Result := ifBmp;
+    if (ContactProperty.Attributes.IndexOf('BMP') <> -1) or
+      (ContactProperty.Attributes.IndexOf('bmp') <> -1) then Result := ifBmp
+  else
+    Result := ifNone;
 end;
 
@@ -134 +137 @@
       GifImage.Free;
     end;
+  end else
+  if ImageFormat = ifBmp then begin
+    try
+      Bitmap.SaveToStream(Stream);
+    except
+    end;
   end else begin
-    // Bmp
-    try
-      Bitmap.SaveToStream(Stream);
-    except
-    end;
+    // Use default type
+    SaveImageToStream(ifJpeg, Stream);
   end;
 end;
@@ -149 +155 @@
   PngImage: TPortableNetworkGraphic;
   GifImage: TGIFImage;
+  BmpImage: TBitmap;
 begin
   if ImageFormat = ifJpeg then begin
-    JpegImage := TJPEGImage.Create;
-    try
+    try
+      JpegImage := TJPEGImage.Create;
       try
         JpegImage.LoadFromStream(Stream);
@@ -160 +167 @@
           Canvas.Draw(0, 0, JpegImage);
         end;
-        Used := True;
-      except
-        Used := False;
-      end;
-    finally
-      JpegImage.Free;
+      finally
+        JpegImage.Free;
+      end;
+      Used := True;
+    except
+      Used := False;
     end;
   end else
   if ImageFormat = ifPng then begin
-    PngImage := TPortableNetworkGraphic.Create;
-    try
+    try
+      PngImage := TPortableNetworkGraphic.Create;
       try
         PngImage.LoadFromStream(Stream);
@@ -178 +185 @@
           Canvas.Draw(0, 0, PngImage);
         end;
-        Used := True;
-      except
-        Used := False;
-      end;
-    finally
-      PngImage.Free;
+      finally
+        PngImage.Free;
+      end;
+      Used := True;
+    except
+      Used := False;
     end;
   end else
   if ImageFormat = ifGif then begin
-    GifImage := TGIFImage.Create;
-    try
+    try
+      GifImage := TGIFImage.Create;
       try
         GifImage.LoadFromStream(Stream);
@@ -196 +203 @@
           Canvas.Draw(0, 0, GifImage);
         end;
-        Used := True;
-      except
-        Used := False;
-      end;
-    finally
-      GifImage.Free;
+      finally
+        GifImage.Free;
+      end;
+      Used := True;
+    except
+      Used := False;
+    end;
+  end else
+  if ImageFormat = ifBmp then begin
+    try
+      BmpImage := TBitmap.Create;
+      try
+        BmpImage.LoadFromStream(Stream);
+        with Bitmap do begin
+          PixelFormat := pf24bit;
+          SetSize(BmpImage.Width, BmpImage.Height);
+          Canvas.Draw(0, 0, BmpImage);
+        end;
+      finally
+        BmpImage.Free;
+      end;
+      Used := True;
+    except
+      Used := False;
     end;
   end else begin
-    // Bmp
-    with TImage.Create(nil) do
-    try
+    // Unknown image type, let TPicture guess what it is
+    try
+      with TImage.Create(nil) do
       try
         Picture.LoadFromStream(Stream);
-        Canvas.Draw(0, 0, Picture.Bitmap);
-        Used := True;
-      except
-        Used := False;
-      end;
-    finally
-      Free;
+        with Bitmap do begin
+          PixelFormat := pf24bit;
+          SetSize(Picture.Bitmap.Width, Picture.Bitmap.Height);
+          Canvas.Draw(0, 0, Picture.Bitmap);
+        end;
+      finally
+        Free;
+      end;
+      Used := True;
+    except
+      Used := False;
     end;
   end;