From 0ba441fe8f379ec506000f7fa29f867cb6bc0d51 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 20 Jan 2003 01:53:36 +0000 Subject: [PATCH] remove the XImage from Surface --- DESIGN/render.dia | Bin 3246 -> 3191 bytes otk/surface.cc | 15 ++------------- otk/surface.hh | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/DESIGN/render.dia b/DESIGN/render.dia index 938e41220ebabef1a842a76df33e8b3cbfce738e..de912a5293830755e214e79e96ae35183c6decc6 100644 GIT binary patch delta 3021 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 PpTGG(gEsW0wDbS~T6Epd delta 3077 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 TS9!EPfAfF9_IRNL2KfL0nRE=h diff --git a/otk/surface.cc b/otk/surface.cc index 6cc453d4..af9da7a6 100644 --- a/otk/surface.cc +++ b/otk/surface.cc @@ -17,7 +17,6 @@ namespace otk { Surface::Surface(int screen) : _screen(screen), _size(1, 1), - _im(0), _pm(None), _xftdraw(0) { @@ -27,7 +26,6 @@ Surface::Surface(int screen) Surface::Surface(int screen, const Point &size) : _screen(screen), _size(size), - _im(0), _pm(None), _xftdraw(0) { @@ -41,13 +39,10 @@ Surface::~Surface() void Surface::createObjects() { - assert(!_im); assert(_pm == None); assert(!_xftdraw); + assert(_pm == None); assert(!_xftdraw); const ScreenInfo *info = display->screenInfo(_screen); - _im = XCreateImage(**display, info->visual(), info->depth(), - ZPixmap, 0, NULL, _size.x(), _size.y(), 32, 0); - _pm = XCreatePixmap(**display, info->rootWindow(), _size.x(), _size.y(), info->depth()); @@ -56,19 +51,13 @@ void Surface::createObjects() void Surface::destroyObjects() { - assert(_im); assert(_pm != None); assert(_xftdraw); + assert(_pm != None); assert(_xftdraw); XftDrawDestroy(_xftdraw); _xftdraw = 0; XFreePixmap(**display, _pm); _pm = None; - - // do the delete ourselves cuz we alloc it with new not malloc - delete [] _im->data; - _im->data = NULL; - XDestroyImage(_im); - _im = 0; } void Surface::setSize(int w, int h) diff --git a/otk/surface.hh b/otk/surface.hh index 53738128..c21a65f3 100644 --- a/otk/surface.hh +++ b/otk/surface.hh @@ -18,7 +18,6 @@ class ScreenInfo; class Surface { int _screen; Point _size; - XImage *_im; Pixmap _pm; XftDraw *_xftdraw; -- 2.39.2