[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [E-devel] opengl evas engine build error



> > I'm getting the following error when attempting to build evas:
> > .....
> > .....
> > evas_gl_gradient.c:37: error: conflicting types for
> > 'evas_gl_common_gradient_data_unset'
> > evas_gl_common.h:191: error: previous declaration of
> > 'evas_gl_common_gradient_data_unset' was here
> > evas_gl_gradient.c: In function
> > `_evas_gl_common_gradient_texture_build':
> > evas_gl_gradient.c:209: error: request for member `map'
> > in something not a structure or union
> > make[5]: *** [evas_gl_gradient.lo] Error 1
> > 
> > 
> > I got around this with USE="-opengl" emerge evas, but I figured
> > I should bring it to everyone's attention.  ;)
> > 
> > -- 
> > Mike Russo
> > 
> 
>   Yes, thanks. I will send the fix a bit later.
> 
>    jose.

    Attached is a diff that should fix this..

    jose.
Index: e17/libs/evas/src/modules/engines/gl_common/evas_gl_gradient.c
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_gradient.c,v
retrieving revision 1.2
diff -u -r1.2 evas_gl_gradient.c
--- e17/libs/evas/src/modules/engines/gl_common/evas_gl_gradient.c	2 May 2006 07:28:48 -0000	1.2
+++ e17/libs/evas/src/modules/engines/gl_common/evas_gl_gradient.c	3 May 2006 05:37:55 -0000
@@ -33,7 +33,7 @@
 }
 
 Evas_GL_Gradient *
-evas_gl_common_gradient_data_unset(Evas_GL_Gradient *gr, void * data, int len, int has_alpha)
+evas_gl_common_gradient_data_unset(Evas_GL_Gradient *gr)
 {
    if (!gr) return NULL;
    evas_common_gradient_data_unset(gr->grad);
@@ -197,7 +197,7 @@
 */
    dc = evas_common_draw_context_new();
    if (!dc) return;
-   evas_common_gradient_map(dc, gr->grad, 0);
+   evas_common_gradient_map(dc, gr->grad, _EVAS_TEXTURE_REFLECT);
    if (map = gr->grad->map.data)
      {
 	im = evas_common_image_create(256, 4);
@@ -206,7 +206,7 @@
 	     int i;
 
 	     for (i = 0; i < 4; i++)
-		 evas_common_scale_rgba_span(map, gr->grad.map.len, 0xffffffff,
+		 evas_common_scale_rgba_span(map, gr->grad->map.len, 0xffffffff,
 		                             im->image->data + (i * 256), 256);
 	     im->flags |= RGBA_IMAGE_HAS_ALPHA;
 	     gr->tex = evas_gl_common_texture_new(gc, im, 0);