enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

some cleanups 

SVN revision: 44945
This commit is contained in:
Carsten Haitzler 2010-01-07 13:36:45 +00:00
parent 914d72e457
commit 21ecfba7ad
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
View File

@ -80,17 +80,17 @@ _ecore_x_image_shm_check(void)
if (_ecore_x_image_err)
{
XShmDetach(_ecore_x_disp, &shminfo);
XDestroyImage(xim);
shmdt(shminfo.shmaddr);
shmctl(shminfo.shmid, IPC_RMID, 0);
XDestroyImage(xim);
_ecore_x_image_shm_can = 0;
return;
}
XShmDetach(_ecore_x_disp, &shminfo);
XDestroyImage(xim);
shmdt(shminfo.shmaddr);
shmctl(shminfo.shmid, IPC_RMID, 0);
XDestroyImage(xim);
_ecore_x_image_shm_can = 1;
}
@ -128,16 +128,17 @@ ecore_x_image_free(Ecore_X_Image *im)
{
if (im->shm)
{
XShmDetach(_ecore_x_disp, &(im->shminfo));
shmdt(im->shminfo.shmaddr);
shmctl(im->shminfo.shmid, IPC_RMID, 0);
if (im->xim)
{
XShmDetach(_ecore_x_disp, &(im->shminfo));
XDestroyImage(im->xim);
shmdt(im->shminfo.shmaddr);
shmctl(im->shminfo.shmid, IPC_RMID, 0);
}
}
else
{
if (im->xim) free(im->xim->data);
}
if (im->xim)
{
im->xim->data = NULL;
XDestroyImage(im->xim);
}