diff --git a/coders/png.c b/coders/png.c
index f838692..0783900 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -6351,7 +6351,8 @@
n=next;
q=GetAuthenticPixels(large_image,0,yy,large_image->columns,
1,exception);
- q+=(large_image->columns-image->columns);
+ q+=(large_image->columns-image->columns)*
+ GetPixelChannels(large_image);
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
@@ -8387,13 +8388,11 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
- q=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
-
for (x=0; x < (ssize_t) image->columns; x++)
{
for (i=0; i< (ssize_t) image_colors; i++)
@@ -8750,9 +8749,6 @@
}
}
}
-{ ImageInfo *image_info=AcquireImageInfo(); strcpy(image->filename,"test.pnm");
-WriteImage(image_info,image,exception);
-}
/* END OF BUILD_PALETTE */
/* If we are excluding the tRNS chunk and there is transparency,
@@ -10554,8 +10550,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" pass %d, Image Is RGB, 16-bit GRAY, or GRAY_ALPHA",pass);
- p=GetVirtualPixels(image,0,y,image->columns,1,
- exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1, exception);
if (p == (const Quantum *) NULL)
break;