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

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgratypewriter.pas (modified) (12 diffs)

GraphicTest/Packages/bgrabitmap/bgratypewriter.pas

@@ -123 +123 @@
 implementation
 
-uses LCLProc, lazutf8classes;
-
-{$i winstream.inc}
+uses BGRAUTF8;
+
+procedure LEWritePointF(Stream: TStream; AValue: TPointF);
+begin
+  LEWriteSingle(Stream,AValue.x);
+  LEWriteSingle(Stream,AValue.y);
+end;
+
+function LEReadPointF(Stream: TStream): TPointF;
+begin
+  result.x := LEReadSingle(Stream);
+  result.y := LEReadSingle(Stream);
+end;
 
 function ComputeEasyBezier(APoints: array of TPointF; AClosed: boolean; AMinimumDotProduct: single = 0.707): ArrayOfTPointF;
@@ -266 +276 @@
 begin
   inherited WriteContent(AStream);
-  WinWritePointF(AStream, Offset);
-  WinWriteLongint(AStream,length(Points));
+  LEWritePointF(AStream, Offset);
+  LEWriteLongint(AStream,length(Points));
   for i := 0 to high(Points) do
-    WinWritePointF(AStream, Points[i]);
+    LEWritePointF(AStream, Points[i]);
 end;
 
@@ -277 +287 @@
 begin
   inherited ReadContent(AStream);
-  Offset := WinReadPointF(AStream);
-  SetLength(tempPts, WinReadLongint(AStream));
+  Offset := LEReadPointF(AStream);
+  SetLength(tempPts, LEReadLongint(AStream));
   for i := 0 to high(tempPts) do
-    tempPts[i] := WinReadPointF(AStream);
+    tempPts[i] := LEReadPointF(AStream);
   SetPoints(tempPts);
 end;
@@ -390 +400 @@
   AContentSize: longint);
 begin
-  WinWriteByte(AStream, length(AName));
+  LEWriteByte(AStream, length(AName));
   AStream.Write(AName[1],length(AName));
-  WinWriteLongint(AStream, AContentSize);
+  LEWriteLongint(AStream, AContentSize);
 end;
 
@@ -399 +409 @@
 var NameLength: integer;
 begin
-  NameLength := WinReadByte(AStream);
+  NameLength := LEReadByte(AStream);
   setlength(AName,NameLength);
   AStream.Read(AName[1],length(AName));
-  AContentSize := WinReadLongint(AStream);
+  AContentSize := LEReadLongint(AStream);
 end;
 
@@ -417 +427 @@
 procedure TBGRAGlyph.WriteContent(AStream: TStream);
 begin
-  WinWriteLongint(AStream,length(FIdentifier));
+  LEWriteLongint(AStream,length(FIdentifier));
   AStream.Write(FIdentifier[1],length(FIdentifier));
-  WinWriteSingle(AStream,Width);
-  WinWriteSingle(AStream,Height);
+  LEWriteSingle(AStream,Width);
+  LEWriteSingle(AStream,Height);
 end;
 
@@ -426 +436 @@
 var lIdentifierLength: integer;
 begin
-  lIdentifierLength:= WinReadLongint(AStream);
+  lIdentifierLength:= LEReadLongint(AStream);
   setlength(FIdentifier, lIdentifierLength);
   AStream.Read(FIdentifier[1],length(FIdentifier));
-  Width := WinReadSingle(AStream);
-  Height := WinReadSingle(AStream);
+  Width := LEReadSingle(AStream);
+  Height := LEReadSingle(AStream);
 end;
 
@@ -711 +721 @@
 begin
   for c := AUnicodeFrom to AUnicodeTo do
-    GetGlyph(UnicodeToUTF8(c));
+    GetGlyph(UnicodeCharToUTF8(c));
 end;
 
@@ -805 +815 @@
 var Enumerator: TAvgLvlTreeNodeEnumerator;
 begin
-  WinWriteLongint(AStream,CustomHeaderSize);
+  LEWriteLongint(AStream,CustomHeaderSize);
   WriteCustomHeader(AStream);
 
@@ -833 +843 @@
   GlyphStartPosition: Int64;
 begin
-  HeaderSize := WinReadLongint(AStream);
+  HeaderSize := LEReadLongint(AStream);
   GlyphStartPosition:= AStream.Position+HeaderSize;
   Header := ReadCustomTypeWriterHeader(AStream);
@@ -919 +929 @@
 begin
   lHeaderName:= HeaderName;
-  WinWriteByte(AStream,length(lHeaderName));
+  LEWriteByte(AStream,length(lHeaderName));
   AStream.Write(lHeaderName[1],length(lHeaderName));
-  WinWriteLongint(AStream,FGlyphs.Count);
+  LEWriteLongint(AStream,FGlyphs.Count);
 end;
 
@@ -927 +937 @@
   ): TBGRACustomTypeWriterHeader;
 begin
-  setlength(result.HeaderName, WinReadByte(AStream));
+  setlength(result.HeaderName, LEReadByte(AStream));
   AStream.Read(result.HeaderName[1],length(result.HeaderName));
-  result.NbGlyphs:= WinReadLongint(AStream);
+  result.NbGlyphs:= LEReadLongint(AStream);
 end;