diff --git a/src/main/java/org/marlin/pisces/DDasher.java b/src/main/java/org/marlin/pisces/DDasher.java index 4403178..c4efee7 100644 --- a/src/main/java/org/marlin/pisces/DDasher.java +++ b/src/main/java/org/marlin/pisces/DDasher.java @@ -27,7 +27,6 @@ import java.util.Arrays; - /** * The DDasher class takes a series of linear commands * (moveTo, lineTo, close and diff --git a/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java b/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java index 1ae88bb..4eda65e 100644 --- a/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java +++ b/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java @@ -32,7 +32,6 @@ import java.security.AccessController; import org.marlin.geom.Path2D; import static org.marlin.pisces.MarlinUtils.logInfo; - import org.marlin.ReentrantContextProvider; import org.marlin.ReentrantContextProviderCLQ; import org.marlin.ReentrantContextProviderTL; diff --git a/src/main/java/org/marlin/pisces/DRenderer.java b/src/main/java/org/marlin/pisces/DRenderer.java index 43074a3..c354b0b 100644 --- a/src/main/java/org/marlin/pisces/DRenderer.java +++ b/src/main/java/org/marlin/pisces/DRenderer.java @@ -262,7 +262,6 @@ private void curveBreakIntoLinesAndAdd(double x0, double y0, while (count > 0) { // divide step by half: while (Math.abs(ddx) + Math.abs(ddy) >= _DEC_BND) { -// while (Math.abs(ddx) >= _DEC_BND || Math.abs(ddy) >= _DEC_BND) { dddx /= 8.0d; dddy /= 8.0d; ddx = ddx / 4.0d - dddx; @@ -279,7 +278,6 @@ private void curveBreakIntoLinesAndAdd(double x0, double y0, // double step: // can only do this on even "count" values, because we must divide count by 2 while (count % 2 == 0 -// && Math.abs(dx) <= _INC_BND && Math.abs(dy) <= _INC_BND) && Math.abs(dx) + Math.abs(dy) <= _INC_BND) { dx = 2.0d * dx + ddx; @@ -618,7 +616,7 @@ DRenderer init(final int pix_boundsX, final int pix_boundsY, /** * Disposes this renderer and recycle it clean up before reusing this instance */ - public void dispose() { + void dispose() { if (DO_STATS) { rdrCtx.stats.stat_rdr_activeEdges.add(activeEdgeMaxUsed); rdrCtx.stats.stat_rdr_edges.add(edges.used); diff --git a/src/main/java/org/marlin/pisces/DStroker.java b/src/main/java/org/marlin/pisces/DStroker.java index 461bd30..8ba5b47 100644 --- a/src/main/java/org/marlin/pisces/DStroker.java +++ b/src/main/java/org/marlin/pisces/DStroker.java @@ -27,8 +27,6 @@ import java.util.Arrays; - - // TODO: some of the arithmetic here is too verbose and prone to hard to // debug typos. We should consider making a small Point/Vector class that // has methods like plus(Point), minus(Point), dot(Point), cross(Point)and such diff --git a/src/main/java/org/marlin/pisces/MarlinTileGenerator.java b/src/main/java/org/marlin/pisces/MarlinTileGenerator.java index 572b951..baabdd5 100644 --- a/src/main/java/org/marlin/pisces/MarlinTileGenerator.java +++ b/src/main/java/org/marlin/pisces/MarlinTileGenerator.java @@ -59,7 +59,7 @@ final class MarlinTileGenerator implements AATileGenerator, MarlinConst { // per-thread renderer stats final RendererStats rdrStats; - MarlinTileGenerator(final RendererStats stats, final MarlinRenderer r, + MarlinTileGenerator(final RendererStats stats, final MarlinRenderer r, final MarlinCache cache) { this.rdrStats = stats; diff --git a/src/main/java/sun/java2d/pipe/AAShapePipe.java b/src/main/java/sun/java2d/pipe/AAShapePipe.java index e7affc8..642f796 100644 --- a/src/main/java/sun/java2d/pipe/AAShapePipe.java +++ b/src/main/java/sun/java2d/pipe/AAShapePipe.java @@ -44,10 +44,10 @@ public final class AAShapePipe implements ShapeDrawPipe, ParallelogramPipe { - static final RenderingEngine renderengine = RenderingEngine.getInstance(); + static final RenderingEngine RDR_ENGINE = RenderingEngine.getInstance(); // Per-thread TileState (~1K very small so do not use any Weak Reference) - private static final ReentrantContextProvider tileStateProvider = + private static final ReentrantContextProvider TILE_STATE_PROVIDER = new ReentrantContextProviderTL( ReentrantContextProvider.REF_HARD) { @@ -90,19 +90,19 @@ public void fillParallelogram(SunGraphics2D sg, double dx1, double dy1, double dx2, double dy2) { - final TileState ts = tileStateProvider.acquire(); + final TileState ts = TILE_STATE_PROVIDER.acquire(); try { final int[] abox = ts.abox; final AATileGenerator aatg = - renderengine.getAATileGenerator(x, y, dx1, dy1, dx2, dy2, 0, 0, + RDR_ENGINE.getAATileGenerator(x, y, dx1, dy1, dx2, dy2, 0, 0, sg.getCompClip(), abox); if (aatg != null) { renderTiles(sg, ts.computeBBox(ux1, uy1, ux2, uy2), aatg, abox, ts); } } finally { - tileStateProvider.release(ts); + TILE_STATE_PROVIDER.release(ts); } } @@ -115,12 +115,12 @@ public void drawParallelogram(SunGraphics2D sg, double dx2, double dy2, double lw1, double lw2) { - final TileState ts = tileStateProvider.acquire(); + final TileState ts = TILE_STATE_PROVIDER.acquire(); try { final int[] abox = ts.abox; final AATileGenerator aatg = - renderengine.getAATileGenerator(x, y, dx1, dy1, dx2, dy2, lw1, + RDR_ENGINE.getAATileGenerator(x, y, dx1, dy1, dx2, dy2, lw1, lw2, sg.getCompClip(), abox); if (aatg != null) { // Note that bbox is of the original shape, not the wide path. @@ -129,7 +129,7 @@ public void drawParallelogram(SunGraphics2D sg, aatg, abox, ts); } } finally { - tileStateProvider.release(ts); + TILE_STATE_PROVIDER.release(ts); } } @@ -138,18 +138,18 @@ public void renderPath(SunGraphics2D sg, Shape s, BasicStroke bs) { sg.strokeHint != SunHints.INTVAL_STROKE_PURE); final boolean thin = (sg.strokeState <= SunGraphics2D.STROKE_THINDASHED); - final TileState ts = tileStateProvider.acquire(); + final TileState ts = TILE_STATE_PROVIDER.acquire(); try { final int[] abox = ts.abox; final AATileGenerator aatg = - renderengine.getAATileGenerator(s, sg.transform, sg.getCompClip(), + RDR_ENGINE.getAATileGenerator(s, sg.transform, sg.getCompClip(), bs, thin, adjust, abox); if (aatg != null) { renderTiles(sg, s, aatg, abox, ts); } } finally { - tileStateProvider.release(ts); + TILE_STATE_PROVIDER.release(ts); } }