aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/awt/image/SampleModel.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1421e4c..c9e6606 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 5840f78..9ce1ae6 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;
}