-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8364768: JDK javax.imageio ImageWriters do not all flush the output stream #26703
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
👋 Welcome back prr! A progress list of the required criteria for merging this PR into |
@prrace This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 163 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
@@ -0,0 +1,79 @@ | |||
/* | |||
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2025?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo
if (sz0 != sz1) { | ||
failed = true; | ||
} | ||
} finally { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no need for finally block or do we need to do baos.close
here since FileCacheImageOutputStream.close says "The destination OutputStream is not closed."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BAOS doesn't need a close() call to report its size.
I can actually dispense with the whole try block since the method throws IOException
@@ -734,6 +734,7 @@ private void write(boolean writeHeader, | |||
if (writeTrailer) { | |||
writeTrailer(); | |||
} | |||
stream.flush(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we call flush or flushBefore
(current stream position) as is being done in BMP writer?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean like BMP does this
stream.flushBefore(stream.getStreamPosition());
flush() is exactly equivalent to that.
public void flush() throws IOException {
flushBefore(getStreamPosition());
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/integrate |
Going to push as commit 603526b.
Your commit was automatically rebased without conflicts. |
4 of the 6 JDK ImageWriters flush the stream at the end of writing. 2 (TIFF and GIF) do not.
This will matter if you are using a caching ImageOutputStream.
This fix makes it consistent.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26703/head:pull/26703
$ git checkout pull/26703
Update a local copy of the PR:
$ git checkout pull/26703
$ git pull https://git.openjdk.org/jdk.git pull/26703/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26703
View PR using the GUI difftool:
$ git pr show -t 26703
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26703.diff
Using Webrev
Link to Webrev Comment