q-lang-cvs

[<ag...@us...>]

Update of /cvsroot/q-lang/q/modules/ggi
In directory sc8-pr-cvs1:/tmp/cvs-serv32361

Modified Files:
	ggi.c 
Log Message:
more bug fixes in text renderer

Index: ggi.c
===================================================================
RCS file: /cvsroot/q-lang/q/modules/ggi/ggi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ggi.c	20 Dec 2003 22:06:16 -0000	1.12
--- ggi.c	21 Dec 2003 10:54:35 -0000	1.13
***************
*** 1562,1567 ****
    /* blit the rendered string to the visual */
  
-   if (!(pixel = malloc(pack_size(v->vis, dim)))) return 0;
-   error = ggiPackColors(v->vis, pixel, col, dim);
    if (!error) {
  #ifdef HAVE_GGIBUF
--- 1562,1565 ----
***************
*** 1577,1586 ****
  	  n = j*wd+i;
  	  ggiBufSetGCForeground(v->b[0], col[n].a/0x101);
! 	  ggiPutPixel(vis, x+i, y+j, pixel[n]);
  	}
        ggiBufSetGCForeground(v->b[0], val);
!     } else
  #endif
!       error = ggiPutBox(v->vis, x, y, wd, ht, pixel);
    }
    free(col);
--- 1575,1590 ----
  	  n = j*wd+i;
  	  ggiBufSetGCForeground(v->b[0], col[n].a/0x101);
! 	  ggiPutPixel(vis, x+i, y+j, ggiMapColor(vis, &col[n]));
  	}
        ggiBufSetGCForeground(v->b[0], val);
!     } else {
  #endif
!       if (!(pixel = malloc(pack_size(v->vis, dim)))) {
! 	free(col);
! 	return 0;
!       }
!       error = ggiPackColors(v->vis, pixel, col, dim) ||
! 	ggiPutBox(v->vis, x, y, wd, ht, pixel);
!     }
    }
    free(col);