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

#419 PICT rounding issue

Browse Source
This commit is contained in:
Harald Kuhr 2018-04-05 18:58:42 +02:00
parent a81472bb5f
commit 2078843086
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java
View File

@ -2105,7 +2105,7 @@ public final class PICTImageReader extends ImageReaderBase {
// Get transfer mode // Get transfer mode
int transferMode = pStream.readUnsignedShort(); int transferMode = pStream.readUnsignedShort();
if (DEBUG) { if (DEBUG) {
System.out.print(", mode: " + transferMode); System.out.println(", mode: " + transferMode);
} }
// Set up pixel buffer for the RGB values // Set up pixel buffer for the RGB values
@ -2172,12 +2172,12 @@ public final class PICTImageReader extends ImageReaderBase {
for (int i = 0; i < srcRect.width; i++) { for (int i = 0; i < srcRect.width; i++) {
// Set alpha values to all opaque // Set alpha values to all opaque
pixArray[pixBufOffset + i] = 0xFF000000 pixArray[pixBufOffset + i] = 0xFF000000
// Get red values // Get red values
| (dstBytes[/*0* bounds.width*/i] & 0xFF) << 16 | (dstBytes[/*0* bounds.width*/i] & 0xFF) << 16
// Get green values // Get green values
| (dstBytes[/**/bounds.width + i] & 0xFF) << 8 | (dstBytes[/**/bounds.width + i] & 0xFF) << 8
// Get blue values // Get blue values
| (dstBytes[2 * bounds.width + i] & 0xFF); | (dstBytes[2 * bounds.width + i] & 0xFF);
} }
} }
else { else {
@ -2185,12 +2185,12 @@ public final class PICTImageReader extends ImageReaderBase {
for (int i = 0; i < srcRect.width; i++) { for (int i = 0; i < srcRect.width; i++) {
// Get alpha values // Get alpha values
pixArray[pixBufOffset + i] = (dstBytes[/*0* bounds.width*/i] & 0xFF) << 24 pixArray[pixBufOffset + i] = (dstBytes[/*0* bounds.width*/i] & 0xFF) << 24
// Get red values // Get red values
| (dstBytes[/**/bounds.width + i] & 0xFF) << 16 | (dstBytes[/**/bounds.width + i] & 0xFF) << 16
// Get green values // Get green values
| (dstBytes[2 * bounds.width + i] & 0xFF) << 8 | (dstBytes[2 * bounds.width + i] & 0xFF) << 8
// Get blue values // Get blue values
| (dstBytes[3 * bounds.width + i] & 0xFF); | (dstBytes[3 * bounds.width + i] & 0xFF);
} }
} }
} }
@ -2409,7 +2409,7 @@ public final class PICTImageReader extends ImageReaderBase {
* image resolution ratio. * image resolution ratio.
*/ */
private int getXPtCoord(int pPoint) { private int getXPtCoord(int pPoint) {
return (int) (pPoint / screenImageXRatio); return (int) Math.round(pPoint / screenImageXRatio);
} }
/* /*
@ -2418,7 +2418,7 @@ public final class PICTImageReader extends ImageReaderBase {
* image resolution ratio. * image resolution ratio.
*/ */
private int getYPtCoord(int pPoint) { private int getYPtCoord(int pPoint) {
return (int) (pPoint / screenImageYRatio); return (int) Math.round(pPoint / screenImageYRatio);
} }
/* /*
@ -2480,7 +2480,6 @@ public final class PICTImageReader extends ImageReaderBase {
// Might need to clear background // Might need to clear background
g.setComposite(AlphaComposite.Src); g.setComposite(AlphaComposite.Src);
g.setColor(new Color(0x00ffffff, true)); // Transparent white g.setColor(new Color(0x00ffffff, true)); // Transparent white
// g.setColor(Color.WHITE);
g.fillRect(0, 0, image.getWidth(), image.getHeight()); g.fillRect(0, 0, image.getWidth(), image.getHeight());
AffineTransform instance = new AffineTransform(); AffineTransform instance = new AffineTransform();
@ -2492,12 +2491,7 @@ public final class PICTImageReader extends ImageReaderBase {
instance.scale(screenImageXRatio / subX, screenImageYRatio / subY); instance.scale(screenImageXRatio / subX, screenImageYRatio / subY);
g.setTransform(instance); g.setTransform(instance);
// try { drawOnto(g);
drawOnto(g);
// }
// catch (IOException e) {
// e.printStackTrace();
// }
} }
finally { finally {
g.dispose(); g.dispose();