Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eimage.c
Log Message:
Tweak.
===================================================================
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- eimage.c 19 Sep 2006 16:55:16 -0000 1.9
+++ eimage.c 25 Dec 2006 10:21:21 -0000 1.10
@@ -403,6 +403,7 @@
int w, int h)
{
Visual *vis;
+ Pixmap m;
imlib_context_set_image(im);
imlib_context_set_drawable((win) ? WinGetXwin(win) : _default_draw);
@@ -410,7 +411,12 @@
if (vis)
imlib_context_set_visual(vis);
- *pmap = *mask = None;
+ *pmap = None;
+ if (!mask) /* Imlib2 <= 1.3.0 needs a mask pointer */
+ mask = &m; /* ... to avoid bogus error messages */
+ if (mask)
+ *mask = None;
+
if (w <= 0 || h <= 0)
imlib_render_pixmaps_for_whole_image(pmap, mask);
else
@@ -432,7 +438,6 @@
int dx, int dy, int dw, int dh, int scale)
{
Imlib_Image *im;
- Pixmap pmap, mask;
scale = (scale) ? 2 : 1;
@@ -441,8 +446,7 @@
imlib_context_set_anti_alias(1);
if (pdst)
{
- EImageRenderPixmaps(im, wdst, &pmap, &mask, dw, dh);
- *pdst = pmap;
+ EImageRenderPixmaps(im, wdst, pdst, None, dw, dh);
}
else
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
