Changeset 521 for GraphicTest/Packages/bgrabitmap/bgrareadpng.pas

Timestamp:

Apr 17, 2019, 12:58:41 AM (5 years ago)

Author:

chronos

Message:

• Modified: Propagate project build mode options to used packages.
• Added: Check memory leaks using heaptrc.
• Modified: Update BGRABitmap package.

Location:

GraphicTest

Files:

• . (modified) (1 prop)
• Packages/bgrabitmap/bgrareadpng.pas (modified) (12 diffs)

GraphicTest

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

GraphicTest/Packages/bgrabitmap/bgrareadpng.pas

@@ -40 +40 @@
   { TBGRAReaderPNG }
 
-  TBGRAReaderPNG = class (TFPCustomImageReader)
+  TBGRAReaderPNG = class (TBGRAImageReader)
     private
 
@@ -133 +133 @@
       property OriginalWidth: integer read GetOriginalWidth;
       property OriginalHeight: integer read GetOriginalHeight;
+      function GetQuickInfo(AStream: TStream): TQuickImageInfo; override;
+      function GetBitmapDraft(AStream: TStream; {%H-}AMaxWidth, AMaxHeight: integer; out AOriginalWidth,AOriginalHeight: integer): TBGRACustomBitmap; override;
   end;
 
 implementation
 
-
+uses math;
 
 const StartPoints : array[0..7, 0..1] of word =
@@ -163 +165 @@
 end;
 
+function TBGRAReaderPNG.GetQuickInfo(AStream: TStream): TQuickImageInfo;
+const headerChunkSize = 13;
+var
+  {%H-}FileHeader : packed array[0..7] of byte;
+  {%H-}ChunkHeader : TChunkHeader;
+  {%H-}HeaderChunk : THeaderChunk;
+begin
+  fillchar({%H-}result, sizeof(result), 0);
+  if AStream.Read({%H-}FileHeader, sizeof(FileHeader))<> sizeof(FileHeader) then exit;
+  if QWord(FileHeader) <> QWord(PNGComn.Signature) then exit;
+  if AStream.Read({%H-}ChunkHeader, sizeof(ChunkHeader))<> sizeof(ChunkHeader) then exit;
+  if ChunkHeader.CType <> ChunkTypes[ctIHDR] then exit;
+  if BEtoN(ChunkHeader.CLength) < headerChunkSize then exit;
+  if AStream.Read({%H-}HeaderChunk, headerChunkSize) <> headerChunkSize then exit;
+  result.width:= BEtoN(HeaderChunk.Width);
+  result.height:= BEtoN(HeaderChunk.height);
+  case HeaderChunk.ColorType and 3 of
+    0,3: {grayscale, palette}
+      if HeaderChunk.BitDepth > 8 then
+        result.colorDepth := 8
+      else
+        result.colorDepth := HeaderChunk.BitDepth;
+
+    2: {color} result.colorDepth := HeaderChunk.BitDepth*3;
+  end;
+  if (HeaderChunk.ColorType and 4) = 4 then
+    result.alphaDepth := HeaderChunk.BitDepth
+  else
+    result.alphaDepth := 0;
+end;
+
+function TBGRAReaderPNG.GetBitmapDraft(AStream: TStream; AMaxWidth,
+  AMaxHeight: integer; out AOriginalWidth, AOriginalHeight: integer): TBGRACustomBitmap;
+var
+  png: TBGRAReaderPNG;
+begin
+  png:= TBGRAReaderPNG.Create;
+  result := BGRABitmapFactory.Create;
+  try
+    png.MinifyHeight := AMaxHeight;
+    result.LoadFromStream(AStream, png);
+    AOriginalWidth:= result.Width;
+    AOriginalHeight:= png.OriginalHeight;
+  finally
+    png.Free;
+  end;
+end;
+
 procedure TBGRAReaderPNG.ReadChunk;
-
 var {%H-}ChunkHeader : TChunkHeader;
     readCRC : longword;
@@ -520 +569 @@
   UsingBitGroup := 0;
   DataIndex := 0;
+  {$PUSH}{$RANGECHECKS OFF} //because PByteArray is limited to 32767
   if (UsingBitGroup = 0) and (Header.BitDepth <> 16) then
     case ByteWidth of
@@ -583 +633 @@
          end;
     end;
+  {$POP}
 
   X := StartX;
@@ -694 +745 @@
 end;
 
-function TBGRAReaderPNG.ColorGray1 (const CD:TColorDAta) : TFPColor;
+function TBGRAReaderPNG.ColorGray1(const CD: TColorData): TFPColor;
 begin
   if CD = 0 then
@@ -702 +753 @@
 end;
 
-function TBGRAReaderPNG.ColorGray2 (const CD:TColorDAta) : TFPColor;
+function TBGRAReaderPNG.ColorGray2(const CD: TColorData): TFPColor;
 var c : NativeUint;
 begin
@@ -718 +769 @@
 end;
 
-function TBGRAReaderPNG.ColorGray4 (const CD:TColorDAta) : TFPColor;
+function TBGRAReaderPNG.ColorGray4(const CD: TColorData): TFPColor;
 var c : NativeUint;
 begin
@@ -733 +784 @@
 end;
 
-function TBGRAReaderPNG.ColorGray8 (const CD:TColorDAta) : TFPColor;
+function TBGRAReaderPNG.ColorGray8(const CD: TColorData): TFPColor;
 var c : NativeUint;
 begin
@@ -747 +798 @@
 end;
 
-function TBGRAReaderPNG.ColorGray16 (const CD:TColorDAta) : TFPColor;
+function TBGRAReaderPNG.ColorGray16(const CD: TColorData): TFPColor;
 var c : NativeUint;
 begin
@@ -1065 +1116 @@
     while Count4 > 0 do
     begin
-      {$push}{$r-}
+      {$push}{$r-}{$q-}
       PDWord(p)^ := (((PDWord(pPrev)^ and $00FF00FF) + (PDWord(p)^ and $00FF00FF)) and $00FF00FF)
         or (((PDWord(pPrev)^ and $FF00FF00) + (PDWord(p)^ and $FF00FF00)) and $FF00FF00);
@@ -1307 +1358 @@
     // Check IHDR
     ReadChunk;
-    move (chunk.data^, FHeader, sizeof(Header));
+    fillchar(FHeader, sizeof(FHeader), 0);
+    move (chunk.data^, FHeader, min(sizeof(Header), chunk.alength));
     with header do
       begin

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc