stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8339309: unused-variable warnings happen in libfontmanager

Browse Source 
Reviewed-by: prr
This commit is contained in:
Yasumasa Suenaga 2024-10-23 02:05:28 +00:00
parent d6eddcdaf9
commit 476d0f1928
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -97,7 +97,6 @@ JDKEXPORT void jdk_hb_shape(
float devScale = 1.0f; float devScale = 1.0f;
if (getenv("HB_NODEVTX") != NULL) { if (getenv("HB_NODEVTX") != NULL) {
float xPtSize = euclidianDistance(matrix[0], matrix[1]); float xPtSize = euclidianDistance(matrix[0], matrix[1]);
float yPtSize = euclidianDistance(matrix[2], matrix[3]);
devScale = xPtSize / ptSize; devScale = xPtSize / ptSize;
} }

5
src/java.desktop/share/native/libfontmanager/freetypeScaler.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -513,8 +513,6 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
double dmat[4], ptsz; double dmat[4], ptsz;
FTScalerContext *context = FTScalerContext *context =
(FTScalerContext*) calloc(1, sizeof(FTScalerContext)); (FTScalerContext*) calloc(1, sizeof(FTScalerContext));
FTScalerInfo *scalerInfo =
(FTScalerInfo*) jlong_to_ptr(pScaler);
if (context == NULL) { if (context == NULL) {
free(context); free(context);
@ -1652,7 +1650,6 @@ Java_sun_font_FreetypeFontScaler_getGlyphPointNative(
jlong pScaler, jint glyphCode, jint pointNumber) { jlong pScaler, jint glyphCode, jint pointNumber) {
FT_Outline* outline; FT_Outline* outline;
jobject point = NULL;
jfloat x=0, y=0; jfloat x=0, y=0;
FTScalerContext *context = FTScalerContext *context =
(FTScalerContext*) jlong_to_ptr(pScalerContext); (FTScalerContext*) jlong_to_ptr(pScalerContext);

3
src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -267,7 +267,6 @@ Java_sun_font_NativeFont_getGlyphAdvance
xcs = AWTFontPerChar(xFont, glyphCode - context->minGlyph); xcs = AWTFontPerChar(xFont, glyphCode - context->minGlyph);
advance = AWTCharAdvance(xcs); advance = AWTCharAdvance(xcs);
} else { } else {
int direction, ascent, descent;
AWTChar2b xChar; AWTChar2b xChar;
xChar.byte1 = (unsigned char) (glyphCode >> 8); xChar.byte1 = (unsigned char) (glyphCode >> 8);