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

TMI-80: PCXImageReader now correctly skips rows and applies source region. Re-enabled test in DCXImageReader that earlier failed.

Browse Source
This commit is contained in:
Harald Kuhr
2014-11-04 16:21:42 +01:00
parent 91e693724f
commit 4b00945c9d
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReader.java
+9 -12
View File
@@ -45,10 +45,7 @@ import javax.imageio.stream.ImageInputStream;
import java.awt.*;
import java.awt.color.ColorSpace;
import java.awt.image.*;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.File;
import java.io.IOException;
import java.io.*;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Iterator;
@@ -214,7 +211,7 @@ public final class PCXImageReader extends ImageReaderBase {
processImageProgress(100f * y / height);
if (y < srcRegion.y) {
if (y >= srcRegion.y + srcRegion.height) {
break;
}
@@ -240,7 +237,7 @@ public final class PCXImageReader extends ImageReaderBase {
processImageProgress(100f * y / height);
if (y < srcRegion.y) {
if (y >= srcRegion.y + srcRegion.height) {
break;
}
@@ -279,15 +276,15 @@ public final class PCXImageReader extends ImageReaderBase {
processImageProgress(100f * y / height * c / header.getChannels());
if (y < srcRegion.y) {
break;
}
if (abortRequested()) {
break;
}
}
if (y >= srcRegion.y + srcRegion.height) {
break;
}
if (abortRequested()) {
processReadAborted();
break;
@@ -444,8 +441,8 @@ public final class PCXImageReader extends ImageReaderBase {
// param.setSourceSubsampling(2, 3, 0, 0);
// param.setSourceSubsampling(2, 1, 0, 0);
//
// int width = reader.getHdpi(0);
// int height = reader.getVdpi(0);
// int width = reader.getWidth(0);
// int height = reader.getHeight(0);
//
// param.setSourceRegion(new Rectangle(width / 4, height / 4, width / 2, height / 2));
// param.setSourceRegion(new Rectangle(width / 2, height / 2));