[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small fix for BandedSampleModel

[Kaffe CVS]

PatchSet 5431 
Date: 2004/11/10 12:17:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small fix for BandedSampleModel

2004-11-10  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/image/BandedSampleModel.java:
        Resynced with GNU Classpath.

        2004-11-07  Jerry Quinn  <jlquinn at optonline.net>

        * java/awt/image/BandedSampleModel.java (scanlineStride): Remove
        field hiding ComponentSampleModel.scanlineStride.

Members: 
	ChangeLog:1.2980->1.2981 
	libraries/javalib/java/awt/image/BandedSampleModel.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2980 kaffe/ChangeLog:1.2981
--- kaffe/ChangeLog:1.2980	Wed Nov 10 11:32:22 2004
+++ kaffe/ChangeLog	Wed Nov 10 12:17:45 2004
@@ -7,6 +7,16 @@
 
 2004-11-10  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/image/BandedSampleModel.java:
+	Resynced with GNU Classpath.
+
+	2004-11-07  Jerry Quinn  <jlquinn at optonline.net>
+
+        * java/awt/image/BandedSampleModel.java (scanlineStride): Remove
+        field hiding ComponentSampleModel.scanlineStride.
+
+2004-11-10  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/awt/image/BandedSampleModel.java
diff -u kaffe/libraries/javalib/java/awt/image/BandedSampleModel.java:1.1 kaffe/libraries/javalib/java/awt/image/BandedSampleModel.java:1.2
--- kaffe/libraries/javalib/java/awt/image/BandedSampleModel.java:1.1	Wed Sep 29 04:23:56 2004
+++ kaffe/libraries/javalib/java/awt/image/BandedSampleModel.java	Wed Nov 10 12:17:47 2004
@@ -45,7 +45,6 @@
  */
 public final class BandedSampleModel extends ComponentSampleModel
 {
-  private int scanlineStride;
   private int[] bitMasks;
   private int[] bitOffsets;
   private int[] sampleSize;