Changeset 280

Timestamp:

Sep 6, 2020, 12:31:43 PM (4 years ago)

Author:

chronos

Message:

• Modified: Upscaled from middle sized images.
• Modified: Upscale transparent images with alpha color.

Location:

tools/Image resize

Files:

• ImageResize.lpi (modified) (3 diffs)
• UPixelPointer.pas (added)
• uformmain.pas (modified) (5 diffs)

tools/Image resize/ImageResize.lpi

@@ -31 +31 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="4">
+    <Units Count="5">
       <Unit0>
         <Filename Value="ImageResize.lpr"/>
@@ -52 +52 @@
         <IsPartOfProject Value="True"/>
       </Unit3>
+      <Unit4>
+        <Filename Value="UPixelPointer.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit4>
     </Units>
   </ProjectOptions>
@@ -63 +67 @@
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>

tools/Image resize/uformmain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  Math, LazFileUtils;
+  Math, LazFileUtils, UPixelPointer;
 
 type
@@ -27 +27 @@
   end;
 
-  TColor32 = type Cardinal;
-  TColor32Component = (ccBlue, ccGreen, ccRed, ccAlpha);
-  TPixel32 = packed record
-    case Integer of
-      0: (B, G, R, A: Byte);
-      1: (ARGB: TColor32);
-      2: (Planes: array[0..3] of Byte);
-      3: (Components: array[TColor32Component] of Byte);
-  end;
-  PPixel32 = ^TPixel32;
-
 var
   FormMain: TFormMain;
@@ -65 +54 @@
 begin
   NewSize := Point(144, 108);
-  ResizeImage('../../trunk/Graphics/Cities66x32.png', Point(66, 48), Point(8, 2),
+  //ResizeImage('../../trunk/Graphics/Cities66x32.png', Point(66, 48), Point(8, 2),
+  //  'Cities144x72.png', NewSize);
+  //ResizeImage('../../trunk/Graphics/Terrain66x32.png', Point(66, 48), Point(9, 21),
+  //  'Terrain144x72.png', NewSize);
+{
+  ResizeImage('../../trunk/Graphics/Cities96x48.png', Point(96, 72), Point(8, 2),
     'Cities144x72.png', NewSize);
-  ResizeImage('../../trunk/Graphics/Terrain66x32.png', Point(66, 48), Point(9, 21),
+  ResizeImage('../../trunk/Graphics/Terrain96x48.png', Point(96, 72), Point(9, 21),
+    'Terrain144x72.png', NewSize);
+}  ResizeImage('../../branches/AlphaChannel/Graphics/Cities96x48.png', Point(96, 72), Point(8, 2),
+    'Cities144x72.png', NewSize);
+  ResizeImage('../../branches/AlphaChannel/Graphics/Terrain96x48.png', Point(96, 72), Point(9, 21),
     'Terrain144x72.png', NewSize);
 end;
@@ -84 +82 @@
   for I := 0 to Length(Files) - 1 do
     UseAlpha('../../trunk/Graphics/' + Files[I], False);
+  UseAlpha('../../trunk/Help/AdvTree.png', False);
   //UseAlpha('../../trunk/Graphics/Templates.png', True);
+end;
+
+procedure FillRectBitmap(Bitmap: TBitmap; Color: TColor32);
+var
+  Ptr: TPixelPointer;
+  X, Y: Integer;
+begin
+  Bitmap.BeginUpdate;
+  Ptr := PixelPointer(Bitmap);
+  for Y := 0 to Bitmap.Height - 1 do begin
+    for X := 0 to Bitmap.Width - 1 do begin
+      Ptr.Pixel^.ARGB := Color;
+      Ptr.NextPixel;
+    end;
+    Ptr.NextLine;
+  end;
+  Bitmap.EndUpdate;
 end;
 
@@ -176 +192 @@
   XX, YY: Integer;
   X, Y: Integer;
-  SrcPtr: PInteger;
-  DestPtr: PInteger;
+  SrcPtr: PCardinal;
+  DestPtr: PCardinal;
 begin
   ImageSrc := TImage.Create(nil);
   ImageSrc.Picture.LoadFromFile(SourceName);
   ImageDest := TImage.Create(nil);
+  ImageDest.Picture.Bitmap.Assign(ImageSrc.Picture.Bitmap);
   ImageDest.Picture.Bitmap.SetSize((DestSize.X + 1) * Count.X + 1,
     (DestSize.Y + 1) * Count.Y + 1);
   //ShowMessage(IntToStr(ImageDest.Picture.Bitmap.Width) + ' ' + IntToStr(ImageDest.Width));
+  FillRectBitmap(ImageDest.Picture.Bitmap, $ff757575);
+
   ImageSrc.Picture.Bitmap.BeginUpdate(True);
   ImageDest.Picture.Bitmap.BeginUpdate(True);
-  ImageDest.Picture.Bitmap.Canvas.Brush.Style := bsSolid;
-  ImageDest.Picture.Bitmap.Canvas.Brush.Color := $757575;
-  ImageDest.Picture.Bitmap.Canvas.FillRect(0, 0, ImageDest.Picture.Bitmap.Width, ImageDest.Picture.Bitmap.Height);
+  //ImageDest.Picture.Bitmap.Canvas.Brush.Style := bsSolid;
+  //ImageDest.Picture.Bitmap.Canvas.Brush.Color := $757575;
+  //ImageDest.Picture.Bitmap.Canvas.FillRect(0, 0, ImageDest.Picture.Bitmap.Width, ImageDest.Picture.Bitmap.Height);
   XX := 0;
   YY := 0;
   for YY := 0 to Count.Y - 1 do
-    for XX := 0 to Count.X - 1 do
-    begin
+    for XX := 0 to Count.X - 1 do begin
       for Y := 0 to DestSize.Y - 1 do
         for X := 0 to DestSize.X - 1 do begin