Skip to content

Some valid JPEG files may not be loaded using XImage.FromFile() #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stogle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some valid JPEG files may not be loaded using XImage.FromFile() #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/foundation/src/PDFsharp/src/PdfSharp/Drawing.Internal/ImageImporterJpeg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,23 @@ class ImageImporterJpeg : ImageImporterRoot, IImageImporter
var ipd = new ImagePrivateDataDct(stream.Data, stream.Length);
var ii = new ImportedImageJpeg(ipd);
ii.Information.DefaultDPI = 72; // Assume 72 DPI if information not provided in the file.
if (TestJfifHeader(stream, ii))
{
bool colorHeader = false, infoHeader = false;
TestJfifHeader(stream, ii); // App headers are optional

bool colorHeader = false, infoHeader = false;

while (MoveToNextHeader(stream))
while (MoveToNextHeader(stream))
{
if (TestColorFormatHeader(stream, ii))
{
colorHeader = true;
}
else if (TestInfoHeader(stream, ii))
{
if (TestColorFormatHeader(stream, ii))
{
colorHeader = true;
}
else if (TestInfoHeader(stream, ii))
{
infoHeader = true;
}
infoHeader = true;
}
if (colorHeader && infoHeader)
return ii;
}
if (colorHeader && infoHeader)
return ii;
}
}
// ReSharper disable once EmptyGeneralCatchClause
Expand Down