Author: msahyoun Date: Mon Feb 19 11:53:19 2018 New Revision: 1824741 URL: http://svn.apache.org/viewvc?rev=1824741&view=rev Log: PDFBOX-4071: use Float.compare for float comparison
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java 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 pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java?rev=1824741&r1=1824740&r2=1824741&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java Mon Feb 19 11:53:19 2018 @@ -72,7 +72,7 @@ class AnnotationBorder boolean allZero = true; for (float f : ab.dashArray) { - if (f != 0) + if (Float.compare(f, 0) != 0) { allZero = false; break; 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=1824741&r1=1824740&r2=1824741&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 Mon Feb 19 11:53:19 2018 @@ -150,18 +150,18 @@ public class PDHighlightAppearanceHandle // distance of about 1/4 of the height. // note that curves won't appear if outside of the rectangle float delta = 0; - if (pathsArray[of + 0] == pathsArray[of + 4] && - pathsArray[of + 1] == pathsArray[of + 3] && - pathsArray[of + 2] == pathsArray[of + 6] && - pathsArray[of + 5] == pathsArray[of + 7]) + if (Float.compare(pathsArray[of + 0], pathsArray[of + 4]) == 0 && + Float.compare(pathsArray[of + 1], pathsArray[of + 3]) == 0 && + Float.compare(pathsArray[of + 2], pathsArray[of + 6]) == 0 && + Float.compare(pathsArray[of + 5], pathsArray[of + 7]) == 0) { // horizontal highlight delta = (pathsArray[of + 1] - pathsArray[of + 5]) / 4; } - else if (pathsArray[of + 1] == pathsArray[of + 5] && - pathsArray[of + 0] == pathsArray[of + 2] && - pathsArray[of + 3] == pathsArray[of + 7] && - pathsArray[of + 4] == pathsArray[of + 6]) + else if (Float.compare(pathsArray[of + 1], pathsArray[of + 5]) == 0 && + Float.compare(pathsArray[of + 0], pathsArray[of + 2]) == 0 && + Float.compare(pathsArray[of + 3], pathsArray[of + 7]) == 0 && + Float.compare(pathsArray[of + 4], pathsArray[of + 6]) == 0) { // vertical highlight delta = (pathsArray[of + 0] - pathsArray[of + 4]) / 4; @@ -169,14 +169,14 @@ public class PDHighlightAppearanceHandle frm2CS.moveTo(pathsArray[of + 4], pathsArray[of + 5]); - if (pathsArray[of + 0] == pathsArray[of + 4]) + if (Float.compare(pathsArray[of + 0], pathsArray[of + 4]) == 0) { // horizontal highlight frm2CS.curveTo(pathsArray[of + 4] - delta, pathsArray[of + 5] + delta, pathsArray[of + 0] - delta, pathsArray[of + 1] - delta, pathsArray[of + 0], pathsArray[of + 1]); } - else if (pathsArray[of + 5] == pathsArray[of + 1]) + else if (Float.compare(pathsArray[of + 5], pathsArray[of + 1]) == 0) { // vertical highlight frm2CS.curveTo(pathsArray[of + 4] + delta, pathsArray[of + 5] + delta, @@ -188,14 +188,14 @@ public class PDHighlightAppearanceHandle frm2CS.lineTo(pathsArray[of + 0], pathsArray[of + 1]); } frm2CS.lineTo(pathsArray[of + 2], pathsArray[of + 3]); - if (pathsArray[of + 2] == pathsArray[of + 6]) + if (Float.compare(pathsArray[of + 2], pathsArray[of + 6]) == 0) { // horizontal highlight frm2CS.curveTo(pathsArray[of + 2] + delta, pathsArray[of + 3] - delta, pathsArray[of + 6] + delta, pathsArray[of + 7] + delta, pathsArray[of + 6], pathsArray[of + 7]); } - else if (pathsArray[of + 3] == pathsArray[of + 7]) + else if (Float.compare(pathsArray[of + 3], pathsArray[of + 7]) == 0) { // vertical highlight frm2CS.curveTo(pathsArray[of + 2] - delta, pathsArray[of + 3] - delta, 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=1824741&r1=1824740&r2=1824741&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 Mon Feb 19 11:53:19 2018 @@ -52,7 +52,7 @@ public class PDInkAppearanceHandler exte // 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 || ab.width == 0) + if (color == null || color.getComponents().length == 0 || Float.compare(ab.width, 0) == 0) { return; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java?rev=1824741&r1=1824740&r2=1824741&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java Mon Feb 19 11:53:19 2018 @@ -252,7 +252,7 @@ public class PDLineAppearanceHandler ext cs.endText(); } - if (captionVerticalOffset != 0) + if (Float.compare(captionVerticalOffset, 0) != 0) { // Adobe paints vertical bar to the caption cs.moveTo(0 + lineLength / 2, y); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java?rev=1824741&r1=1824740&r2=1824741&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java Mon Feb 19 11:53:19 2018 @@ -63,7 +63,7 @@ public class PDPolylineAppearanceHandler } AnnotationBorder ab = AnnotationBorder.getAnnotationBorder(annotation, annotation.getBorderStyle()); PDColor color = annotation.getColor(); - if (color == null || color.getComponents().length == 0 || ab.width == 0) + if (color == null || color.getComponents().length == 0 || Float.compare(ab.width, 0) == 0) { return; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java?rev=1824741&r1=1824740&r2=1824741&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java Mon Feb 19 11:53:19 2018 @@ -61,7 +61,7 @@ public class PDStrikeoutAppearanceHandle { return; } - if (ab.width == 0) + if (Float.compare(ab.width, 0) == 0) { // value found in adobe reader ab.width = 1.5f; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java?rev=1824741&r1=1824740&r2=1824741&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java Mon Feb 19 11:53:19 2018 @@ -61,7 +61,7 @@ public class PDUnderlineAppearanceHandle { return; } - if (ab.width == 0) + if (Float.compare(ab.width, 0) == 0) { // value found in adobe reader ab.width = 1.5f;