You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/03/29 12:08:38 UTC
svn commit: r1875847 - in /pdfbox/trunk:
debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/
examples/src/main/java/org/apache/pdfbox/examples/rendering/
examples/src/main/java/org/apache/pdfbox/examples/util/
pdfbox/src/main/java/org/apache/pd...
Author: lehmi
Date: Sun Mar 29 12:08:38 2020
New Revision: 1875847
URL: http://svn.apache.org/viewvc?rev=1875847&view=rev
Log:
PDFBOX-4804: remove no longer needed parameter
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugPageDrawer.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomGraphicsStreamEngine.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugPageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugPageDrawer.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugPageDrawer.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugPageDrawer.java Sun Mar 29 12:08:38 2020
@@ -52,11 +52,11 @@ final class DebugPageDrawer extends Page
* Glyph bounding boxes.
*/
@Override
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, Vector displacement)
+ throws IOException
{
// draw glyph
- super.showGlyph(textRenderingMatrix, font, code, unicode, displacement);
+ super.showGlyph(textRenderingMatrix, font, code, displacement);
if (showGlyphBounds)
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomGraphicsStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomGraphicsStreamEngine.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomGraphicsStreamEngine.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomGraphicsStreamEngine.java Sun Mar 29 12:08:38 2020
@@ -189,11 +189,11 @@ public class CustomGraphicsStreamEngine
* Overridden from PDFStreamEngine.
*/
@Override
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, Vector displacement)
+ throws IOException
{
- System.out.print(unicode);
- super.showGlyph(textRenderingMatrix, font, code, unicode, displacement);
+ System.out.print("showGlyph " + code);
+ super.showGlyph(textRenderingMatrix, font, code, displacement);
}
// NOTE: there are may more methods in PDFStreamEngine which can be overridden here too.
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java Sun Mar 29 12:08:38 2020
@@ -113,11 +113,11 @@ public class CustomPageDrawer
* Glyph bounding boxes.
*/
@Override
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code,
+ Vector displacement) throws IOException
{
// draw glyph
- super.showGlyph(textRenderingMatrix, font, code, unicode, displacement);
+ super.showGlyph(textRenderingMatrix, font, code, displacement);
// bbox in EM -> user units
Shape bbox = new Rectangle2D.Float(0, 0, font.getWidth(code) / 1000, 1);
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java Sun Mar 29 12:08:38 2020
@@ -108,9 +108,10 @@ public class DrawPrintTextLocations exte
}
@Override
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, Vector displacement)
+ throws IOException
{
- super.showGlyph(textRenderingMatrix, font, code, unicode, displacement);
+ super.showGlyph(textRenderingMatrix, font, code, displacement);
// in cyan:
// show actual glyph bounds. This must be done here and not in writeString(),
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Sun Mar 29 12:08:38 2020
@@ -688,7 +688,6 @@ public abstract class PDFStreamEngine
int before = in.available();
int code = font.readCode(in);
int codeLength = before - in.available();
- String unicode = font.toUnicode(code);
// Word spacing shall be applied to every occurrence of the single-byte character code
// 32 in a string when using a simple font or a composite font that defines code 32 as
@@ -721,7 +720,7 @@ public abstract class PDFStreamEngine
saveGraphicsState();
Matrix textMatrixOld = textMatrix;
Matrix textLineMatrixOld = textLineMatrix;
- showGlyph(textRenderingMatrix, font, code, unicode, w);
+ showGlyph(textRenderingMatrix, font, code, w);
textMatrix = textMatrixOld;
textLineMatrix = textLineMatrixOld;
restoreGraphicsState();
@@ -752,20 +751,19 @@ public abstract class PDFStreamEngine
* @param textRenderingMatrix the current text rendering matrix, T<sub>rm</sub>
* @param font the current font
* @param code internal PDF character code for the glyph
- * @param unicode the Unicode text for this glyph, or null if the PDF does provide it
* @param displacement the displacement (i.e. advance) of the glyph in text space
* @throws IOException if the glyph cannot be processed
*/
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, Vector displacement)
+ throws IOException
{
if (font instanceof PDType3Font)
{
- showType3Glyph(textRenderingMatrix, (PDType3Font)font, code, unicode, displacement);
+ showType3Glyph(textRenderingMatrix, (PDType3Font) font, code, displacement);
}
else
{
- showFontGlyph(textRenderingMatrix, font, code, unicode, displacement);
+ showFontGlyph(textRenderingMatrix, font, code, displacement);
}
}
@@ -776,12 +774,11 @@ public abstract class PDFStreamEngine
* @param textRenderingMatrix the current text rendering matrix, T<sub>rm</sub>
* @param font the current font
* @param code internal PDF character code for the glyph
- * @param unicode the Unicode text for this glyph, or null if the PDF does provide it
* @param displacement the displacement (i.e. advance) of the glyph in text space
* @throws IOException if the glyph cannot be processed
*/
- protected void showFontGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showFontGlyph(Matrix textRenderingMatrix, PDFont font,
+ int code, Vector displacement) throws IOException
{
// overridden in subclasses
}
@@ -793,12 +790,11 @@ public abstract class PDFStreamEngine
* @param textRenderingMatrix the current text rendering matrix, T<sub>rm</sub>
* @param font the current font
* @param code internal PDF character code for the glyph
- * @param unicode the Unicode text for this glyph, or null if the PDF does provide it
* @param displacement the displacement (i.e. advance) of the glyph in text space
* @throws IOException if the glyph cannot be processed
*/
protected void showType3Glyph(Matrix textRenderingMatrix, PDType3Font font, int code,
- String unicode, Vector displacement) throws IOException
+ Vector displacement) throws IOException
{
PDType3CharProc charProc = font.getCharProc(code);
if (charProc != null)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Sun Mar 29 12:08:38 2020
@@ -427,8 +427,8 @@ public class PageDrawer extends PDFGraph
}
@Override
- protected void showFontGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showFontGlyph(Matrix textRenderingMatrix, PDFont font, int code,
+ Vector displacement) throws IOException
{
AffineTransform at = textRenderingMatrix.createAffineTransform();
at.concatenate(font.getFontMatrix().createAffineTransform());
@@ -512,13 +512,13 @@ public class PageDrawer extends PDFGraph
@Override
protected void showType3Glyph(Matrix textRenderingMatrix, PDType3Font font, int code,
- String unicode, Vector displacement) throws IOException
+ Vector displacement) throws IOException
{
PDGraphicsState state = getGraphicsState();
RenderingMode renderingMode = state.getTextState().getRenderingMode();
if (!RenderingMode.NEITHER.equals(renderingMode))
{
- super.showType3Glyph(textRenderingMatrix, font, code, unicode, displacement);
+ super.showType3Glyph(textRenderingMatrix, font, code, displacement);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java Sun Mar 29 12:08:38 2020
@@ -146,8 +146,8 @@ class LegacyPDFStreamEngine extends PDFS
* written by Ben Litchfield for PDFStreamEngine.
*/
@Override
- protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode,
- Vector displacement) throws IOException
+ protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, Vector displacement)
+ throws IOException
{
//
// legacy calculations which were previously in PDFStreamEngine
@@ -297,7 +297,7 @@ class LegacyPDFStreamEngine extends PDFS
float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
// use our additional glyph list for Unicode mapping
- unicode = font.toUnicode(code, glyphList);
+ String unicode = font.toUnicode(code, glyphList);
// when there is no Unicode mapping available, Acrobat simply coerces the character code
// into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java?rev=1875847&r1=1875846&r2=1875847&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java Sun Mar 29 12:08:38 2020
@@ -306,7 +306,6 @@ public final class ExtractImages
protected void showGlyph(Matrix textRenderingMatrix,
PDFont font,
int code,
- String unicode,
Vector displacement) throws IOException
{
RenderingMode renderingMode = getGraphicsState().getTextState().getRenderingMode();