diff options
| -rw-r--r-- | generic/tkImgPNG.c | 2 | ||||
| -rw-r--r-- | generic/tkImgPhoto.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkImgPNG.c b/generic/tkImgPNG.c index 8a740d2..d6a706a 100644 --- a/generic/tkImgPNG.c +++ b/generic/tkImgPNG.c @@ -3345,7 +3345,7 @@ EncodePNG( pngPtr->colorType = PNG_COLOR_RGBA; pngPtr->bytesPerPixel = 4; } else { - pngPtr->colorType = PNG_COLOR_RGBA; + pngPtr->colorType = PNG_COLOR_RGB; pngPtr->bytesPerPixel = 3; } } else { diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 9527c93..63e2fa8 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -3683,6 +3683,9 @@ ImgGetPhoto( break; } } + if (!alphaOffset) { + blockPtr->offset[3]= -1; /* Tell caller alpha need not be read */ + } greenOffset = blockPtr->offset[1] - blockPtr->offset[0]; blueOffset = blockPtr->offset[2] - blockPtr->offset[0]; if (((optPtr->options & OPT_BACKGROUND) && alphaOffset) || @@ -3803,9 +3806,6 @@ ImgGetPhoto( blockPtr->offset[2] = 0; blockPtr->offset[3]= 1; } - if (!alphaOffset) { - blockPtr->offset[3]= -1; - } return data; } return NULL; |