Mercurial > audlegacy
comparison src/audacious/util.c @ 2332:593fd166af00 trunk
[svn] - warning cleanups
author | nenolod |
---|---|
date | Sun, 14 Jan 2007 18:53:45 -0800 |
parents | d7ccaa59630f |
children | f24ae4f40e29 |
comparison
equal
deleted
inserted
replaced
2331:d7ccaa59630f | 2332:593fd166af00 |
---|---|
1429 gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_system(), | 1429 gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_system(), |
1430 img->width << 1, img->height << 1); | 1430 img->width << 1, img->height << 1); |
1431 if (dblimg->bpp == 1) { | 1431 if (dblimg->bpp == 1) { |
1432 register guint8 *srcptr, *ptr, *ptr2, pix; | 1432 register guint8 *srcptr, *ptr, *ptr2, pix; |
1433 | 1433 |
1434 srcptr = GDK_IMAGE_XIMAGE(img)->data; | 1434 srcptr = GDK_IMAGE(img)->mem; |
1435 ptr = GDK_IMAGE_XIMAGE(dblimg)->data; | 1435 ptr = GDK_IMAGE(dblimg)->mem; |
1436 ptr2 = ptr + dblimg->bpl; | 1436 ptr2 = ptr + dblimg->bpl; |
1437 | 1437 |
1438 for (y = 0; y < img->height; y++) { | 1438 for (y = 0; y < img->height; y++) { |
1439 for (x = 0; x < img->width; x++) { | 1439 for (x = 0; x < img->width; x++) { |
1440 pix = *srcptr++; | 1440 pix = *srcptr++; |
1469 } | 1469 } |
1470 } | 1470 } |
1471 if (dblimg->bpp == 3) { | 1471 if (dblimg->bpp == 3) { |
1472 register guint8 *srcptr, *ptr, *ptr2, pix1, pix2, pix3; | 1472 register guint8 *srcptr, *ptr, *ptr2, pix1, pix2, pix3; |
1473 | 1473 |
1474 srcptr = GDK_IMAGE_XIMAGE(img)->data; | 1474 srcptr = GDK_IMAGE(img)->mem; |
1475 ptr = GDK_IMAGE_XIMAGE(dblimg)->data; | 1475 ptr = GDK_IMAGE(dblimg)->mem; |
1476 ptr2 = ptr + dblimg->bpl; | 1476 ptr2 = ptr + dblimg->bpl; |
1477 | 1477 |
1478 for (y = 0; y < img->height; y++) { | 1478 for (y = 0; y < img->height; y++) { |
1479 for (x = 0; x < img->width; x++) { | 1479 for (x = 0; x < img->width; x++) { |
1480 pix1 = *srcptr++; | 1480 pix1 = *srcptr++; |
1500 } | 1500 } |
1501 } | 1501 } |
1502 if (dblimg->bpp == 4) { | 1502 if (dblimg->bpp == 4) { |
1503 register guint32 *srcptr, *ptr, *ptr2, pix; | 1503 register guint32 *srcptr, *ptr, *ptr2, pix; |
1504 | 1504 |
1505 srcptr = (guint32 *) GDK_IMAGE_XIMAGE(img)->data; | 1505 srcptr = (guint32 *) GDK_IMAGE(img)->mem; |
1506 ptr = (guint32 *) GDK_IMAGE_XIMAGE(dblimg)->data; | 1506 ptr = (guint32 *) GDK_IMAGE(dblimg)->mem; |
1507 ptr2 = ptr + (dblimg->bpl >> 2); | 1507 ptr2 = ptr + (dblimg->bpl >> 2); |
1508 | 1508 |
1509 for (y = 0; y < img->height; y++) { | 1509 for (y = 0; y < img->height; y++) { |
1510 for (x = 0; x < img->width; x++) { | 1510 for (x = 0; x < img->width; x++) { |
1511 pix = *srcptr++; | 1511 pix = *srcptr++; |