Mercurial > audlegacy

diff src/audacious/util.c @ 2332:593fd166af00 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - warning cleanups
author nenolod
date Sun, 14 Jan 2007 18:53:45 -0800
parents d7ccaa59630f
children f24ae4f40e29
line wrap: on
line diff
--- a/src/audacious/util.c	Sun Jan 14 10:54:06 2007 -0800
+++ b/src/audacious/util.c	Sun Jan 14 18:53:45 2007 -0800
@@ -1431,8 +1431,8 @@
     if (dblimg->bpp == 1) {
 	register guint8 *srcptr, *ptr, *ptr2, pix;
 
-	srcptr = GDK_IMAGE_XIMAGE(img)->data;
-	ptr = GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = GDK_IMAGE(img)->mem;
+	ptr = GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + dblimg->bpl;
 
 	for (y = 0; y < img->height; y++) {
@@ -1471,8 +1471,8 @@
     if (dblimg->bpp == 3) {
 	register guint8 *srcptr, *ptr, *ptr2, pix1, pix2, pix3;
 
-	srcptr = GDK_IMAGE_XIMAGE(img)->data;
-	ptr = GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = GDK_IMAGE(img)->mem;
+	ptr = GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + dblimg->bpl;
 
 	for (y = 0; y < img->height; y++) {
@@ -1502,8 +1502,8 @@
     if (dblimg->bpp == 4) {
 	register guint32 *srcptr, *ptr, *ptr2, pix;
 
-	srcptr = (guint32 *) GDK_IMAGE_XIMAGE(img)->data;
-	ptr = (guint32 *) GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = (guint32 *) GDK_IMAGE(img)->mem;
+	ptr = (guint32 *) GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + (dblimg->bpl >> 2);
 
 	for (y = 0; y < img->height; y++) {