Re: [g-a-devel]gnome-mag patch ..

[Bill Haneman <bill haneman sun com>]

On Fri, 2002-08-16 at 15:39, Michael Meeks wrote:
> 	Sigh, so it turns out this patch is needed to make it work well, and
> even then it spews out debug nicely; didn't notice this due to b-a-s
> hiding the output previously.

Please commit when you have time.

BTW, this codepath as you see is mostly ugly cut-and-paste from
gdkpixbuf, a workaround from pre-multihead days.  It is slated for
removal Real Soon Now, but in the meantime this patch is a band-aid.

thanks

Bill


> 	Regards,
> 
> 		Michael.
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/gnome-mag/ChangeLog,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 ChangeLog
> --- ChangeLog   15 Aug 2002 16:46:31 -0000      1.9
> +++ ChangeLog   16 Aug 2002 14:40:48 -0000
> @@ -1,3 +1,8 @@
> +2002-08-16  Michael Meeks  <michael ximian com>
> +
> +       * magnifier/mag_image.c (rgbconvert):
> +       add pre-conditions.
> +
>  2002-08-15  Michael Meeks  <michael ximian com>
>  
>         * magnifier/Makefile.am: install generated header.
> Index: magnifier/mag_image.c
> ===================================================================
> RCS file: /cvs/gnome/gnome-mag/magnifier/mag_image.c,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 mag_image.c
> --- magnifier/mag_image.c       30 Jun 2002 21:36:36 -0000      1.5
> +++ magnifier/mag_image.c       16 Aug 2002 14:40:49 -0000
> @@ -1510,9 +1510,15 @@ static void
>  rgbconvert (XImage *image, guchar *pixels, int rowstride, int alpha,
> xlib_colormap *cmap,
>             MagnifierData *mag_data)
>  {
> -  int index = (image->byte_order == MSBFirst) | (alpha != 0) << 1;
> +  int index;
>    int bank=5;          /* default fallback converter */
> -  Visual *v = cmap->visual;
> +  Visual *v;
> +
> +  g_return_if_fail (cmap != NULL);
> +  g_return_if_fail (image != NULL);
> +
> +  index = (image->byte_order == MSBFirst) | (alpha != 0) << 1;
> +  v = cmap->visual;
>    if (mag_data->fast_rgb_convert)
>      {    
>         switch (v->class) {
> 
> 
> -- 
>  mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot
> 
> _______________________________________________
> Gnome-accessibility-devel mailing list
> Gnome-accessibility-devel gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel