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

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgravectorize.pas (modified) (5 diffs)

GraphicTest/Packages/bgrabitmap/bgravectorize.pas

@@ -190 +190 @@
 implementation
 
-uses LCLProc, FileUtil, lazutf8classes;
-
-{$i winstream.inc}
+uses BGRAUTF8;
+
 function VectorizeMonochrome(ASource: TBGRACustomBitmap; zoom: single; PixelCenteredCoordinates: boolean): ArrayOfTPointF;
 const unitShift = 6;
@@ -1285 +1284 @@
   if not FFontPixelMetricComputed and (FFont <> nil) then
   begin
-    FFontPixelMetric := BGRAText.GetFontPixelMetric(FFont);
+    FFontPixelMetric := BGRAText.GetLCLFontPixelMetric(FFont);
     FFontPixelMetricComputed := true;
   end;
@@ -1916 +1915 @@
     end;
   until FindNext(SearchRec) <> 0;
+  FindClose(SearchRec);
   SetLength(FDirectoryContent,NbFiles);
 end;
@@ -2010 +2010 @@
 begin
   inherited WriteCustomHeader(AStream);
-  WinWriteLongint(AStream, length(FName));
+  LEWriteLongint(AStream, length(FName));
   AStream.Write(FName[1],length(FName));
-  WinWriteLongint(AStream, integer(FStyle));
-  WinWriteSingle(AStream, FontEmHeightRatio);
-  WinWriteLongint(AStream, Resolution);
+  LEWriteLongint(AStream, integer(FStyle));
+  LEWriteSingle(AStream, FontEmHeightRatio);
+  LEWriteLongint(AStream, Resolution);
   metric := FontPixelMetric;
-  WinWriteLongint(AStream, metric.Baseline);
-  WinWriteLongint(AStream, metric.xLine);
-  WinWriteLongint(AStream, metric.CapLine);
-  WinWriteLongint(AStream, metric.DescentLine);
-  WinWriteLongint(AStream, metric.Lineheight);
+  LEWriteLongint(AStream, metric.Baseline);
+  LEWriteLongint(AStream, metric.xLine);
+  LEWriteLongint(AStream, metric.CapLine);
+  LEWriteLongint(AStream, metric.DescentLine);
+  LEWriteLongint(AStream, metric.Lineheight);
 end;
 
@@ -2048 +2048 @@
 var lNameLength: integer;
 begin
-  lNameLength := WinReadLongint(AStream);
+  lNameLength := LEReadLongint(AStream);
   setlength(result.Name, lNameLength);
   AStream.Read(result.Name[1],length(result.Name));
-  result.Style := TFontStyles(WinReadLongint(AStream));
-  result.EmHeightRatio:= WinReadSingle(AStream);
-  result.Resolution := WinReadLongint(AStream);
-  result.PixelMetric.Baseline := WinReadLongint(AStream);
-  result.PixelMetric.xLine := WinReadLongint(AStream);
-  result.PixelMetric.CapLine := WinReadLongint(AStream);
-  result.PixelMetric.DescentLine := WinReadLongint(AStream);
-  result.PixelMetric.Lineheight := WinReadLongint(AStream);
+  result.Style := TFontStyles(LEReadLongint(AStream));
+  result.EmHeightRatio:= LEReadSingle(AStream);
+  result.Resolution := LEReadLongint(AStream);
+  result.PixelMetric.Baseline := LEReadLongint(AStream);
+  result.PixelMetric.xLine := LEReadLongint(AStream);
+  result.PixelMetric.CapLine := LEReadLongint(AStream);
+  result.PixelMetric.DescentLine := LEReadLongint(AStream);
+  result.PixelMetric.Lineheight := LEReadLongint(AStream);
   result.PixelMetric.Defined := result.PixelMetric.Lineheight > 0;
 end;