You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/09/30 17:06:39 UTC
svn commit: r1893757 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers:
PDHighlightAppearanceHandler.java PDInkAppearanceHandler.java
Author: tilman
Date: Thu Sep 30 17:06:38 2021
New Revision: 1893757
URL: http://svn.apache.org/viewvc?rev=1893757&view=rev
Log:
PDFBOX-4892: optimize, as suggested by valerybokov
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java?rev=1893757&r1=1893756&r2=1893757&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java Thu Sep 30 17:06:38 2021
@@ -63,18 +63,19 @@ public class PDHighlightAppearanceHandle
public void generateNormalAppearance()
{
PDAnnotationHighlight annotation = (PDAnnotationHighlight) getAnnotation();
- PDRectangle rect = annotation.getRectangle();
+
float[] pathsArray = annotation.getQuadPoints();
if (pathsArray == null)
{
return;
}
- AnnotationBorder ab = AnnotationBorder.getAnnotationBorder(annotation, annotation.getBorderStyle());
PDColor color = annotation.getColor();
if (color == null || color.getComponents().length == 0)
{
return;
}
+ PDRectangle rect = annotation.getRectangle();
+ AnnotationBorder ab = AnnotationBorder.getAnnotationBorder(annotation, annotation.getBorderStyle());
// Adjust rectangle even if not empty, see PLPDF.com-MarkupAnnotations.pdf
//TODO in a class structure this should be overridable
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java?rev=1893757&r1=1893756&r2=1893757&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java Thu Sep 30 17:06:38 2021
@@ -56,10 +56,14 @@ public class PDInkAppearanceHandler exte
public void generateNormalAppearance()
{
PDAnnotationInk ink = (PDAnnotationInk) getAnnotation();
+ PDColor color = ink.getColor();
+ if (color == null || color.getComponents().length == 0)
+ {
+ return;
+ }
// PDF spec does not mention /Border for ink annotations, but it is used if /BS is not available
AnnotationBorder ab = AnnotationBorder.getAnnotationBorder(ink, ink.getBorderStyle());
- PDColor color = ink.getColor();
- if (color == null || color.getComponents().length == 0 || Float.compare(ab.width, 0) == 0)
+ if (Float.compare(ab.width, 0) == 0)
{
return;
}