lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-11-28 17:47:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Image data might contain trailing EOL marker

Browse Source
This commit is contained in:
Kasper Frank
2021-05-10 17:27:08 +02:00
parent 07823c8b34
commit 6fa223c0db
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/UglyToad.PdfPig/Images/Png/PngFromPdfImageFactory.cs
View File

@@ -2,6 +2,8 @@
{ {
using Content; using Content;
using Graphics.Colors; using Graphics.Colors;
using System.Collections.Generic;
using UglyToad.PdfPig.Core;
internal static class PngFromPdfImageFactory internal static class PngFromPdfImageFactory
{ {
@@ -32,7 +34,18 @@
var builder = PngBuilder.Create(image.WidthInSamples, image.HeightInSamples, false); var builder = PngBuilder.Create(image.WidthInSamples, image.HeightInSamples, false);
var isCorrectlySized = bytesPure.Count == (image.WidthInSamples * image.HeightInSamples * numberOfComponents); var requiredSize = (image.WidthInSamples * image.HeightInSamples * numberOfComponents);
var actualSize = bytesPure.Count;
var isCorrectlySized = bytesPure.Count == requiredSize ||
// Spec, p. 37: "...error if the stream contains too much data, with the exception that
// there may be an extra end-of-line marker..."
(actualSize == requiredSize + 1 && bytesPure[actualSize - 1] == ReadHelper.AsciiLineFeed) ||
(actualSize == requiredSize + 1 && bytesPure[actualSize - 1] == ReadHelper.AsciiCarriageReturn) ||
// The combination of a CARRIAGE RETURN followed immediately by a LINE FEED is treated as one EOL marker.
(actualSize == requiredSize + 2 &&
bytesPure[actualSize - 2] == ReadHelper.AsciiCarriageReturn &&
bytesPure[actualSize - 1] == ReadHelper.AsciiLineFeed);
if (!isCorrectlySized) if (!isCorrectlySized)
{ {