Skip to content

Commit 476d0f1

Browse files
committed
8339309: unused-variable warnings happen in libfontmanager
Reviewed-by: prr
1 parent d6eddcd commit 476d0f1

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,6 @@ JDKEXPORT void jdk_hb_shape(
9797
float devScale = 1.0f;
9898
if (getenv("HB_NODEVTX") != NULL) {
9999
float xPtSize = euclidianDistance(matrix[0], matrix[1]);
100-
float yPtSize = euclidianDistance(matrix[2], matrix[3]);
101100
devScale = xPtSize / ptSize;
102101
}
103102

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -513,8 +513,6 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
513513
double dmat[4], ptsz;
514514
FTScalerContext *context =
515515
(FTScalerContext*) calloc(1, sizeof(FTScalerContext));
516-
FTScalerInfo *scalerInfo =
517-
(FTScalerInfo*) jlong_to_ptr(pScaler);
518516

519517
if (context == NULL) {
520518
free(context);
@@ -1652,7 +1650,6 @@ Java_sun_font_FreetypeFontScaler_getGlyphPointNative(
16521650
jlong pScaler, jint glyphCode, jint pointNumber) {
16531651

16541652
FT_Outline* outline;
1655-
jobject point = NULL;
16561653
jfloat x=0, y=0;
16571654
FTScalerContext *context =
16581655
(FTScalerContext*) jlong_to_ptr(pScalerContext);

src/java.desktop/unix/native/libfontmanager/X11FontScaler.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -267,7 +267,6 @@ Java_sun_font_NativeFont_getGlyphAdvance
267267
xcs = AWTFontPerChar(xFont, glyphCode - context->minGlyph);
268268
advance = AWTCharAdvance(xcs);
269269
} else {
270-
int direction, ascent, descent;
271270
AWTChar2b xChar;
272271

273272
xChar.byte1 = (unsigned char) (glyphCode >> 8);

0 commit comments

Comments
 (0)