This patch (committed) removes the argument check in the createSubsetSampleModel() method of the MultiPixelPackedSampleModel class, to match the behaviour of the reference implementation:

2006-07-14  David Gilbert  <[EMAIL PROTECTED]>

        * java/awt/image/MultiPixelPackedSampleModel.java
        (createSubsetSampleModel): Removed argument check.

Mauve test to be committed shortly.

Regards,

Dave
Index: java/awt/image/MultiPixelPackedSampleModel.java
===================================================================
RCS file: 
/sources/classpath/classpath/java/awt/image/MultiPixelPackedSampleModel.java,v
retrieving revision 1.7
diff -u -r1.7 MultiPixelPackedSampleModel.java
--- java/awt/image/MultiPixelPackedSampleModel.java     14 Jul 2006 09:05:36 
-0000      1.7
+++ java/awt/image/MultiPixelPackedSampleModel.java     14 Jul 2006 10:42:53 
-0000
@@ -187,17 +187,19 @@
     return numberOfBits;
   }
 
-
+  /**
+   * Normally this method returns a sample model for accessing a subset of
+   * bands of image data, but since <code>MultiPixelPackedSampleModel</code>
+   * only supports a single band, this overridden implementation just returns
+   * a new instance of <code>MultiPixelPackedSampleModel</code>, with the same
+   * attributes as this instance.
+   * 
+   * @param bands  ignored.
+   */
   public SampleModel createSubsetSampleModel(int[] bands)
   {
-    int numBands = bands.length;
-    if (numBands != 1)
-      throw new RasterFormatException("MultiPixelPackedSampleModel only"
-                                     + " supports one band");
-    
-    return new MultiPixelPackedSampleModel(dataType, width, height,
-                                          numberOfBits, scanlineStride,
-                                          dataBitOffset);
+    return new MultiPixelPackedSampleModel(dataType, width, height, 
+        numberOfBits, scanlineStride, dataBitOffset);
   }
 
   /**

Reply via email to