Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-03-20 00:00:03 -04:00
Code Issues Projects Releases Wiki Activity

TMI-15: Fixed some issues introduced in later JREs (at least 7u45).

Browse Source
This commit is contained in:
Harald Kuhr
2013-11-05 09:43:46 +01:00
parent d04c29ae12
commit f5a4fe03f4
7 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/FastCMYKToRGB.java
View File

@@ -144,35 +144,16 @@ class FastCMYKToRGB implements /*BufferedImageOp,*/ RasterOp {
}
public WritableRaster createCompatibleDestRaster(final Raster src) {
return src.createChild(0, 0, src.getWidth(), src.getHeight(), 0, 0, new int[]{0, 1, 2}).createCompatibleWritableRaster();
// WHAT?? This code no longer work for JRE 7u45+... JRE bug?!
// Raster child = src.createChild(0, 0, src.getWidth(), src.getHeight(), 0, 0, new int[] {0, 1, 2});
// return child.createCompatibleWritableRaster(); // Throws an exception complaining about the scanline stride from the verify() method
// This is a workaround for the above code that no longer works.
// It wil use 25% more memory, but it seems to work...
WritableRaster raster = src.createCompatibleWritableRaster();
return raster.createWritableChild(0, 0, src.getWidth(), src.getHeight(), 0, 0, new int[] {0, 1, 2});
}
/*
public BufferedImage filter(BufferedImage src, BufferedImage dest) {
Validate.notNull(src, "src may not be null");
// Validate.isTrue(src != dest, "src and dest image may not be same");
if (dest == null) {
dest = createCompatibleDestImage(src, ColorModel.getRGBdefault());
}
filter(src.getRaster(), dest.getRaster());
return dest;
}
public Rectangle2D getBounds2D(BufferedImage src) {
return getBounds2D(src.getRaster());
}
public BufferedImage createCompatibleDestImage(BufferedImage src, ColorModel destCM) {
// TODO: dest color model depends on bands...
return destCM == null ?
new BufferedImage(src.getWidth(), src.getHeight(), BufferedImage.TYPE_3BYTE_BGR) :
new BufferedImage(destCM, destCM.createCompatibleWritableRaster(src.getWidth(), src.getHeight()), destCM.isAlphaPremultiplied(), null);
}
*/
public Point2D getPoint2D(Point2D srcPt, Point2D dstPt) {
if (dstPt == null) {
dstPt = new Point2D.Double(srcPt.getX(), srcPt.getY());