lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-09-19 10:47:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix width and height order in jpeg parsing

Browse Source 
height is before width, incorrect order caused adobe reader to draw image strangely.
This commit is contained in:
Eliot Jones
2020-03-15 18:02:46 +00:00
parent 7212b9e38c
commit 98bcc16e11
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/UglyToad.PdfPig.Tests/Writer/PdfDocumentBuilderTests.cs
View File

@@ -399,7 +399,7 @@
}
[Fact]
public void CanWriteSinglePageWithJpg()
public void CanWriteSinglePageWithJpeg()
{
var builder = new PdfDocumentBuilder();
var page = builder.AddPage(PageSize.A4);
@@ -417,7 +417,7 @@
page.AddJpeg(imageBytes, expectedBounds);
var bytes = builder.Build();
WriteFile(nameof(CanWriteSinglePageWithJpg), bytes);
WriteFile(nameof(CanWriteSinglePageWithJpeg), bytes);
using (var document = PdfDocument.Open(bytes))
{

3
src/UglyToad.PdfPig.Tokens/NameToken.Constants.cs
View File

@@ -278,6 +278,9 @@
public static readonly NameToken If = new NameToken("IF");
public static readonly NameToken Im = new NameToken("IM");
public static readonly NameToken Image = new NameToken("Image");
public static readonly NameToken ImageB = new NameToken("ImageB");
public static readonly NameToken ImageC = new NameToken("ImageC");
public static readonly NameToken ImageI = new NameToken("ImageI");
public static readonly NameToken ImageMask = new NameToken("ImageMask");
public static readonly NameToken Index = new NameToken("Index");
public static readonly NameToken Indexed = new NameToken("Indexed");

2
src/UglyToad.PdfPig/Images/JpegHandler.cs
View File

@@ -33,8 +33,8 @@
// ReSharper disable once UnusedVariable
var length = ReadShort(stream, shortBuffer);
var bpp = stream.ReadByte();
var width = ReadShort(stream, shortBuffer);
var height = ReadShort(stream, shortBuffer);
var width = ReadShort(stream, shortBuffer);
return new JpegInformation(width, height, bpp);
}

2
src/UglyToad.PdfPig/Parser/PageFactory.cs
View File

@@ -142,6 +142,8 @@
var operations = pageContentParser.Parse(pageNumber, new ByteArrayInputBytes(contentBytes),
log);
var text = OtherEncodings.BytesAsLatin1String(contentBytes);
var context = new ContentStreamProcessor(cropBox.Bounds, resourceStore, userSpaceUnit, rotation, pdfScanner,
pageContentParser,
filterProvider,

11
src/UglyToad.PdfPig/Writer/PdfDocumentBuilder.cs
View File

@@ -247,9 +247,18 @@
context.WriteObject(memory, streamToken, image.Value.ObjectNumber);
}
var procSet = new List<NameToken>
{
NameToken.Create("PDF"),
NameToken.Text,
NameToken.ImageB,
NameToken.ImageC,
NameToken.ImageI
};
var resources = new Dictionary<NameToken, IToken>
{
{ NameToken.ProcSet, new ArrayToken(new []{ NameToken.Create("PDF"), NameToken.Create("Text") }) }
{ NameToken.ProcSet, new ArrayToken(procSet) }
};
if (fontsWritten.Count > 0)