modules/javafx.graphics/src/main/java/com/sun/marlin/Stroker.java

*** 139,162 ****
       * <code>CAP_SQUARE</code>.
       * @param joinStyle the desired line join style, one of
       * <code>JOIN_MITER</code>, <code>JOIN_ROUND</code> or
       * <code>JOIN_BEVEL</code>.
       * @param miterLimit the desired miter limit
-      * @param scale scaling factor applied to clip boundaries
-      * @param rdrOffX renderer's coordinate offset on X axis
-      * @param rdrOffY renderer's coordinate offset on Y axis
       * @param subdivideCurves true to indicate to subdivide curves, false if dasher does
       * @return this instance
       */
      public Stroker init(final PathConsumer2D pc2d,
                          final float lineWidth,
                          final int capStyle,
                          final int joinStyle,
                          final float miterLimit,
-                         final float scale,
-                         double rdrOffX,
-                         double rdrOffY,
                          final boolean subdivideCurves)
      {
          this.out = pc2d;
  
          this.lineWidth2 = lineWidth / 2.0f;
--- 139,156 ----
*** 181,207 ****
                  margin *= SQRT_2;
              }
              if ((joinStyle == JOIN_MITER) && (margin < limit)) {
                  margin = limit;
              }
-             if (scale != 1.0f) {
-                 margin  *= scale;
-                 rdrOffX *= scale;
-                 rdrOffY *= scale;
-             }
-             // add a small rounding error:
-             margin += 1e-3f;
  
              // bounds as half-open intervals: minX <= x < maxX and minY <= y < maxY
              // adjust clip rectangle (ymin, ymax, xmin, xmax):
              final float[] _clipRect = rdrCtx.clipRect;
!             _clipRect[0] -= margin - rdrOffY;
!             _clipRect[1] += margin + rdrOffY;
!             _clipRect[2] -= margin - rdrOffX;
!             _clipRect[3] += margin + rdrOffX;
              this.clipRect = _clipRect;
  
              // initialize curve splitter here for stroker & dasher:
              if (DO_CLIP_SUBDIVIDER) {
                  subdivide = subdivideCurves;
                  // adjust padded clip rectangle:
                  curveSplitter.init();
--- 175,199 ----
                  margin *= SQRT_2;
              }
              if ((joinStyle == JOIN_MITER) && (margin < limit)) {
                  margin = limit;
              }
  
              // bounds as half-open intervals: minX <= x < maxX and minY <= y < maxY
              // adjust clip rectangle (ymin, ymax, xmin, xmax):
              final float[] _clipRect = rdrCtx.clipRect;
!             _clipRect[0] -= margin;
!             _clipRect[1] += margin;
!             _clipRect[2] -= margin;
!             _clipRect[3] += margin;
              this.clipRect = _clipRect;
  
+             if (MarlinConst.DO_LOG_CLIP) {
+                 MarlinUtils.logInfo("clipRect (stroker): "
+                                     + Arrays.toString(rdrCtx.clipRect));
+             }
+ 
              // initialize curve splitter here for stroker & dasher:
              if (DO_CLIP_SUBDIVIDER) {
                  subdivide = subdivideCurves;
                  // adjust padded clip rectangle:
                  curveSplitter.init();