Changeset 295 for trunk/Packages

Timestamp:

Mar 8, 2021, 4:24:21 PM (4 years ago)

Author:

chronos

Message:

• Modified: LoadGraphicFile options changed to set type.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (9 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -16 +16 @@
     clPage, clCover: TColor;
   end;
+  TLoadGraphicFileOption = (gfNoError, gfNoGamma);
+  TLoadGraphicFileOptions = set of TLoadGraphicFileOption;
+
 
 {$IFDEF WINDOWS}
@@ -28 +31 @@
 procedure EditFrame(ca: TCanvas; p: TRect; const T: TTexture);
 function HexStringToColor(S: string): integer;
-function LoadGraphicFile(bmp: TBitmap; Path: string; Options: integer = 0): boolean;
+function LoadGraphicFile(bmp: TBitmap; Path: string; Options: TLoadGraphicFileOptions = []): boolean;
 function LoadGraphicSet(const Name: string): integer;
 procedure Dump(dst: TBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
@@ -160 +163 @@
   cliWater = 4;
 
-  // LoadGraphicFile options
-  gfNoError = $01;
-  gfNoGamma = $02;
-
 type
   TGrExtDescr = record { don't use dynamic strings here! }
@@ -417 +416 @@
 end;
 
-function LoadGraphicFile(bmp: TBitmap; Path: string; Options: Integer): Boolean;
+function LoadGraphicFile(bmp: TBitmap; Path: string; Options: TLoadGraphicFileOptions = []): Boolean;
 var
   jtex: TJpegImage;
@@ -434 +433 @@
     if Result then
     begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
       Bmp.SetSize(jtex.Width, jtex.Height);
@@ -452 +451 @@
     if Result then
     begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
       bmp.SetSize(Png.Width, Png.Height);
@@ -474 +473 @@
     end;
     if Result then begin
-      if Options and gfNoGamma = 0 then
+      if not (gfNoGamma in Options) then
         bmp.PixelFormat := pf24bit;
     end;
@@ -482 +481 @@
 
   if not Result then begin
-    if Options and gfNoError = 0 then
+    if not (gfNoError in Options) then
       raise Exception.Create(Format(Phrases.Lookup('FILENOTFOUND'), [Path]));
   end;
 
-  if (Options and gfNoGamma = 0) and (Gamma <> 100) then
+  if (not (gfNoGamma in Options)) and (Gamma <> 100) then
     ApplyGammaToBitmap(Bmp);
 end;
@@ -1675 +1674 @@
   LoadFonts;
   LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
-    'Templates.png', gfNoGamma);
+    'Templates.png', [gfNoGamma]);
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');