svn commit: r1535250 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java

[ggregory]

Author: ggregory
Date: Thu Oct 24 00:51:06 2013
New Revision: 1535250

URL: http://svn.apache.org/r1535250
Log:
- The static method createInterleavedRaster(int, int, int, int, Point) from the 
type Raster should be accessed directly.
- The static method createPackedRaster(int, int, int, int[], Point) from the 
type Raster should be accessed directly.
- The static method createInterleavedRaster(int, int, int, int, Point) from the 
type Raster should be accessed directly.

Modified:
    
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java

Modified: 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1535250&r1=1535249&r2=1535250&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
 (original)
+++ 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
 Thu Oct 24 00:51:06 2013
@@ -21,6 +21,7 @@ import java.awt.image.ColorModel;
 import java.awt.image.DataBuffer;
 import java.awt.image.DirectColorModel;
 import java.awt.image.IndexColorModel;
+import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -531,7 +532,7 @@ public class XpmImageParser extends Imag
          }
             colorModel = new IndexColorModel(8, xpmHeader.palette.size(),
                     palette, 0, true, -1, DataBuffer.TYPE_BYTE);
-            raster = WritableRaster.createInterleavedRaster(
+            raster = Raster.createInterleavedRaster(
                     DataBuffer.TYPE_BYTE, xpmHeader.width, xpmHeader.height, 1,
                     null);
             bpp = 8;
@@ -544,14 +545,14 @@ public class XpmImageParser extends Imag
          }
             colorModel = new IndexColorModel(16, xpmHeader.palette.size(),
                     palette, 0, true, -1, DataBuffer.TYPE_USHORT);
-            raster = WritableRaster.createInterleavedRaster(
+            raster = Raster.createInterleavedRaster(
                     DataBuffer.TYPE_USHORT, xpmHeader.width, xpmHeader.height,
                     1, null);
             bpp = 16;
         } else {
             colorModel = new DirectColorModel(32, 0x00ff0000, 0x0000ff00,
                     0x000000ff, 0xff000000);
-            raster = WritableRaster.createPackedRaster(DataBuffer.TYPE_INT,
+            raster = Raster.createPackedRaster(DataBuffer.TYPE_INT,
                     xpmHeader.width, xpmHeader.height, new int[] { 0x00ff0000,
                             0x0000ff00, 0x000000ff, 0xff000000 }, null);
             bpp = 32;