commit f51c57956592f66f18020814f809c115c4d1c915
author Dmitry Batrak <Dmitry.Batrak@jetbrains.com> Tue Jan 21 12:57:56 2020 +0300
committer Dmitry Batrak <Dmitry.Batrak@jetbrains.com> Tue Jan 21 12:57:56 2020 +0300
tree 3846c9c15e5aab4c91ec3beaa1503507a594fef5
parent 58d685ee3bb0e782891f47572a1c73d68b6e0b13

fix merge issues after merge from 8u242

src/share/native/sun/font/freetypeScaler.c

diff --git a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c
index 65c24d4..5485604 100644
--- a/src/share/native/sun/font/freetypeScaler.c
+++ b/src/share/native/sun/font/freetypeScaler.c
@@ -973,7 +973,7 @@
         jlong pScalerContext, jlong pScaler) {
 
     jobject metrics;
-    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my, txx, txy, tyx, tyy;
+    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my;
     jfloat f0 = 0.0;
     FTScalerContext *context =
         (FTScalerContext*) jlong_to_ptr(pScalerContext);
@@ -1052,20 +1052,6 @@
                              scalerInfo->face->size->metrics.y_scale));
     my = 0;
 
-    // apply transformation matrix
-    txx = (jfloat)  FTFixedToFloat(context->transform.xx);
-    txy = (jfloat) -FTFixedToFloat(context->transform.xy);
-    tyx = (jfloat) -FTFixedToFloat(context->transform.yx);
-    tyy = (jfloat)  FTFixedToFloat(context->transform.yy);
-    ax = txy * ay;
-    ay = tyy * ay;
-    dx = txy * dy;
-    dy = tyy * dy;
-    lx = txy * ly;
-    ly = tyy * ly;
-    my = tyx * mx;
-    mx = txx * mx; 
-    
     metrics = (*env)->NewObject(env,
         sunFontIDs.strikeMetricsClass,
         sunFontIDs.strikeMetricsCtr,