diff options
Diffstat (limited to 'libjava/java/awt/image')
| -rw-r--r-- | libjava/java/awt/image/ComponentSampleModel.h | 4 | ||||
| -rw-r--r-- | libjava/java/awt/image/IndexColorModel.h | 1 | ||||
| -rw-r--r-- | libjava/java/awt/image/SinglePixelPackedSampleModel.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/libjava/java/awt/image/ComponentSampleModel.h b/libjava/java/awt/image/ComponentSampleModel.h index 4a1d2c675cb..39fe6cdf7e4 100644 --- a/libjava/java/awt/image/ComponentSampleModel.h +++ b/libjava/java/awt/image/ComponentSampleModel.h @@ -44,8 +44,6 @@ public: virtual jint getPixelStride(); virtual jint getNumDataElements(); virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *); - virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *); - virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *); virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *); virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *); virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *); @@ -61,8 +59,6 @@ public: // actually protected jint numBanks; jint scanlineStride; jint pixelStride; -private: - jboolean tightPixelPacking; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/awt/image/IndexColorModel.h b/libjava/java/awt/image/IndexColorModel.h index cbb2fac300c..a79a5312fee 100644 --- a/libjava/java/awt/image/IndexColorModel.h +++ b/libjava/java/awt/image/IndexColorModel.h @@ -60,6 +60,7 @@ public: virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint); private: void setTransparentPixel(jint); + JArray< jint > * createColorMap(jint, jint); jint __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) map_size; jboolean opaque; jint trans; diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.h b/libjava/java/awt/image/SinglePixelPackedSampleModel.h index 69950326992..c7bf07cd4a9 100644 --- a/libjava/java/awt/image/SinglePixelPackedSampleModel.h +++ b/libjava/java/awt/image/SinglePixelPackedSampleModel.h @@ -42,7 +42,6 @@ public: virtual jint getScanlineStride(); virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *); virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *); - virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *); virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *); virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *); virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *); |