< prev index next >
src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java
Print this page
*** 1129,1140 ****
sourceYOffset = srcRegion.y;
pixelsToRead = destRegion.width * destRegion.height;
pixelsRead = 0;
processImageStarted(imageIndex);
! processImageProgress(0.0f);
tilesAcross = (width + tileOrStripWidth - 1) / tileOrStripWidth;
tilesDown = (height + tileOrStripHeight - 1) / tileOrStripHeight;
int compression = getCompression();
--- 1129,1144 ----
sourceYOffset = srcRegion.y;
pixelsToRead = destRegion.width * destRegion.height;
pixelsRead = 0;
+ clearAbortRequest();
processImageStarted(imageIndex);
! if (abortRequested()) {
! processReadAborted();
! return theImage;
! }
tilesAcross = (width + tileOrStripWidth - 1) / tileOrStripWidth;
tilesDown = (height + tileOrStripHeight - 1) / tileOrStripHeight;
int compression = getCompression();
*** 1284,1311 ****
decodeTile(ti, tj, band);
}
reportProgress();
}
}
} else {
for (int tj = minTileY; tj <= maxTileY; tj++) {
for (int ti = minTileX; ti <= maxTileX; ti++) {
decodeTile(ti, tj, -1);
reportProgress();
}
}
}
-
- if (abortRequested()) {
- processReadAborted();
- } else {
- processImageComplete();
}
!
return theImage;
}
public void reset() {
super.reset();
--- 1288,1317 ----
decodeTile(ti, tj, band);
}
reportProgress();
+ if (abortRequested()) {
+ processReadAborted();
+ return theImage;
+ }
}
}
} else {
for (int tj = minTileY; tj <= maxTileY; tj++) {
for (int ti = minTileX; ti <= maxTileX; ti++) {
decodeTile(ti, tj, -1);
reportProgress();
+ if (abortRequested()) {
+ processReadAborted();
+ return theImage;
}
}
}
}
! processImageComplete();
return theImage;
}
public void reset() {
super.reset();
< prev index next >