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

8060461: Fix for JDK-8042609 uncovers additional issue

Browse Source 
Reviewed-by: ahgross, prr, serb
This commit is contained in:
Alexander Zvegintsev 2014-11-11 17:36:43 +03:00
parent 4b6b14f69e
commit b8ae69575c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2014, 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
@ -281,9 +281,7 @@ SplashCreateWindow(Splash * splash) {
/* for changing the visible shape of a window to an nonrectangular form */ /* for changing the visible shape of a window to an nonrectangular form */
void void
SplashUpdateShape(Splash * splash) { SplashUpdateShape(Splash * splash) {
if (!shapeSupported) if (splash->currentFrame < 0 || !shapeSupported || !splash->maskRequired) {
return;
if (!splash->maskRequired) {
return; return;
} }
XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0, XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0,
@ -324,6 +322,10 @@ ByteOrderToX(int byteOrder) {
void void
SplashRedrawWindow(Splash * splash) { SplashRedrawWindow(Splash * splash) {
if (splash->currentFrame < 0) {
return;
}
XImage *ximage; XImage *ximage;
// making this method redraw a part of the image does not make // making this method redraw a part of the image does not make