Skip to content

[tasimage] fix copy constructor, optimize GetMask #22027

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

Merged
linev merged 3 commits into from
Apr 24, 2026
+42 −52
Merged

[tasimage] fix copy constructor, optimize GetMask #22027

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
398dae0
[asimage] optimize GetMask
linev Apr 23, 2026
703ca05
[asimage] fix copy constructor and assign operator
linev Apr 23, 2026
bd3deb0
[asimage] introduce DestroyScaledImage()
linev Apr 23, 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
1 change: 1 addition & 0 deletions graf2d/asimage/inc/TASImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class TASImage : public TImage {
void SetDefaults();
void CreateThumbnail();
void DestroyImage();
void DestroyScaledImage();
const char *TypeFromMagicNumber(const char *file);

protected:
Expand Down
93 changes: 41 additions & 52 deletions graf2d/asimage/src/TASImage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ typedef struct {
}\



////////////////////////////////////////////////////////////////////////////////
/// Destroy image.

Expand All @@ -192,6 +191,18 @@ void TASImage::DestroyImage()
fImage = nullptr;
}

////////////////////////////////////////////////////////////////////////////////
/// Destroy scaled image.

void TASImage::DestroyScaledImage()
{
if (fScaledImage) {
delete fScaledImage;
fScaledImage = nullptr;
Comment thread
linev marked this conversation as resolved.
}

}

////////////////////////////////////////////////////////////////////////////////
/// Set default parameters.

Expand Down Expand Up @@ -297,8 +308,8 @@ TASImage::TASImage(const TASImage &img) : TImage(img)

if (img.IsValid()) {
fImage = clone_asimage(img.fImage, SCL_DO_ALL);
fScaledImage = fScaledImage ? static_cast<TASImage *>(img.fScaledImage->Clone()) : nullptr;
fGrayImage = fGrayImage ? clone_asimage(img.fGrayImage, SCL_DO_ALL) : nullptr;
fScaledImage = img.fScaledImage ? static_cast<TASImage *>(img.fScaledImage->Clone()) : nullptr;
fGrayImage = img.fGrayImage ? clone_asimage(img.fGrayImage, SCL_DO_ALL) : nullptr;

if (img.fImage->alt.vector) {
Int_t size = img.fImage->width * img.fImage->height * sizeof(double);
Expand All @@ -325,18 +336,18 @@ TASImage &TASImage::operator=(const TASImage &img)
TImage::operator=(img);

DestroyImage();
delete fScaledImage;
DestroyScaledImage();

fImage = clone_asimage(img.fImage, SCL_DO_ALL);
fScaledImage = fScaledImage ? static_cast<TASImage *>(img.fScaledImage->Clone()) : nullptr;
fGrayImage = fGrayImage ? clone_asimage(img.fGrayImage, SCL_DO_ALL) : nullptr;
fScaledImage = img.fScaledImage ? static_cast<TASImage *>(img.fScaledImage->Clone()) : nullptr;
fGrayImage = img.fGrayImage ? clone_asimage(img.fGrayImage, SCL_DO_ALL) : nullptr;

if (img.fImage->alt.vector) {
Int_t size = img.fImage->width * img.fImage->height * sizeof(double);
fImage->alt.vector = (double*)malloc(size);
memcpy(fImage->alt.vector, img.fImage->alt.vector, size);
}

fScaledImage = img.fScaledImage ? static_cast<TASImage *>(img.fScaledImage->Clone()) : nullptr;
fZoomUpdate = kNoZoom;
fZoomOffX = img.fZoomOffX;
fZoomOffY = img.fZoomOffY;
Expand All @@ -356,8 +367,7 @@ TASImage &TASImage::operator=(const TASImage &img)
TASImage::~TASImage()
{
DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -586,8 +596,7 @@ void TASImage::ReadImage(const char *filename, EImageFileTypes /*type*/)
fName.Form("%s.", gSystem->BaseName(fname.Data()));

DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

fImage = image;
fZoomUpdate = kNoZoom;
Expand Down Expand Up @@ -999,8 +1008,7 @@ void TASImage::SetImage(const Double_t *imageData, UInt_t width, UInt_t height,
}

DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

// get min and max value of image
fMinValue = fMaxValue = *imageData;
Expand Down Expand Up @@ -1090,8 +1098,7 @@ void TASImage::FromPad(TVirtualPad *pad, Int_t x, Int_t y, UInt_t w, UInt_t h)
SetName(pad->GetName());

DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

if (gROOT->IsBatch()) { // in batch mode
TVirtualPS *psave = gVirtualPS;
Expand Down Expand Up @@ -1472,8 +1479,8 @@ void TASImage::Paint(Option_t *option)
}

if (tile) {
delete fScaledImage;
fScaledImage = (TASImage*)TImage::Create();
DestroyScaledImage();
fScaledImage = (TASImage*) TImage::Create();
if (!fScaledImage) return;
fScaledImage->fImage = tile_asimage(fgVisual, fImage, tile_x, tile_y,
to_w, to_h, tile_tint, ASA_ASImage,
Expand All @@ -1492,8 +1499,7 @@ void TASImage::Paint(Option_t *option)
Int_t(fScaledImage->GetHeight()) != to_h ||
fZoomUpdate)) {

delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();
}

if (!fScaledImage) {
Expand Down Expand Up @@ -1926,9 +1932,7 @@ void TASImage::SetPalette(const TImagePalette *palette)
for (Int_t col = 0; col < 4; col++)
delete [] asPalette.channels[col];


delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -2084,8 +2088,7 @@ void TASImage::UnZoom()
fZoomWidth = fImage->width;
fZoomHeight = fImage->height;

delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -2368,42 +2371,33 @@ Pixmap_t TASImage::GetMask()
UInt_t ow = img->width%8;
UInt_t ww = img->width - ow + (ow ? 8 : 0);

UInt_t bit = 0;
int i = 0;
UInt_t y = 0;
UInt_t x = 0;

char *bits = new char[ww*hh]; //an array of bits

ASImageDecoder *imdec = start_image_decoding(fgVisual, img, SCL_DO_ALPHA,
0, 0, ww, 0, nullptr);
if (!imdec) {
delete [] bits;
return 0;
}
if (!imdec)
return pxmap;

std::vector<char> bits(ww * hh / 8); //an array of bits

for (y = 0; y < hh; y++) {
UInt_t bit = 0, i = 0;
for (UInt_t y = 0; y < hh; y++) {
imdec->decode_image_scanline(imdec);
CARD32 *a = imdec->buffer.alpha;

for (x = 0; x < ww; x++) {
for (UInt_t x = 0; x < ww; x++) {
if (a[x]) {
SETBIT(bits[i], bit);
} else {
CLRBIT(bits[i], bit);
}
bit++;
if (bit == 8) {
if (++bit == 8) {
bit = 0;
i++;
}
}
}

stop_image_decoding(&imdec);
pxmap = gVirtualX->CreateBitmap(gVirtualX->GetDefaultRootWindow(), (const char *)bits,
ww, hh);
delete [] bits;
pxmap = gVirtualX->CreateBitmap(gVirtualX->GetDefaultRootWindow(), bits.data(), ww, hh);
return pxmap;
}

Expand All @@ -2418,8 +2412,7 @@ void TASImage::SetImage(Pixmap_t pxm, Pixmap_t mask)
}

DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

Int_t xy;
UInt_t w, h;
Expand Down Expand Up @@ -6462,8 +6455,7 @@ void TASImage::Gray(Bool_t on)
return;
}
ASImage *sav = nullptr;
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

if (fGrayImage) {
sav = fImage;
Expand Down Expand Up @@ -6511,8 +6503,7 @@ void TASImage::Gray(Bool_t on)
GetImageCompression(), GetImageQuality());
if (!imout) {
Warning("ToGray", "Failed to start image output");
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();
delete [] imdec;
return;
}
Expand Down Expand Up @@ -6586,8 +6577,7 @@ void TASImage::FromWindow(Drawable_t wid, Int_t x, Int_t y, UInt_t w, UInt_t h)
}

DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

static int x11 = -1;
if (x11 < 0) x11 = gVirtualX->InheritsFrom("TGX11");
Expand All @@ -6611,8 +6601,7 @@ void TASImage::FromWindow(Drawable_t wid, Int_t x, Int_t y, UInt_t w, UInt_t h)
void TASImage::FromGLBuffer(UChar_t* buf, UInt_t w, UInt_t h)
{
DestroyImage();
delete fScaledImage;
fScaledImage = nullptr;
DestroyScaledImage();

UChar_t* xx = new UChar_t[4*w];
for (UInt_t i = 0; i < h/2; ++i) {
Expand Down
Loading