Changeset 494 for GraphicTest/Packages/bgrabitmap/bgraopenraster.pas

Timestamp:

Dec 22, 2016, 8:49:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgraopenraster.pas (modified) (8 diffs)

GraphicTest/Packages/bgrabitmap/bgraopenraster.pas

@@ -84 +84 @@
 implementation
 
-uses Graphics, XMLRead, XMLWrite, FPReadPNG, dialogs, BGRABitmapTypes, zstream, lazutf8classes,
+uses XMLRead, XMLWrite, FPReadPNG, BGRABitmapTypes, zstream, BGRAUTF8,
   UnzipperExt;
 
@@ -132 +132 @@
 
 function TFPReaderOpenRaster.InternalCheck(Stream: TStream): boolean;
-var {%h-}magic: packed array[0..3] of byte;
+var magic: packed array[0..3] of byte;
   OldPos,BytesRead: Int64;
   doc : TBGRAOpenRasterDocument;
@@ -139 +139 @@
   if Stream=nil then exit;
   oldPos := stream.Position;
-  BytesRead := Stream.Read({%h-}magic,sizeof(magic));
+  {$PUSH}{$HINTS OFF}
+  BytesRead := Stream.Read(magic,sizeof(magic));
+  {$POP}
   stream.Position:= OldPos;
   if BytesRead<>sizeof(magic) then exit;
@@ -303 +305 @@
               BlendOperation[idx] := boOverlay else
             if opstr = 'svg:soft-light' then
-              BlendOperation[idx] := boSoftLight else
+              BlendOperation[idx] := boSvgSoftLight else
             if opstr = 'svg:hard-light' then
               BlendOperation[idx] := boHardLight else
@@ -320 +322 @@
             if opstr = 'krita:divide' then
               BlendOperation[idx] := boDivide else
+            if opstr = 'bgra:soft-light' then
+              BlendOperation[idx] := boSoftLight else
             if opstr = 'bgra:nice-glow' then
               BlendOperation[idx] := boNiceGlow else
@@ -331 +335 @@
               BlendOperation[idx] := boXor else
             begin
-              messagedlg('Unknown blend operation : ' + attr.NodeValue,mtInformation,[mbOk],0);
+              //messagedlg('Unknown blend operation : ' + attr.NodeValue,mtInformation,[mbOk],0);
+              BlendOperation[idx] := boTransparent;
             end;
           end;
@@ -408 +413 @@
         boMultiply: strval := 'svg:multiply';
         boOverlay, boDarkOverlay: strval := 'svg:overlay';
-        boSoftLight: strval := 'svg:soft-light';
+        boSoftLight: strval := 'bgra:soft-light';
         boHardLight: strval := 'svg:hard-light';
         boDifference,boLinearDifference: strval := 'svg:difference';
@@ -420 +425 @@
         boLinearNegation,boNegation: strval := 'bgra:negation';
         boXor: strval := 'bgra:xor';
+        boSvgSoftLight: strval := 'svg:soft-light';
         else strval := 'svg:src-over';
       end;