Skip to content

Backport graphics fixes to 6.40 #22021

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.

Sign up for GitHub

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

Open
linev wants to merge 3 commits into
base: v6-40-00-patches
Choose a base branch
from
+21 −10
Open

Backport graphics fixes to 6.40 #22021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fd1486
[tpad] Fix - paint highlight border if color positive
linev Apr 21, 2026
49ab76e
[tasimage] fix - create two ASVisual objects
linev Apr 21, 2026
683aae4
[asimage] fix seg fault when negative coordinate specified
linev Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions graf2d/asimage/src/TASImage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,8 +2231,6 @@ Bool_t TASImage::InitVisual()
if (fgVisual && (noX == fgBatch))
return kTRUE;

if (fgVisual)
destroy_asvisual(fgVisual, kFALSE);
fgVisual = nullptr;
fgBatch = false;

Expand All @@ -2244,16 +2242,27 @@ Bool_t TASImage::InitVisual()
Visual *vis = (Visual*) gVirtualX->GetVisual();
Colormap cmap = (Colormap) gVirtualX->GetColormap();

if (vis && cmap)
fgVisual = create_asvisual_for_id(disp, screen, depth,
static ASVisual *vis_x = nullptr;

if (vis && cmap && !noX) {
if (!vis_x)
vis_x = create_asvisual_for_id(disp, screen, depth,
XVisualIDFromVisual(vis), cmap, nullptr);
fgVisual = vis_x;
}
#endif
#endif

static ASVisual *vis_batch = nullptr;

if (!fgVisual) {
// create dummy fgVisual for batch mode
fgVisual = create_asvisual(nullptr, 0, 0, nullptr);
fgVisual->dpy = nullptr; // fake (not used)
if (!vis_batch) {
// create dummy visual for batch mode
vis_batch = create_asvisual(nullptr, 0, 0, nullptr);
vis_batch->dpy = nullptr; // fake (not used)
}

fgVisual = vis_batch;
fgBatch = true;
}

Expand Down Expand Up @@ -6740,5 +6749,5 @@ Bool_t TASImage::SetJpegDpi(const char *name, UInt_t set)
Int_t TASImage::Idx(Int_t idx)
{
// The size of arrays like fImage->alt.argb32 is fImage->width*fImage->height
return TMath::Min(idx,(Int_t)(fImage->width*fImage->height));
return TMath::Max(0, TMath::Min(idx,(Int_t)(fImage->width*fImage->height)));
}
6 changes: 4 additions & 2 deletions graf2d/gpad/src/TPad.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3626,8 +3626,10 @@ void TPad::Paint(Option_t * /*option*/)
lnk = lnk->Next();
}

if (fCanvas && (fCanvas->fHilightPadBorder == this))
PaintBorder(-GetHighLightColor(), kTRUE);
if (fCanvas && (fCanvas->fHilightPadBorder == this)) {
auto col = GetHighLightColor();
if (col > 0) PaintBorder(-col, kTRUE);
}
}

fPadPaint = 0;
Expand Down
Loading