mirror of
https://github.com/UglyToad/PdfPig.git
synced 2025-04-05 20:55:01 +08:00
Merge branch 'UglyToad:master' into master
This commit is contained in:
DGdev91
GitHub
commit
65e3c77a5c
@ -77,7 +77,9 @@
|
||||
letter.Width,
|
||||
letter.FontSize,
|
||||
fontDetails,
|
||||
letter.Color,
|
||||
letter.RenderingMode,
|
||||
letter.StrokeColor,
|
||||
letter.FillColor,
|
||||
letter.PointSize,
|
||||
letter.TextSequence);
|
||||
|
||||
|
||||
@ -65,7 +65,9 @@
|
||||
letter.Width,
|
||||
letter.FontSize,
|
||||
letter.Font,
|
||||
letter.Color,
|
||||
letter.RenderingMode,
|
||||
letter.StrokeColor,
|
||||
letter.FillColor,
|
||||
letter.PointSize,
|
||||
letter.TextSequence);
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 101 KiB |
38
src/UglyToad.PdfPig.Tests/Images/JpegHandlerTests.cs
Normal file
38
src/UglyToad.PdfPig.Tests/Images/JpegHandlerTests.cs
Normal file
@ -0,0 +1,38 @@
|
||||
namespace UglyToad.PdfPig.Tests.Images
|
||||
{
|
||||
using System;
|
||||
using System.IO;
|
||||
using Xunit;
|
||||
using JpegHandler = UglyToad.PdfPig.Images.JpegHandler;
|
||||
|
||||
public class JpegHandlerTests
|
||||
{
|
||||
|
||||
|
||||
[Fact]
|
||||
public void CanGetJpegInformation()
|
||||
{
|
||||
|
||||
var dataJpg = LoadJpg("218995467-ccb746b0-dc28-4616-bcb1-4ad685f81876.jpg");
|
||||
|
||||
using (var ms = new MemoryStream(dataJpg))
|
||||
{
|
||||
var jpegInfo = JpegHandler.GetInformation(ms);
|
||||
|
||||
Assert.Equal(8, jpegInfo.BitsPerComponent);
|
||||
Assert.Equal(2290, jpegInfo.Height);
|
||||
Assert.Equal(1648, jpegInfo.Width);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static byte[] LoadJpg(string name)
|
||||
{
|
||||
var baseFolder = Path.GetFullPath(AppDomain.CurrentDomain.BaseDirectory);
|
||||
var JpgFilesFolder = Path.Combine(baseFolder, "..", "..", "..", "Images", "Files", "Jpg"); ;
|
||||
var JpgFilePath = Path.Combine(JpgFilesFolder, name);
|
||||
return File.ReadAllBytes(JpgFilePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
24
src/UglyToad.PdfPig.Tests/Integration/PageContentTests.cs
Normal file
24
src/UglyToad.PdfPig.Tests/Integration/PageContentTests.cs
Normal file
@ -0,0 +1,24 @@
|
||||
namespace UglyToad.PdfPig.Tests.Integration
|
||||
{
|
||||
using PdfPig.Core;
|
||||
using Xunit;
|
||||
|
||||
public class PageContentTests
|
||||
{
|
||||
[Fact]
|
||||
public void DetectPageContents()
|
||||
{
|
||||
var file = IntegrationHelpers.GetDocumentPath("Various Content Types");
|
||||
|
||||
using (var document = PdfDocument.Open(file, ParsingOptions.LenientParsingOff))
|
||||
{
|
||||
var page = document.GetPage(1);
|
||||
var letters = page.Letters;
|
||||
Assert.Contains(letters, l => l.RenderingMode == TextRenderingMode.Stroke); // "REGULAR TEXT"
|
||||
Assert.Contains(letters, l => l.RenderingMode == TextRenderingMode.Neither); // "INVISIBLE TEXT"
|
||||
Assert.NotEmpty(page.Content.GetImages());
|
||||
Assert.NotEmpty(page.Content.Paths);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -133,9 +133,4 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Images\" />
|
||||
<Folder Include="Images\Files\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -61,12 +61,33 @@
|
||||
/// Details about the font for this letter.
|
||||
/// </summary>
|
||||
public FontDetails Font { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Text rendering mode that indicates whether we should draw this letter's strokes,
|
||||
/// fill, both, neither (in case of hidden text), etc.
|
||||
/// If it calls for stroking the <see cref="StrokeColor" /> is used.
|
||||
/// If it calls for filling, the <see cref="FillColor"/> is used.
|
||||
/// In modes that perform both filling and stroking, the effect is as if each glyph outline were filled and then stroked in separate operations.
|
||||
/// </summary>
|
||||
public TextRenderingMode RenderingMode { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The color of the letter.
|
||||
/// The primary color of the letter, which is either the <see cref="StrokeColor"/> in case
|
||||
/// <see cref="RenderingMode"/> is <see cref="TextRenderingMode.Stroke"/>, or otherwise
|
||||
/// it is the <see cref="FillColor"/>.
|
||||
/// </summary>
|
||||
public IColor Color { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Stroking color
|
||||
/// </summary>
|
||||
public IColor StrokeColor { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Non-stroking (fill) color
|
||||
/// </summary>
|
||||
public IColor FillColor { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The size of the font in points.
|
||||
/// </summary>
|
||||
@ -86,7 +107,9 @@
|
||||
double width,
|
||||
double fontSize,
|
||||
FontDetails font,
|
||||
IColor color,
|
||||
TextRenderingMode renderingMode,
|
||||
IColor strokeColor,
|
||||
IColor fillColor,
|
||||
double pointSize,
|
||||
int textSequence)
|
||||
{
|
||||
@ -97,7 +120,17 @@
|
||||
Width = width;
|
||||
FontSize = fontSize;
|
||||
Font = font;
|
||||
Color = color ?? GrayColor.Black;
|
||||
RenderingMode = renderingMode;
|
||||
if (renderingMode == TextRenderingMode.Stroke)
|
||||
{
|
||||
Color = StrokeColor = strokeColor ?? GrayColor.Black;
|
||||
FillColor = fillColor;
|
||||
}
|
||||
else
|
||||
{
|
||||
Color = FillColor = fillColor ?? GrayColor.Black;
|
||||
StrokeColor = strokeColor;
|
||||
}
|
||||
PointSize = pointSize;
|
||||
TextSequence = textSequence;
|
||||
TextOrientation = GetTextOrientation();
|
||||
|
||||
@ -292,14 +292,7 @@
|
||||
var transformedPdfBounds = PerformantRectangleTransformer
|
||||
.Transform(renderingMatrix, textMatrix, transformationMatrix, new PdfRectangle(0, 0, boundingBox.Width, 0));
|
||||
|
||||
// If the text rendering mode calls for filling, the current nonstroking color in the graphics state is used;
|
||||
// if it calls for stroking, the current stroking color is used.
|
||||
// In modes that perform both filling and stroking, the effect is as if each glyph outline were filled and then stroked in separate operations.
|
||||
// TODO: expose color as something more advanced
|
||||
var color = currentState.FontState.TextRenderingMode != TextRenderingMode.Stroke
|
||||
? currentState.CurrentNonStrokingColor
|
||||
: currentState.CurrentStrokingColor;
|
||||
|
||||
|
||||
Letter letter = null;
|
||||
if (Diacritics.IsInCombiningDiacriticRange(unicode) && bytes.CurrentOffset > 0 && letters.Count > 0)
|
||||
{
|
||||
@ -319,26 +312,16 @@
|
||||
attachTo.Width,
|
||||
attachTo.FontSize,
|
||||
attachTo.Font,
|
||||
attachTo.Color,
|
||||
attachTo.RenderingMode,
|
||||
attachTo.StrokeColor,
|
||||
attachTo.FillColor,
|
||||
attachTo.PointSize,
|
||||
attachTo.TextSequence);
|
||||
}
|
||||
else
|
||||
{
|
||||
letter = new Letter(
|
||||
unicode,
|
||||
transformedGlyphBounds,
|
||||
transformedPdfBounds.BottomLeft,
|
||||
transformedPdfBounds.BottomRight,
|
||||
transformedPdfBounds.Width,
|
||||
fontSize,
|
||||
font.Details,
|
||||
color,
|
||||
pointSize,
|
||||
textSequence);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
// If we did not create a letter for a combined diacritic, create one here.
|
||||
if (letter == null)
|
||||
{
|
||||
letter = new Letter(
|
||||
unicode,
|
||||
@ -348,7 +331,9 @@
|
||||
transformedPdfBounds.Width,
|
||||
fontSize,
|
||||
font.Details,
|
||||
color,
|
||||
currentState.FontState.TextRenderingMode,
|
||||
currentState.CurrentStrokingColor,
|
||||
currentState.CurrentNonStrokingColor,
|
||||
pointSize,
|
||||
textSequence);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
namespace UglyToad.PdfPig.Images
|
||||
{
|
||||
using System;
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
internal static class JpegHandler
|
||||
@ -28,6 +28,19 @@
|
||||
{
|
||||
switch (marker)
|
||||
{
|
||||
case JpegMarker.StartOfImage:
|
||||
case JpegMarker.EndOfImage:
|
||||
case JpegMarker.Restart0:
|
||||
case JpegMarker.Restart1:
|
||||
case JpegMarker.Restart2:
|
||||
case JpegMarker.Restart3:
|
||||
case JpegMarker.Restart4:
|
||||
case JpegMarker.Restart5:
|
||||
case JpegMarker.Restart6:
|
||||
case JpegMarker.Restart7:
|
||||
|
||||
// No length markers
|
||||
break;
|
||||
case JpegMarker.StartOfBaselineDctFrame:
|
||||
case JpegMarker.StartOfProgressiveDctFrame:
|
||||
{
|
||||
@ -55,6 +68,7 @@
|
||||
case JpegMarker.ApplicationSpecific13:
|
||||
case JpegMarker.ApplicationSpecific14:
|
||||
case JpegMarker.ApplicationSpecific15:
|
||||
default:
|
||||
{
|
||||
var length = ReadShort(stream, shortBuffer);
|
||||
stream.Seek(length - 2, SeekOrigin.Current);
|
||||
@ -105,7 +119,7 @@
|
||||
}
|
||||
|
||||
if (previous.HasValue && previous.Value == MarkerStart && b != MarkerStart)
|
||||
{
|
||||
{
|
||||
return b;
|
||||
}
|
||||
|
||||
|
||||
@ -895,7 +895,16 @@
|
||||
|
||||
var documentSpace = textMatrix.Transform(renderingMatrix.Transform(fontMatrix.Transform(rect)));
|
||||
|
||||
var letter = new Letter(c.ToString(), documentSpace, advanceRect.BottomLeft, advanceRect.BottomRight, width, (double)fontSize, FontDetails.GetDefault(name),
|
||||
var letter = new Letter(
|
||||
c.ToString(),
|
||||
documentSpace,
|
||||
advanceRect.BottomLeft,
|
||||
advanceRect.BottomRight,
|
||||
width,
|
||||
(double)fontSize,
|
||||
FontDetails.GetDefault(name),
|
||||
TextRenderingMode.Fill,
|
||||
GrayColor.Black,
|
||||
GrayColor.Black,
|
||||
(double)fontSize,
|
||||
textSequence);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user