From d3249dc3d599e7086e543e036f7372df98834fe2 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Thu, 9 Jan 2020 21:25:41 +0100 Subject: [PATCH] #490: Refactorings. --- .../imageio/path/AdobePathReader.java | 16 ++++++---------- .../imageio/path/AdobePathSegment.java | 8 ++++++++ .../imageio/path/AdobePathWriter.java | 4 ---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathReader.java b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathReader.java index cae9d8dd..fefc07c5 100755 --- a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathReader.java +++ b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathReader.java @@ -230,18 +230,14 @@ public final class AdobePathReader { default: return new AdobePathSegment( selector, - toFixedPoint(data.readInt()), - toFixedPoint(data.readInt()), - toFixedPoint(data.readInt()), - toFixedPoint(data.readInt()), - toFixedPoint(data.readInt()), - toFixedPoint(data.readInt()) + AdobePathSegment.fromFixedPoint(data.readInt()), + AdobePathSegment.fromFixedPoint(data.readInt()), + AdobePathSegment.fromFixedPoint(data.readInt()), + AdobePathSegment.fromFixedPoint(data.readInt()), + AdobePathSegment.fromFixedPoint(data.readInt()), + AdobePathSegment.fromFixedPoint(data.readInt()) ); } } - // TODO: Move to AdobePathSegment - private static double toFixedPoint(final int fixed) { - return ((double) fixed / 0x1000000); - } } diff --git a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathSegment.java b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathSegment.java index d5cc82cf..739e219d 100755 --- a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathSegment.java +++ b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathSegment.java @@ -131,6 +131,14 @@ final class AdobePathSegment { this.cplx = cplx; } + static int toFixedPoint(final double value) { + return (int) Math.round(value * 0x1000000); + } + + static double fromFixedPoint(final int fixed) { + return ((double) fixed / 0x1000000); + } + @Override public boolean equals(final Object other) { if (this == other) { diff --git a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathWriter.java b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathWriter.java index 26f52068..89be1594 100755 --- a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathWriter.java +++ b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathWriter.java @@ -219,8 +219,4 @@ public final class AdobePathWriter { return bytes.toByteArray(); } - // TODO: Move to AdobePathSegment - private static int toFixedPoint(final double value) { - return (int) Math.round(value * 0x1000000); - } }