For #148 #136 #143 - Fix incorrect use of Float.MIN_VALUE and update …

…README with strikethrough fix.
danfickle · Nov 25, 2017 · 48b089f · 48b089f
1 parent 870d326
commit 48b089f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -58,6 +58,7 @@ CHANGELOG
 
 head - 0.0.1-RC12-SNAPSHOT
 ========
++ [Fix incorrect strikethrough offset](https://github.com/danfickle/openhtmltopdf/issues/136) Thanks @alebar, @backslash47, @izhenka
 + Allow percentages for max-width and max-height of images Thanks @backslash47
 + [Better sizing system for inline SVG images](https://github.com/danfickle/openhtmltopdf/issues/128) Thanks @harbulot
 + [Allow uri resolver to resolve uri before checking if a data uri](https://github.com/danfickle/openhtmltopdf/pull/132) Thanks @AlbanSeurat

diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/LineMetricsAdapter.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/LineMetricsAdapter.java
@@ -45,7 +45,7 @@ public LineMetricsAdapter(List<Font> fonts, String str, FontRenderContext ctx) {
     }
 
     public float getAscent() {
-    	float maxAscent = Float.MIN_VALUE;
+    	float maxAscent = -Float.MAX_VALUE;
 
     	for (LineMetrics met : _lineMetrics) {
     		maxAscent = Math.max(maxAscent, met.getAscent());
@@ -55,7 +55,7 @@ public float getAscent() {
     }
 
     public float getDescent() {
-    	float maxDescent = Float.MIN_VALUE;
+    	float maxDescent = -Float.MAX_VALUE;
 
     	for (LineMetrics met : _lineMetrics) {
     		maxDescent = Math.max(maxDescent, met.getDescent());
@@ -75,7 +75,7 @@ public float getStrikethroughOffset() {
     }
 
     public float getStrikethroughThickness() {
-    	float max = Float.MIN_VALUE;
+    	float max = -Float.MAX_VALUE;
 
     	for (LineMetrics met : _lineMetrics) {
     		max = Math.max(max, met.getStrikethroughThickness());
@@ -85,7 +85,7 @@ public float getStrikethroughThickness() {
     }
 
     public float getUnderlineOffset() {
-    	float max = Float.MIN_VALUE;
+    	float max = -Float.MAX_VALUE;
 
     	for (LineMetrics met : _lineMetrics) {
     		max = Math.max(max, met.getUnderlineOffset());
@@ -95,7 +95,7 @@ public float getUnderlineOffset() {
     }
 
     public float getUnderlineThickness() {
-    	float max = Float.MIN_VALUE;
+    	float max = -Float.MAX_VALUE;
 
     	for (LineMetrics met : _lineMetrics) {
     		max = Math.max(max, met.getUnderlineThickness());

diff --git a/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxTextRenderer.java b/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxTextRenderer.java
@@ -63,12 +63,12 @@ public FSFontMetrics getFSFontMetrics(FontContext context, FSFont font, String s
         PdfBoxFSFontMetrics result = new PdfBoxFSFontMetrics();
 
         try {
-            float largestAscent = Float.MIN_VALUE;
-            float largestDescent = Float.MIN_VALUE;
+            float largestAscent = -Float.MAX_VALUE;
+            float largestDescent = -Float.MAX_VALUE;
             float largestStrikethroughOffset = -Float.MAX_VALUE;
-            float largestStrikethroughThickness = Float.MIN_VALUE;
-            float largestUnderlinePosition = Float.MIN_VALUE;
-            float largestUnderlineThickness = Float.MIN_VALUE;
+            float largestStrikethroughThickness = -Float.MAX_VALUE;
+            float largestUnderlinePosition = -Float.MAX_VALUE;
+            float largestUnderlineThickness = -Float.MAX_VALUE;
 
             for (FontDescription des : descrs) {
                 float loopAscent = des.getFont().getBoundingBox().getUpperRightY();