Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c container.c dialog.c eimage.c eimage.h
extinitwin.c hiwin.c iclass.c
Log Message:
EImagePixmapFree->EImagePixmapsFree, add mask argument.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- backgrounds.c 5 Sep 2007 19:12:55 -0000 1.101
+++ backgrounds.c 15 Dec 2007 16:29:22 -0000 1.102
@@ -173,7 +173,7 @@
{
if (bg->pmap)
{
- EImagePixmapFree(bg->pmap);
+ EImagePixmapsFree(bg->pmap, None);
bg->pmap = None;
}
}
@@ -761,7 +761,7 @@
if (pmap != None)
{
ESetWindowBackgroundPixmap(win, pmap);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, None);
}
else
{
===================================================================
RCS file: /cvs/e/e16/e/src/container.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- container.c 10 Sep 2007 20:26:53 -0000 1.17
+++ container.c 15 Dec 2007 16:29:22 -0000 1.18
@@ -1164,7 +1164,7 @@
&pmap, &mask, 0, 0);
ESetWindowBackgroundPixmap(ct->icon_win, pmap);
EShapeCombineMask(ct->icon_win, ShapeBounding, 0, 0, mask, ShapeSet);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, mask);
EImageFree(im);
EClearWindow(ct->icon_win);
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- dialog.c 10 Sep 2007 20:26:53 -0000 1.190
+++ dialog.c 15 Dec 2007 16:29:22 -0000 1.191
@@ -1176,7 +1176,7 @@
ESetWindowBackgroundPixmap(di->win, pmap);
EShapeCombineMask(di->win, ShapeBounding, 0, 0, mask, ShapeSet);
EClearWindow(di->win);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, mask);
EImageFree(im);
}
di->w = iw;
===================================================================
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- eimage.c 15 Nov 2007 20:10:30 -0000 1.18
+++ eimage.c 15 Dec 2007 16:29:22 -0000 1.19
@@ -454,7 +454,7 @@
}
void
-EImagePixmapFree(Pixmap pmap)
+EImagePixmapsFree(Pixmap pmap, Pixmap mask __UNUSED__)
{
imlib_free_pixmap_and_mask(pmap);
}
===================================================================
RCS file: /cvs/e/e16/e/src/eimage.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eimage.h 7 May 2007 23:26:13 -0000 1.11
+++ eimage.h 15 Dec 2007 16:29:22 -0000 1.12
@@ -90,7 +90,7 @@
void EImageRenderPixmaps(EImage * im, Win win, int flags,
Pixmap * pmap, Pixmap * mask,
int w, int h);
-void EImagePixmapFree(Pixmap pmap);
+void EImagePixmapsFree(Pixmap pmap, Pixmap mask);
EImageColorModifier *EImageColorModifierCreate(void);
void EImageColorModifierSetTables(EImageColorModifier * icm,
===================================================================
RCS file: /cvs/e/e16/e/src/extinitwin.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- extinitwin.c 8 Dec 2007 14:01:27 -0000 1.22
+++ extinitwin.c 15 Dec 2007 16:29:22 -0000 1.23
@@ -123,7 +123,7 @@
XShapeCombineMask(disp, w2, ShapeBounding, 0, 0, mask,
ShapeSet);
XSetWindowBackgroundPixmap(disp, w2, pmap);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, mask);
XClearWindow(disp, w2);
XQueryPointer(disp, win, &ww, &ww, &dd, &dd, &x, &y, &mm);
XMoveResizeWindow(disp, w2, x - w / 2, y - h / 2, w, h);
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- hiwin.c 10 Sep 2007 20:26:53 -0000 1.27
+++ hiwin.c 15 Dec 2007 16:29:22 -0000 1.28
@@ -119,7 +119,7 @@
ESetWindowBackgroundPixmap(EoGetWin(phi), pmap);
if (mask)
EShapeCombineMask(EoGetWin(phi), ShapeBounding, 0, 0, mask, ShapeSet);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, mask);
EClearWindow(EoGetWin(phi));
EoShapeUpdate(phi, 0);
#endif
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- iclass.c 21 Oct 2007 13:13:03 -0000 1.124
+++ iclass.c 15 Dec 2007 16:29:22 -0000 1.125
@@ -1008,7 +1008,7 @@
/* Replace the mask with the correct one */
pmm->mask = EXCreatePixmapCopy(mask, w, h, 1);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, mask);
}
}
EImageDecache(ii);
@@ -1472,7 +1472,7 @@
Pixmap pmap;
pmap = (Pixmap) strtol(p, NULL, 0);
- EImagePixmapFree(pmap);
+ EImagePixmapsFree(pmap, None);
return;
}
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
