From: Tom Tromey <tromey@redhat.com>
Date: Mon, 13 Aug 2001 21:38:07 +0000 (+0000)
Subject: SampleModel.java (getPixel): Set correct array element.
X-Git-Tag: prereleases/libstdc++-3.0.95~2669
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586b870d4f0b3693628e22c2aaeeb26dc29b5342;p=thirdparty%2Fgcc.git

SampleModel.java (getPixel): Set correct array element.

	* java/awt/image/SampleModel.java (getPixel): Set correct array
	element.  From Chris Meyer.

From-SVN: r44871
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1421e4c910db..c9e66060d13e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-09  Tom Tromey  <tromey@redhat.com>
+
+	* java/awt/image/SampleModel.java (getPixel): Set correct array
+	element.  From Chris Meyer.
+
 2001-08-10  Loren J. Rittle  <ljrittle@acm.org>
 
 	* java/lang/natObject.cc (is_mp): Protect use of _SC_NPROCESSORS_ONLN.
diff --git a/libjava/java/awt/image/SampleModel.java b/libjava/java/awt/image/SampleModel.java
index 5840f78d2629..9ce1ae63d312 100644
--- a/libjava/java/awt/image/SampleModel.java
+++ b/libjava/java/awt/image/SampleModel.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -179,7 +179,7 @@ public abstract class SampleModel
     
     for (int b=0; b<numBands; b++)
       {
-        fArray[0] = getSampleFloat(x, y, b, data);
+        fArray[b] = getSampleFloat(x, y, b, data);
       }
     return fArray;
   }
@@ -188,7 +188,7 @@ public abstract class SampleModel
     if (dArray == null) dArray = new double[numBands];
     for (int b=0; b<numBands; b++)
       {
-	dArray[0] = getSampleDouble(x, y, b, data);
+	dArray[b] = getSampleDouble(x, y, b, data);
       }
     return dArray;
   }