Final trunk fix for bug# 119118.

r=netdemon, sr=smfr.

r=sleestack (sherif) for checkin while tree closed


git-svn-id: svn://10.0.0.236/trunk@113506 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lordpixel%mac.com 2002-02-02 04:44:14 +00:00
parent 324ffc5a5e
commit cafbcdfba1

View File

@ -478,14 +478,14 @@ nsImageMac::UnlockImagePixels(PRBool aMaskPixels)
#pragma mark -
/** -----------------------------------------------------------------
* Create a PixMap, filling in ioPixMap
* Create a PixMap, filling in ioPixMap
*/
OSErr nsImageMac::CreatePixMap( PRInt32 aWidth, PRInt32 aHeight,
PRInt32 aDepth, CTabHandle aColorTable,
PixMap& ioPixMap, Handle& ioBitsHandle)
{
CreatePixMapInternal( aWidth, aHeight, aDepth, aColorTable,
ioPixMap, ioBitsHandle, PR_FALSE);
OSErr nsImageMac::CreatePixMap( PRInt32 aWidth, PRInt32 aHeight,
PRInt32 aDepth, CTabHandle aColorTable,
PixMap& ioPixMap, Handle& ioBitsHandle)
{
return CreatePixMapInternal(aWidth, aHeight, aDepth, aColorTable,
ioPixMap, ioBitsHandle, PR_FALSE);
}
@ -703,7 +703,7 @@ PRInt32 nsImageMac::CalculateRowBytesInternal(PRUint32 aWidth, PRUint32 aDepth,
*/
PRInt32 nsImageMac::CalculateRowBytes(PRUint32 aWidth, PRUint32 aDepth)
{
CalculateRowBytesInternal(aWidth, aDepth, PR_FALSE);
return CalculateRowBytesInternal(aWidth, aDepth, PR_FALSE);
}
#pragma mark -
@ -1132,12 +1132,12 @@ nsImageMac::CopyPixMap(Rect& aSrcRegion,
)
{
CopyPixMapInternal(aSrcRegion,
aDestRegion,
aDestDepth,
aCopyMaskBits,
aDestData,
PR_FALSE);
return CopyPixMapInternal(aSrcRegion,
aDestRegion,
aDestDepth,
aCopyMaskBits,
aDestData,
PR_FALSE);
}