Author: tilman
Date: Thu Feb 6 19:22:39 2025
New Revision: 1923623
URL: http://svn.apache.org/viewvc?rev=1923623&view=rev
Log:
PDFBOX-5946: replace drawCross with drawZapf call
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java?rev=1923623&r1=1923622&r2=1923623&view=diff
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java
(original)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java
Thu Feb 6 19:22:39 2025
@@ -114,7 +114,7 @@ public class PDTextAppearanceHandler ext
}
else if (PDAnnotationText.NAME_CROSS.equals(annotationTypeName))
{
- drawCross(annotation, contentStream);
+ drawZapf(annotation, contentStream, 19, 0, "a22"); // 0x2716
}
else if (PDAnnotationText.NAME_CIRCLE.equals(annotationTypeName))
{
@@ -291,41 +291,6 @@ public class PDTextAppearanceHandler ext
contentStream.closeAndFillAndStroke();
}
- private void drawCross(PDAnnotationText annotation, final
PDAppearanceContentStream contentStream)
- throws IOException
- {
- PDRectangle bbox = adjustRectAndBBox(annotation, 19, 19);
-
- // should be a square, but who knows...
- float min = Math.min(bbox.getWidth(), bbox.getHeight());
-
- // small = offset nearest bbox edge
- // large = offset second nearest bbox edge
- float small = min / 10;
- float large = min / 5;
-
- contentStream.setMiterLimit(4);
- contentStream.setLineJoinStyle(1);
- contentStream.setLineCapStyle(0);
- contentStream.setLineWidth(0.59f); // value from Adobe
-
- contentStream.moveTo(small, large);
- contentStream.lineTo(large, small);
- contentStream.lineTo(min / 2, min / 2 - small);
- contentStream.lineTo(min - large, small);
- contentStream.lineTo(min - small, large);
- contentStream.lineTo(min / 2 + small, min / 2);
- contentStream.lineTo(min - small, min - large);
- contentStream.lineTo(min - large, min - small);
- contentStream.lineTo(min / 2, min / 2 + small);
- contentStream.lineTo(large, min - small);
- contentStream.lineTo(small, min - large);
- contentStream.lineTo(min / 2 - small, min / 2);
- contentStream.closeAndFillAndStroke();
-
- // alternatively, this could also be drawn with Zapf Dingbats "a21"
- }
-
private void drawHelp(PDAnnotationText annotation, final
PDAppearanceContentStream contentStream)
throws IOException
{
