src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 49,59 ****
              return;
          }
  
          float devx, devy;
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double origin[] = {x + info.originX, y + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              devx = (float)origin[0];
              devy = (float)origin[1];
          } else {
              devx = (float)(x + info.originX + sg2d.transX);
--- 49,59 ----
              return;
          }
  
          float devx, devy;
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double[] origin = {x + info.originX, y + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              devx = (float)origin[0];
              devy = (float)origin[1];
          } else {
              devx = (float)(x + info.originX + sg2d.transX);
*** 74,95 ****
              tl.draw(sg2d, (float)x, (float)y);
          }
      }
  
      public void drawChars(SunGraphics2D sg2d,
!                           char data[], int offset, int length,
                            int ix, int iy)
      {
          FontInfo info = sg2d.getFontInfo();
          float x, y;
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawChars(
                                          sg2d, data, offset, length, ix, iy);
              return;
          }
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double origin[] = {ix + info.originX, iy + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
              x = ix + info.originX + sg2d.transX;
--- 74,95 ----
              tl.draw(sg2d, (float)x, (float)y);
          }
      }
  
      public void drawChars(SunGraphics2D sg2d,
!                           char[] data, int offset, int length,
                            int ix, int iy)
      {
          FontInfo info = sg2d.getFontInfo();
          float x, y;
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawChars(
                                          sg2d, data, offset, length, ix, iy);
              return;
          }
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double[] origin = {ix + info.originX, iy + info.originY};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
              x = ix + info.originX + sg2d.transX;
*** 117,127 ****
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawGlyphVector(sg2d, gv, x, y);
              return;
          }
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double origin[] = {x, y};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
              x += sg2d.transX; // don't use the glyph info origin, already in gv.
--- 117,127 ----
          if (info.pixelHeight > OutlineTextRenderer.THRESHHOLD) {
              SurfaceData.outlineTextRenderer.drawGlyphVector(sg2d, gv, x, y);
              return;
          }
          if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
!             double[] origin = {x, y};
              sg2d.transform.transform(origin, 0, origin, 0, 1);
              x = (float) origin[0];
              y = (float) origin[1];
          } else {
              x += sg2d.transX; // don't use the glyph info origin, already in gv.