src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc

*** 78,88 ****
      }
      fadv = env->GetFloatField(pt, sunFontIDs.xFID);
      fadv *= jdkFontInfo->devScale;
      env->DeleteLocalRef(pt);
  
!     return FloatToFixed(fadv);
  }
  
  static hb_position_t
  hb_jdk_get_glyph_v_advance (hb_font_t *font HB_UNUSED,
                             void *font_data,
--- 78,88 ----
      }
      fadv = env->GetFloatField(pt, sunFontIDs.xFID);
      fadv *= jdkFontInfo->devScale;
      env->DeleteLocalRef(pt);
  
!     return HBFloatToFixed(fadv);
  }
  
  static hb_position_t
  hb_jdk_get_glyph_v_advance (hb_font_t *font HB_UNUSED,
                             void *font_data,
*** 105,115 ****
          return 0;
      }
      fadv = env->GetFloatField(pt, sunFontIDs.yFID);
      env->DeleteLocalRef(pt);
  
!     return FloatToFixed(fadv);
    
  }
  
  static hb_bool_t
  hb_jdk_get_glyph_h_origin (hb_font_t *font HB_UNUSED,
--- 105,115 ----
          return 0;
      }
      fadv = env->GetFloatField(pt, sunFontIDs.yFID);
      env->DeleteLocalRef(pt);
  
!     return HBFloatToFixed(fadv);
    
  }
  
  static hb_bool_t
  hb_jdk_get_glyph_h_origin (hb_font_t *font HB_UNUSED,
*** 199,210 ****
    
      if (pt == NULL) {
          *x = 0; *y = 0;
          return true;
      }
!     *x = FloatToFixed(env->GetFloatField(pt, sunFontIDs.xFID));
!     *y = FloatToFixed(env->GetFloatField(pt, sunFontIDs.yFID));
      env->DeleteLocalRef(pt);
  
    return true;
  }
  
--- 199,210 ----
    
      if (pt == NULL) {
          *x = 0; *y = 0;
          return true;
      }
!     *x = HBFloatToFixed(env->GetFloatField(pt, sunFontIDs.xFID));
!     *y = HBFloatToFixed(env->GetFloatField(pt, sunFontIDs.yFID));
      env->DeleteLocalRef(pt);
  
    return true;
  }
  
*** 319,330 ****
      hb_face_destroy (face);
      hb_font_set_funcs (font,
                         _hb_jdk_get_font_funcs (),
                         jdkFontInfo, (hb_destroy_func_t) _do_nothing);
      hb_font_set_scale (font,
!                       FloatToFixed(jdkFontInfo->ptSize*jdkFontInfo->devScale),
!                       FloatToFixed(jdkFontInfo->ptSize*jdkFontInfo->devScale));
    return font;
  }
  
  #ifdef MACOSX
  static hb_font_t* _hb_jdk_ct_font_create(JDKFontInfo *jdkFontInfo) {
--- 319,330 ----
      hb_face_destroy (face);
      hb_font_set_funcs (font,
                         _hb_jdk_get_font_funcs (),
                         jdkFontInfo, (hb_destroy_func_t) _do_nothing);
      hb_font_set_scale (font,
!                       HBFloatToFixed(jdkFontInfo->ptSize*jdkFontInfo->devScale),
!                       HBFloatToFixed(jdkFontInfo->ptSize*jdkFontInfo->devScale));
    return font;
  }
  
  #ifdef MACOSX
  static hb_font_t* _hb_jdk_ct_font_create(JDKFontInfo *jdkFontInfo) {
*** 337,348 ****
      face = hb_coretext_face_create((CGFontRef)(jdkFontInfo->nativeFont));
      font = hb_font_create(face);
      hb_face_destroy(face);
  
      hb_font_set_scale(font,
!                      FloatToFixed(jdkFontInfo->ptSize),
!                      FloatToFixed(jdkFontInfo->ptSize));
      return font;
  }
  #endif
  
  hb_font_t* hb_jdk_font_create(JDKFontInfo *jdkFontInfo,
--- 337,348 ----
      face = hb_coretext_face_create((CGFontRef)(jdkFontInfo->nativeFont));
      font = hb_font_create(face);
      hb_face_destroy(face);
  
      hb_font_set_scale(font,
!                      HBFloatToFixed(jdkFontInfo->ptSize),
!                      HBFloatToFixed(jdkFontInfo->ptSize));
      return font;
  }
  #endif
  
  hb_font_t* hb_jdk_font_create(JDKFontInfo *jdkFontInfo,