Hmmm, I think you're Fix needs a fix there mate ;)

Xlib:

 > -     lbytes = ((w + 63) / 64) * 4;
 > +     lbytes = ((w + 63) / 64) * 8;


Xcb:

 > -   lbytes = (((w + 63) / 64) * 4);
 > +   else
 > +     lbytes = (((w + 63) / 64) * 4);


* 8 vs * 4 ?? ;)

If I had commit access right now, I would just fix it.

Cheers,
dh


On 02/01/13 15:01, Enlightenment SVN wrote:
> Log:
> fix mask write line stuff.
>
>
>
> Author:       raster
> Date:         2013-01-02 07:01:27 -0800 (Wed, 02 Jan 2013)
> New Revision: 81998
> Trac:         http://trac.enlightenment.org/e/changeset/81998
>
> Modified:
>    trunk/efl/ChangeLog trunk/efl/NEWS 
> trunk/efl/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c 
> trunk/efl/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c
>
> Modified: trunk/efl/ChangeLog
> ===================================================================
> --- trunk/efl/ChangeLog       2013-01-02 13:22:36 UTC (rev 81997)
> +++ trunk/efl/ChangeLog       2013-01-02 15:01:27 UTC (rev 81998)
> @@ -1,3 +1,8 @@
> +2013-01-02  Carsten Haitzler (The Rasterman)
> +
> +        * Fixed evas_software_xlib_x_write_mask_line() issue - it was
> +        finding a segment in the shm cache of the wrong size for masks!
> +
>   2013-01-02  Cedric Bail
>
>       * Use Eina_File for evas webp, gif, tiff and eet loader.
>
> Modified: trunk/efl/NEWS
> ===================================================================
> --- trunk/efl/NEWS    2013-01-02 13:22:36 UTC (rev 81997)
> +++ trunk/efl/NEWS    2013-01-02 15:01:27 UTC (rev 81998)
> @@ -96,3 +96,4 @@
>       * Fix evas_object_image_is_inside()
>       * eio functions no longer crash when passed NULL and throw errors 
> accordingly
>       * Fix eina_xattr_value_ls() and eina_xattr_value_fd_ls()
> +    * Fix mask write lines to not choose too small segments
>
> Modified: trunk/efl/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c
> ===================================================================
> --- trunk/efl/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c 
> 2013-01-02 13:22:36 UTC (rev 81997)
> +++ trunk/efl/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c 
> 2013-01-02 15:01:27 UTC (rev 81998)
> @@ -1118,13 +1118,14 @@
>        return evas_software_xcb_output_buffer_new(conn, vis, depth, w, h,
>                                                   shm, data);
>
> -   lbytes = (((w + 63) / 64) * 4);
>      if (depth > 1)
>        {
>           bpp = (depth / 8);
>           if (bpp == 3) bpp = 4;
>           lbytes = ((((w * bpp) + 3) / 4) * 4);
>        }
> +   else
> +     lbytes = (((w + 63) / 64) * 4);
>
>      sz = (lbytes * h);
>      SHMPOOL_LOCK();
>
> Modified: trunk/efl/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c
> ===================================================================
> --- trunk/efl/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c        
> 2013-01-02 13:22:36 UTC (rev 81997)
> +++ trunk/efl/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c        
> 2013-01-02 15:01:27 UTC (rev 81998)
> @@ -52,7 +52,7 @@
>       lbytes = (((w * bpp) + 3) / 4) * 4;
>        }
>      else
> -     lbytes = ((w + 63) / 64) * 4;
> +     lbytes = ((w + 63) / 64) * 8;
>      sz = lbytes * h;
>      SHMPOOL_LOCK();
>      EINA_LIST_FOREACH(shmpool, l, xob2)
>
>



------------------------------------------------------------------------------
Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery
and much more. Keep your Java skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612 
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to