--- old/src/share/classes/sun/awt/image/ShortInterleavedRaster.java	2014-01-27 11:29:43.000000000 -0800
+++ new/src/share/classes/sun/awt/image/ShortInterleavedRaster.java	2014-01-27 11:29:43.000000000 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -180,7 +180,7 @@
      * band.
      */
     public int[] getDataOffsets() {
-        return (int[]) dataOffsets.clone();
+        return dataOffsets.clone();
     }
 
     /**
@@ -443,7 +443,7 @@
         int off = (y-minY)*scanlineStride +
                   (x-minX)*pixelStride;
         for (int i = 0; i < numDataElements; i++) {
-            data[dataOffsets[i] + off] = (short) inData[i];
+            data[dataOffsets[i] + off] = inData[i];
         }
         markDirty();
     }
@@ -548,7 +548,7 @@
             xoff = yoff;
             for (xstart=0; xstart < w; xstart++, xoff += pixelStride) {
                 for (int c = 0; c < numDataElements; c++) {
-                    data[dataOffsets[c] + xoff] = (short) inData[off++];
+                    data[dataOffsets[c] + xoff] = inData[off++];
                 }
             }
         }