From bac4de7e4a83d5d2fa9e25fbdb684c2b1876bc33 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Sun, 17 Feb 2002 15:29:18 +0000 Subject: [PATCH] Bug 123613 - mng subimage composite reading dest alpha from wrong location, bump required libmng to 1.0.4. r=pavlov,cls; sr=blizzard git-svn-id: svn://10.0.0.236/trunk@114734 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure.in | 2 +- mozilla/modules/libimg/mng/libmng_pixels.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/configure.in b/mozilla/configure.in index 8fdad569123..6f6f4267aed 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -79,7 +79,7 @@ dnl Set the version number of the libs included with mozilla dnl ======================================================== MOZJPEG=62 MOZPNG=10009 -MOZMNG="((1<<16)|(0<<8)|(3))" +MOZMNG="((1<<16)|(0<<8)|(4))" NSPR_VERSION=4 dnl Set the minimum version of toolkit libs used by mozilla diff --git a/mozilla/modules/libimg/mng/libmng_pixels.c b/mozilla/modules/libimg/mng/libmng_pixels.c index 250acb55058..9c8bc9027b5 100644 --- a/mozilla/modules/libimg/mng/libmng_pixels.c +++ b/mozilla/modules/libimg/mng/libmng_pixels.c @@ -935,7 +935,7 @@ mng_retcode display_rgb8_a8 (mng_datap pData) for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer; iX += pData->iColinc) { iFGa8 = *(pDataline+3); /* get alpha values */ - iBGa8 = *(pScanline+3); + iBGa8 = *pAlphaline; if (iFGa8) /* any opacity at all ? */ { /* fully opaque or background fully transparent ? */