Skip to content

Conversation

@mickleness
Copy link
Contributor

@mickleness mickleness commented May 7, 2025

When a gif frame's disposal code is DISPOSAL_BGCOLOR and we're maintaining a saved image: we have to flood-fill the frame's bounds. And if the transparent pixel index changes across frames: we could sometimes flood fill the wrong value, resulting in an opaque rectangle in the output image.

There are a cluster of four related PRs that share the GifComparison class in this PR.

  1. 8357034 (integrated)
  2. 8356137 (integrated)
  3. 8356320 (this one; cannot repro after merging first two)
  4. 8351913

The test in this PR required 8356137's PR to pass.

This bug can be observed reading this gif animation:
https://tenor.com/view/fnf-free-download-fnf-free-download-fnf-fd-cyan-gif-15334412416964826224


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)

Issue

  • JDK-8356320: GifImageDecoder can produce wrong image when GCE changes transparent pixel index (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25076/head:pull/25076
$ git checkout pull/25076

Update a local copy of the PR:
$ git checkout pull/25076
$ git pull https://git.openjdk.org/jdk.git pull/25076/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25076

View PR using the GUI difftool:
$ git pr show -t 25076

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25076.diff

Using Webrev

Link to Webrev Comment

mickleness and others added 14 commits May 22, 2022 04:50
Merge openjdk/jdk into mickleness/jdk
Updating mickleness/jdk from openjdk/jdk
updating to openjdk/jdk
In this ticket the problem was:
`tpix` was the transparent pixel index of the current `model`. However `decoder.saved_image` uses its own IndexColorModel (see `decoder.saved_model`).

In a simple gif these two models are the same, but in this case the gif has some frames that change the transparent pixel index between frames. We were filling the wrong tpix value, resulting in an opaque rectangle.
@bridgekeeper
Copy link

bridgekeeper bot commented May 7, 2025

👋 Welcome back mickleness! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented May 7, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 7, 2025
@openjdk
Copy link

openjdk bot commented May 7, 2025

@mickleness The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented May 7, 2025

Webrevs

@mickleness

This comment was marked as outdated.

@mickleness mickleness closed this May 15, 2025
@mickleness mickleness reopened this May 26, 2025
@mickleness mickleness marked this pull request as draft May 26, 2025 05:17
@openjdk openjdk bot removed the rfr Pull request is ready for review label May 26, 2025
@openjdk
Copy link

openjdk bot commented May 26, 2025

⚠️ @mickleness This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

This makes the main() method much less useful, so I removed it too. (I originally used this class to explore a folder of hundreds of gifs to look for discrepancies. But the discrepancies were rarely only on the last frame.)

This is in response to:
openjdk#25044 (comment)
This can be used by multiple gif tests in this directory.

This is in response to:
openjdk#25044 (review)
@openjdk
Copy link

openjdk bot commented Jul 11, 2025

@mickleness this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8356320
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jul 11, 2025
# Conflicts:
#	test/jdk/sun/awt/image/gif/GifBuilder.java
#	test/jdk/sun/awt/image/gif/GifComparison.java
@mickleness
Copy link
Contributor Author

I merged with master and confirmed the unit test passes and the original sample gif (fnf-free-download in PR description) passes.

@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jul 11, 2025
@mickleness mickleness marked this pull request as ready for review July 11, 2025 22:56
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 11, 2025
@jayathirthrao
Copy link
Member

/reviewers 2 reviewer

@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@jayathirthrao
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

Copy link
Member

@jayathirthrao jayathirthrao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code change looks good to me.
CI testing is green.

Please update the test to include image dumping logic for debugging.

@mickleness
Copy link
Contributor Author

Regarding the image dumping logic: that will (mostly) automatically appear once we merge #25264 (specifically b418a02 ). I'll remove rfr for now until that ticket is merged.

@mickleness mickleness marked this pull request as draft August 4, 2025 16:59
@openjdk openjdk bot removed the rfr Pull request is ready for review label Aug 4, 2025
@jayathirthrao
Copy link
Member

Regarding the image dumping logic: that will (mostly) automatically appear once we merge #25264 (specifically b418a02 ). I'll remove rfr for now until that ticket is merged.

Sure, while testing this PR i manually took debugging logic and tested.

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 15, 2025

@mickleness This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@mickleness
Copy link
Contributor Author

@mickleness mickleness closed this Nov 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants