fix merge issues after merge from 8u242

JetBrains · Jan 21, 2020 · f51c579 · f51c579
1 parent 58d685e
commit f51c579
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c
@@ -973,7 +973,7 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
         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 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
                              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,