E CVS: e kwo

[enlightenment-cvs]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/dox


Modified Files:
        dox.c 


Log Message:
Fix compile with Imlib1.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/dox.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- dox.c       1 Jul 2004 21:04:39 -0000       1.31
+++ dox.c       18 Jul 2004 19:01:16 -0000      1.32
@@ -42,6 +42,9 @@
 #pragma 2
 #endif
 
+#define EDOX_DEFAULT_W  512
+#define EDOX_DEFAULT_H  400
+
 Display            *disp;
 Root                VRoot;
 
@@ -111,6 +114,10 @@
    int                 x_return, y_return;
    unsigned int        border_width_return;
 
+#if !USE_IMLIB2
+   ImlibInitParams     params;
+#endif
+
    VRoot.scr = DefaultScreen(disp);
    VRoot.win = FindRootWindow(disp);
    XGetGeometry(disp, VRoot.win, &root_return, &x_return, &y_return,
@@ -129,8 +136,8 @@
    imlib_context_set_dither_mask(0);
 #else
    params.flags = PARAMS_IMAGECACHESIZE | PARAMS_PIXMAPCACHESIZE;
-   params.imagecachesize = (w * h * 3 * 2);
-   params.pixmapcachesize = (w * h * 3 * 2 * 8);
+   params.imagecachesize = (EDOX_DEFAULT_W * EDOX_DEFAULT_H * 3 * 2);
+   params.pixmapcachesize = (EDOX_DEFAULT_W * EDOX_DEFAULT_H * 3 * 2 * 8);
    pI1Ctx = Imlib_init_with_params(disp, &params);
    Imlib_set_render_type(pI1Ctx, RT_DITHER_TRUECOL);
    VRoot.vis = Imlib_get_visual(pI1Ctx);
@@ -255,16 +262,12 @@
    Pixmap              draw = 0;
    Link               *l = NULL, *ll = NULL;
    Imlib_Border        ibd;
-
-#if !USE_IMLIB2
-   ImlibInitParams     params;
-#endif
    int                *page_hist = NULL;
    int                 page_hist_len = 1;
    int                 page_hist_pos = 0;
 
-   w = 512;
-   h = 400;
+   w = EDOX_DEFAULT_W;
+   h = EDOX_DEFAULT_H;
    x = 0;
    y = 0;
    pagenum = 0;




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs