Skip to content

use proper bitmap_pad in XCreateImage#8681

Merged
couet merged 4 commits intoroot-project:masterfrom
ferdymercury:patch-14
Oct 21, 2021
Merged

use proper bitmap_pad in XCreateImage#8681
couet merged 4 commits intoroot-project:masterfrom
ferdymercury:patch-14

Conversation

@ferdymercury
Copy link
Copy Markdown
Collaborator

@ferdymercury ferdymercury commented Jul 15, 2021 •
edited
Loading

This Pull request:

Changes or fixes:

XCreateImage bitmap_pad argument was not being set properly. It caused problems with depths of e.g. 30, see #8086 (comment) by @juw

Now it matches the behaviour of:
https://github.com/root-project/root/blob/master/graf2d/x11/src/GX11Gui.cxx#L2612
https://github.com/root-project/root/blob/master/graf2d/asimage/src/libAfterImage/asvisual.c#L1549

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

This PR fixes #8086

@ferdymercury ferdymercury requested a review from couet as a code owner July 15, 2021 10:09
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Jul 15, 2021

Can one of the admins verify this patch?

@jalopezg-git jalopezg-git self-requested a review July 15, 2021 10:12
@jalopezg-git
Copy link
Copy Markdown
Contributor

jalopezg-git commented Jul 15, 2021

@phsft-bot build

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Jul 15, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

jalopezg-git
jalopezg-git reviewed Jul 15, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@jalopezg-git jalopezg-git left a comment

Choose a reason for hiding this comment

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

Just a minor change, for the sake of readability.

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Jul 15, 2021

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-07-15T10:32:58.472Z] stderr: error: could not read '.git/rebase-apply/head-name': No such file or directory

Failing tests:

@ferdymercury
Copy link
Copy Markdown
Collaborator Author

ferdymercury commented Jul 21, 2021 •
edited
Loading

Failing test is unrelated (it's happening in other PRs too)

@couet
Copy link
Copy Markdown
Member

couet commented Aug 18, 2021

@phsft-bot build

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Aug 18, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Aug 18, 2021

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-08-18T09:17:13.180Z] stderr: error: could not read '.git/rebase-apply/head-name': No such file or directory

@ferdymercury
Copy link
Copy Markdown
Collaborator Author

ferdymercury commented Oct 19, 2021

@couet any feedback on this PR?

@couet
Copy link
Copy Markdown
Member

couet commented Oct 19, 2021

I already approved it

@couet
Copy link
Copy Markdown
Member

couet commented Oct 19, 2021

@phsft-bot build

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 19, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 19, 2021

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@couet couet merged commit 6b94707 into root-project:master Oct 21, 2021
@ferdymercury ferdymercury deleted the patch-14 branch October 21, 2021 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@couet couet couet approved these changes

+1 more reviewer

@jalopezg-git jalopezg-git jalopezg-git left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@couet couet

Labels

affects:master improvement in:Graphics

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

X11 Display Depth 30 no fonts displayed

4 participants

@ferdymercury @phsft-bot @jalopezg-git @couet