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

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

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

GraphicTest/Packages/bgrabitmap/bgrastreamlayers.pas

@@ -17 +17 @@
 implementation
 
-uses BGRABitmapTypes, BGRACompressableBitmap, zstream, BGRAReadLzp, BGRAWriteLzp;
+uses BGRABitmapTypes, BGRACompressableBitmap, zstream, BGRAReadLzp, BGRAWriteLzp,
+     BGRAUTF8;
 
 procedure SaveLayeredBitmapToStream(AStream: TStream; ALayers: TBGRACustomLayeredBitmap);
@@ -37 +38 @@
   StreamMaxLayerCount = 4096;
   StreamMaxHeaderSize = 256;
-
-{$i winstream.inc}
 
 function CheckStreamForLayers(AStream: TStream): boolean;
@@ -91 +90 @@
 
     //header size
-    HeaderSize:= WinReadLongint(AStream);
+    HeaderSize:= LEReadLongint(AStream);
     if (HeaderSize < 12) or (HeaderSize > StreamMaxHeaderSize) then
       raise exception.Create('Invalid header size');
     LayerStackStartPosition := AStream.Position + HeaderSize;
 
-    NbLayers:= WinReadLongint(AStream);
+    NbLayers:= LEReadLongint(AStream);
     if (NbLayers < 0) or (NbLayers > StreamMaxLayerCount) then
       raise exception.Create('Invalid layer count');
 
-    ASelectedLayerIndex:= WinReadLongint(AStream);
+    ASelectedLayerIndex:= LEReadLongint(AStream);
     if (ASelectedLayerIndex < -1) or (ASelectedLayerIndex >= NbLayers) then
       raise exception.Create('Selected layer out of bounds');
 
-    StackOption := WinReadLongint(AStream);
+    StackOption := LEReadLongint(AStream);
     result.LinearBlend := (StackOption and 1) = 1;
     if (StackOption and 2) = 2 then Compression := lzpRLE else Compression:= lzpZStream;
@@ -112 +111 @@
     for i := 0 to NbLayers-1 do
     begin
-      LayerHeaderSize:= WinReadLongint(AStream);
+      LayerHeaderSize:= LEReadLongint(AStream);
       LayerHeaderPosition := AStream.Position;
       LayerBitmapPosition := LayerHeaderPosition + LayerHeaderSize;
@@ -126 +125 @@
       if AStream.Position <= LayerBitmapPosition-4 then
       begin
-        LayerOption := WinReadLongint(AStream);
+        LayerOption := LEReadLongint(AStream);
         LayerVisible := (LayerOption and 1) = 1;
       end;
       if AStream.Position <= LayerBitmapPosition-4 then
-        LayerBlendOp := TBlendOperation(WinReadLongint(AStream));
+        LayerBlendOp := TBlendOperation(LEReadLongint(AStream));
 
       if AStream.Position <= LayerBitmapPosition-8 then
       begin
-        LayerOffset := Point(WinReadLongint(AStream),WinReadLongint(AStream));
+        LayerOffset := Point(LEReadLongint(AStream),LEReadLongint(AStream));
         if AStream.Position <= LayerBitmapPosition-4 then
         begin
-          LayerId := WinReadLongint(AStream);
+          LayerId := LEReadLongint(AStream);
           LayerIdFound := true;
         end;
         if AStream.Position <= LayerBitmapPosition-4 then
-          LayerOpacity := WinReadLongint(AStream) shr 8;
+          LayerOpacity := LEReadLongint(AStream) shr 8;
       end;
       if AStream.Position <= LayerBitmapPosition-4 then
       begin
-        LayerBitmapSize := WinReadLongint(AStream);
+        LayerBitmapSize := LEReadLongint(AStream);
         LayerEndPosition:= LayerBitmapPosition+LayerBitmapSize;
       end;
@@ -186 +185 @@
     raise exception.Create('Selected layer out of bounds');
   AStream.Write(StreamHeader[1], length(StreamHeader));
-  WinWriteLongint(AStream, 12); //header size
-  WinWriteLongint(AStream, ALayers.NbLayers);
-  WinWriteLongint(AStream, ASelectedLayerIndex);
+  LEWriteLongint(AStream, 12); //header size
+  LEWriteLongint(AStream, ALayers.NbLayers);
+  LEWriteLongint(AStream, ASelectedLayerIndex);
   StackOption := 0;
   if ALayers.LinearBlend then StackOption := StackOption or 1;
   if ACompression = lzpRLE then StackOption:= StackOption or 2;
-  WinWriteLongint(AStream, StackOption);
+  LEWriteLongint(AStream, StackOption);
   //end of header
 
@@ -198 +197 @@
   begin
     LayerHeaderSizePosition:= AStream.Position;
-    WinWriteLongint(AStream, 0); //header size not computed yet
+    LEWriteLongint(AStream, 0); //header size not computed yet
     LayerHeaderPosition := AStream.Position;
 
     LayerOption := 0;
     if ALayers.LayerVisible[i] then LayerOption:= LayerOption or 1;
-    WinWriteLongint(AStream, LayerOption);
-    WinWriteLongint(AStream, Longint(ALayers.BlendOperation[i]));
-    WinWriteLongint(AStream, ALayers.LayerOffset[i].x);
-    WinWriteLongint(AStream, ALayers.LayerOffset[i].y);
-    WinWriteLongint(AStream, ALayers.LayerUniqueId[i]);
-    WinWriteLongint(AStream, integer(ALayers.LayerOpacity[i])*$101);
+    LEWriteLongint(AStream, LayerOption);
+    LEWriteLongint(AStream, Longint(ALayers.BlendOperation[i]));
+    LEWriteLongint(AStream, ALayers.LayerOffset[i].x);
+    LEWriteLongint(AStream, ALayers.LayerOffset[i].y);
+    LEWriteLongint(AStream, ALayers.LayerUniqueId[i]);
+    LEWriteLongint(AStream, integer(ALayers.LayerOpacity[i])*$101);
     LayerBitmapSizePosition:=AStream.Position;
-    WinWriteLongint(AStream, 0);
+    LEWriteLongint(AStream, 0);
     LayerBitmapPosition:=AStream.Position;
     LayerHeaderSize := LayerBitmapPosition - LayerHeaderPosition;
     AStream.Position:= LayerHeaderSizePosition;
-    WinWriteLongint(AStream, LayerHeaderSize);
+    LEWriteLongint(AStream, LayerHeaderSize);
     //end of layer header
 
@@ -231 +230 @@
       raise exception.Create('Image too big');
     AStream.Position:= LayerBitmapSizePosition;
-    WinWriteLongint(AStream, BitmapSize);
+    LEWriteLongint(AStream, BitmapSize);
     AStream.Position:= LayerBitmapPosition+BitmapSize;
   end;