bridge,css,swing: avoid unnecessary conversions to and from float/double

css4j · Sep 18, 2023 · 03fb72b · 03fb72b
1 parent 1703c17
commit 03fb72b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextPathElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextPathElementBridge.java
@@ -127,7 +127,7 @@ public TextPath createTextPath(BridgeContext ctx, Element textPathElement) {
 					throw new BridgeException(ctx, textPathElement, ERR_ATTRIBUTE_VALUE_MALFORMED,
 							new Object[] { SVG_START_OFFSET_ATTRIBUTE, s });
 				}
-				startOffset = (float) (startOffsetPercent * pathLength / 100.0);
+				startOffset = startOffsetPercent * pathLength / 100f;
 
 			} else {
 				// its an absolute length

diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java
@@ -241,34 +241,34 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin
 			break;
 
 		case 's':
-			fs = (float) (fs / 1.2);
+			fs = fs / 1.2f;
 			break;
 
 		case 'l':
-			fs = (float) (fs * 1.2);
+			fs = fs * 1.2f;
 			break;
 
 		default: // 'x'
 			switch (s.charAt(1)) {
 			case 'x':
 				switch (s.charAt(3)) {
 				case 's':
-					fs = (float) (((fs / 1.2) / 1.2) / 1.2);
+					fs = fs / (float) (1.2 * 1.2 * 1.2);
 					break;
 
 				default: // 'l'
-					fs = (float) (fs * 1.2 * 1.2 * 1.2);
+					fs = fs * (float) (1.2 * 1.2 * 1.2);
 				}
 				break;
 
 			default: // '-'
 				switch (s.charAt(2)) {
 				case 's':
-					fs = (float) ((fs / 1.2) / 1.2);
+					fs = fs / (float) (1.2 * 1.2);
 					break;
 
 				default: // 'l'
-					fs = (float) (fs * 1.2 * 1.2);
+					fs = fs * (float) (1.2 * 1.2);
 				}
 			}
 		}

diff --git a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java
@@ -1019,8 +1019,8 @@ protected boolean updateRenderingTransform() {
 				float dx = (float) ((d.width / 2.0f) - pt.getX());
 				float dy = (float) ((d.height / 2.0f) - pt.getY());
 				// Round the values to nearest integer.
-				dx = (int) ((dx < 0) ? (dx - .5) : (dx + .5));
-				dy = (int) ((dy < 0) ? (dy - .5) : (dy + .5));
+				dx = (int) ((dx < 0) ? (dx - .5f) : (dx + .5f));
+				dy = (int) ((dy < 0) ? (dy - .5f) : (dy + .5f));
 				if ((dx != 0) || (dy != 0)) {
 					rendAT.preConcatenate(AffineTransform.getTranslateInstance(dx, dy));
 					setRenderingTransform(rendAT, false);