diff -r e7d5af0b11e9 -r eed64ee05369 jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java --- a/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java Tue Jan 28 12:50:53 2014 +0400 +++ b/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java Tue Jan 28 09:42:05 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -231,7 +231,7 @@ Rectangle2D anchor = paint.getAnchorRect(); XRSurfaceData dstData = (XRSurfaceData) sg2d.surfaceData; - XRSurfaceData srcData = (XRSurfaceData) getAccSrcSurface(dstData, bi); + XRSurfaceData srcData = getAccSrcSurface(dstData, bi); AffineTransform at = new AffineTransform(); at.translate(anchor.getX(), anchor.getY()); @@ -259,7 +259,7 @@ public int colorToIntArgbPixel(Color c) { int rgb = c.getRGB(); - int a = (int) Math.round(xrCompMan.getExtraAlpha() * (rgb >>> 24)); + int a = Math.round(xrCompMan.getExtraAlpha() * (rgb >>> 24)); return ((a << 24) | (rgb & 0x00FFFFFF)); } }