Mercurial > hg > icedtea8-forest > jdk
changeset 11922:ee0b65b8fd10 icedtea-3.1.0pre04
8160294, PR2882, PR3095: Some client libraries cannot be built with GCC 6
Reviewed-by: prr, flar, erikj, kbarrett
| author | ysuenaga |
|---|---|
| date | Mon, 18 Jul 2016 04:07:17 +0100 |
| parents | abc809afa7e0 |
| children | c70d1592bf72 |
| files | src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c src/share/native/sun/font/layout/SunLayoutEngine.cpp src/share/native/sun/java2d/loops/AlphaMath.c |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c Mon Feb 24 11:24:43 2014 -0800 +++ b/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c Mon Jul 18 04:07:17 2016 +0100 @@ -237,13 +237,14 @@ SplashDecodeJpegStream(Splash * splash, SplashStream * stream) { struct jpeg_decompress_struct cinfo; - int success = 0; + int success; struct my_error_mgr jerr; cinfo.err = jpeg_std_error(&jerr.pub); jerr.pub.error_exit = my_error_exit; if (setjmp(jerr.setjmp_buffer)) { + success = 0; goto done; } jpeg_create_decompress(&cinfo);
--- a/src/share/native/sun/font/layout/SunLayoutEngine.cpp Mon Feb 24 11:24:43 2014 -0800 +++ b/src/share/native/sun/font/layout/SunLayoutEngine.cpp Mon Jul 18 04:07:17 2016 +0100 @@ -151,7 +151,8 @@ return; } - if (min < 0) min = 0; if (max < min) max = min; /* defensive coding */ + if (min < 0) min = 0; + if (max < min) max = min; /* defensive coding */ // have to copy, yuck, since code does upcalls now. this will be soooo slow jint len = max - min; jchar buffer[256];
--- a/src/share/native/sun/java2d/loops/AlphaMath.c Mon Feb 24 11:24:43 2014 -0800 +++ b/src/share/native/sun/java2d/loops/AlphaMath.c Mon Jul 18 04:07:17 2016 +0100 @@ -34,8 +34,8 @@ unsigned int j; for (i = 1; i < 256; i++) { /* SCALE == (1 << 24) */ - int inc = (i << 16) + (i<<8) + i; /* approx. SCALE * (i/255.0) */ - int val = inc + (1 << 23); /* inc + SCALE*0.5 */ + unsigned int inc = (i << 16) + (i<<8) + i; /* approx. SCALE * (i/255.0) */ + unsigned int val = inc + (1 << 23); /* inc + SCALE*0.5 */ for (j = 1; j < 256; j++) { mul8table[i][j] = (val >> 24); /* val / SCALE */ val += inc;