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

TMI-121: Clean up.

Browse Source
This commit is contained in:
Harald Kuhr 2015-03-22 14:19:29 +01:00
parent c4630d9eee
commit 449db69d27
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
View File

@ -81,7 +81,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
segment = segments.get(currentSegment); segment = segments.get(currentSegment);
if (streamPos >= segment.start && streamPos < segment.end()) { if (streamPos >= segment.start && streamPos < segment.end()) {
segment.seek(stream, segment.realStart + streamPos - segment.start); segment.seek(stream, streamPos);
return segment; return segment;
} }
@ -159,7 +159,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
currentSegment = segments.size() - 1; currentSegment = segments.size() - 1;
if (streamPos >= segment.start && streamPos < segment.end()) { if (streamPos >= segment.start && streamPos < segment.end()) {
segment.seek(stream, segment.realStart + streamPos - segment.start); segment.seek(stream, streamPos);
break; break;
} }
@ -178,14 +178,14 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
segment = segments.get(currentSegment); segment = segments.get(currentSegment);
if (streamPos >= segment.start && streamPos < segment.end()) { if (streamPos >= segment.start && streamPos < segment.end()) {
segment.seek(stream, segment.realStart + streamPos - segment.start); segment.seek(stream, streamPos);
break; break;
} }
} }
} }
else { else {
segment.seek(stream, segment.realStart + streamPos - segment.start); segment.seek(stream, streamPos);
} }
return segment; return segment;
@ -262,7 +262,6 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
repositionAsNecessary(); repositionAsNecessary();
// int read = stream.read();
int read = segment.read(stream); int read = segment.read(stream);
if (read != -1) { if (read != -1) {
@ -284,7 +283,6 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
repositionAsNecessary(); repositionAsNecessary();
long bytesLeft = segment.end() - streamPos; // If no more bytes after reposition, we're at EOF long bytesLeft = segment.end() - streamPos; // If no more bytes after reposition, we're at EOF
// int count = bytesLeft == 0 ? -1 : stream.read(b, off + total, (int) Math.min(len - total, bytesLeft));
int count = bytesLeft == 0 ? -1 : segment.read(stream, b, off + total, (int) Math.min(len - total, bytesLeft)); int count = bytesLeft == 0 ? -1 : segment.read(stream, b, off + total, (int) Math.min(len - total, bytesLeft));
if (count == -1) { if (count == -1) {
@ -333,7 +331,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
} }
public void seek(final ImageInputStream stream, final long newPos) throws IOException { public void seek(final ImageInputStream stream, final long newPos) throws IOException {
stream.seek(newPos); stream.seek(realStart + newPos - start);
} }
public int read(final ImageInputStream stream) throws IOException { public int read(final ImageInputStream stream) throws IOException {
@ -396,8 +394,8 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
@Override @Override
public void seek(final ImageInputStream stream, final long newPos) throws IOException { public void seek(final ImageInputStream stream, final long newPos) throws IOException {
pos = (int) (newPos - realStart); pos = (int) (newPos - start);
stream.seek(newPos); super.seek(stream, newPos);
} }
@Override @Override