Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 20:45:29 -04:00
Code Issues Projects Releases Wiki Activity

Clean-up after merge from guinotphil.

Browse Source
This commit is contained in:
Harald Kuhr 2013-11-15 17:41:34 +01:00
parent f08fbd0e21
commit 39d3fc426e
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/common-image/src/main/java/com/twelvemonkeys/image/MagickUtil.java
View File

@ -165,7 +165,7 @@ public final class MagickUtil {
image = cmykToBuffered(pImage, false); image = cmykToBuffered(pImage, false);
break; break;
case ImageType.ColorSeparationMatteType: case ImageType.ColorSeparationMatteType:
image = cmykToBuffered(pImage, true); // Not tested actually image = cmykToBuffered(pImage, true);
break; break;
case ImageType.OptimizeType: case ImageType.OptimizeType:
default: default:
@ -568,42 +568,40 @@ public final class MagickUtil {
* @see BufferedImage * @see BufferedImage
*/ */
private static BufferedImage cmykToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException { private static BufferedImage cmykToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException {
final Dimension size = pImage.getDimension(); Dimension size = pImage.getDimension();
final int length = size.width * size.height; int length = size.width * size.height;
// Retreive the ICC profile // Retreive the ICC profile
final ICC_Profile profile = ICC_Profile.getInstance(pImage.getColorProfile().getInfo()); ICC_Profile profile = ICC_Profile.getInstance(pImage.getColorProfile().getInfo());
final ColorSpace cs = new ICC_ColorSpace(profile); ColorSpace cs = new ICC_ColorSpace(profile);
final int bands = cs.getNumComponents() + (pAlpha ? 1 : 0); int bands = cs.getNumComponents() + (pAlpha ? 1 : 0);
final ColorModel cm; int[] bits = new int[bands];
final int[] bits = new int[bands];
for (int i = 0; i < bands; i++) { for (int i = 0; i < bands; i++) {
bits[i] = 8; bits[i] = 8;
} }
if (pAlpha) {
cm = new ComponentColorModel(cs, bits, true, true, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE); ColorModel cm = pAlpha ?
} else { new ComponentColorModel(cs, bits, true, true, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE) :
cm = new ComponentColorModel(cs, bits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE); new ComponentColorModel(cs, bits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
}
byte[] pixels = new byte[length * bands];
final byte[] pixels = new byte[length * bands];
// TODO: If we do multiple dispatches (one per line, typically), we could provide listener // TODO: If we do multiple dispatches (one per line, typically), we could provide listener
// feedback. But it's currently a lot slower than fetching all the pixels in one go. // feedback. But it's currently a lot slower than fetching all the pixels in one go.
// TODO: handle more generic cases if profile is not CMYK // TODO: handle more generic cases if profile is not CMYK
// The "ACMYK" value has not been tested with an alpha picture actually... // TODO: Test "ACMYK"
pImage.dispatchImage(0, 0, size.width, size.height, pAlpha ? "ACMYK" : "CMYK", pixels); pImage.dispatchImage(0, 0, size.width, size.height, pAlpha ? "ACMYK" : "CMYK", pixels);
// Init databuffer with array, to avoid allocation of empty array // Init databuffer with array, to avoid allocation of empty array
final DataBuffer buffer = new DataBufferByte(pixels, pixels.length); DataBuffer buffer = new DataBufferByte(pixels, pixels.length);
// TODO: build array from bands variable, here it just works for CMYK // TODO: build array from bands variable, here it just works for CMYK
// The values has not been tested with an alpha picture actually... // The values has not been tested with an alpha picture actually...
final int[] bandOffsets = pAlpha ? new int[] {0, 1, 2, 3, 4} : new int[] {0, 1, 2, 3}; int[] bandOffsets = pAlpha ? new int[] {0, 1, 2, 3, 4} : new int[] {0, 1, 2, 3};
final WritableRaster raster = WritableRaster raster =
Raster.createInterleavedRaster(buffer, size.width, size.height, Raster.createInterleavedRaster(buffer, size.width, size.height,
size.width * bands, bands, bandOffsets, LOCATION_UPPER_LEFT); size.width * bands, bands, bandOffsets, LOCATION_UPPER_LEFT);