Fix opacity calculation problem with the agg renderer (#5697)

[szekerest]

No description provided.

[szekerest]

@jmckenna @rouault I wonder how to recreate the expected files for the failed tests. I created an ubuntu VM, and run msautotest, but most of the generated files are binary different than the files from the expected directories.

[rouault]

I created an ubuntu VM, and run msautotest, but most of the generated files are binary different than the files from the expected directories.

you need a 20.04 one to get the "right" version of the libraries. As I've it handy, I've just checkout your branch and pushed the updated expected results

[szekerest]

I created an ubuntu VM, and run msautotest, but most of the generated files are binary different than the files from the expected directories.

you need a 20.04 one to get the "right" version of the libraries. As I've it handy, I've just checkout your branch and pushed the updated expected results

Great, thanks @rouault
I'll give it a try creating a 20.04 VM. I wonder if we could add that requirement into the msautotests docs for further reference.

[github-actions]

The backport to branch-8-2 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply 93b104dd7... Update msautotest results
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout

Auto-merging src/mapagg.cpp
[backport-7085-to-branch-8-2 9a37e7da9] Fix opacity calculation problem with the agg renderer (#5697)
 Author: Szekeres Tamás <szekeres.tamas@hmei.hu>
 Date: Fri Jun 21 12:13:07 2024 +0200
 1 file changed, 3 insertions(+), 3 deletions(-)
Auto-merging src/mapagg.cpp
[backport-7085-to-branch-8-2 861a45e45] fix linting
 Author: Szekeres Tamás <szekeres.tamas@hmei.hu>
 Date: Fri Jun 21 12:27:24 2024 +0200
 1 file changed, 2 insertions(+), 1 deletion(-)
CONFLICT (modify/delete): msautotest/renderers/expected/compop_hsl_color.agg.png deleted in HEAD and modified in 93b104dd7 (Update msautotest results).  Version 93b104dd7 (Update msautotest results) of msautotest/renderers/expected/compop_hsl_color.agg.png left in tree.
CONFLICT (modify/delete): msautotest/renderers/expected/compop_hsl_hue.agg.png deleted in HEAD and modified in 93b104dd7 (Update msautotest results).  Version 93b104dd7 (Update msautotest results) of msautotest/renderers/expected/compop_hsl_hue.agg.png left in tree.
CONFLICT (modify/delete): msautotest/renderers/expected/compop_hsl_luminosity.agg.png deleted in HEAD and modified in 93b104dd7 (Update msautotest results).  Version 93b104dd7 (Update msautotest results) of msautotest/renderers/expected/compop_hsl_luminosity.agg.png left in tree.

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-branch-8-2 branch-8-2
# Navigate to the new working tree
cd .worktrees/backport-branch-8-2
# Create a new branch
git switch --create backport-7085-to-branch-8-2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b1e4a836592feea228d483bda3480d78b501786a,2cc9cd1c9bce04a6a13429489e9f9cd22d7589ff,93b104dd7126782464455942088d19d5036995f0
# Push it to GitHub
git push --set-upstream origin backport-7085-to-branch-8-2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-2

Then, create a pull request where the base branch is branch-8-2 and the compare/head branch is backport-7085-to-branch-8-2.

[rouault]

backport done in #7087

[geographika]

@szekerest @rouault - the vagrant approach works well for me to get the exact binary outputs on a Windows machine. Isn't this the recommended approach?

[rouault]

Isn't this the recommended approach?

yes, that can be convenient .Added to #7086