src/solaris/classes/sun/java2d/xr/XRDrawImage.java

*** 25,34 ****
--- 25,35 ----
  
  package sun.java2d.xr;
  
  import java.awt.*;
  import java.awt.geom.*;
+ import java.awt.image.*;
  
  import sun.java2d.*;
  import sun.java2d.loops.*;
  import sun.java2d.pipe.*;
  
*** 43,54 ****
              int sy2, Color bgColor) {
          SurfaceData dstData = sg.surfaceData;
          SurfaceData srcData = dstData.getSourceSurfaceData(img,
                  SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor);
  
!         if (srcData != null && !isBgOperation(srcData, bgColor))  { // TODO: Do we bail out on bgBlits?
!         //      && srcData instanceof XRSurfaceData) {
              SurfaceType srcType = srcData.getSurfaceType();
              SurfaceType dstType = dstData.getSurfaceType();
  
              TransformBlit blit = TransformBlit.getFromCache(srcType,
                      sg.imageComp, dstType);
--- 44,55 ----
              int sy2, Color bgColor) {
          SurfaceData dstData = sg.surfaceData;
          SurfaceData srcData = dstData.getSourceSurfaceData(img,
                  SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor);
          
!         if (srcData != null && !isBgOperation(srcData, bgColor) 
!                 && interpType <= AffineTransformOp.TYPE_BILINEAR) {
              SurfaceType srcType = srcData.getSurfaceType();
              SurfaceType dstType = dstData.getSurfaceType();
  
              TransformBlit blit = TransformBlit.getFromCache(srcType,
                      sg.imageComp, dstType);