diff --git a/mozilla/gfx2/public/nsIImage.idl b/mozilla/gfx2/public/nsIImage.idl index fe14dfa327c..3ada0c1f8ab 100644 --- a/mozilla/gfx2/public/nsIImage.idl +++ b/mozilla/gfx2/public/nsIImage.idl @@ -81,10 +81,12 @@ interface nsIImage : nsISupports */ readonly attribute gfx_format format; - /** - * this data is const and if you touch it you will die! - */ - PRUint8 getBits(); + readonly attribute unsigned long bytesPerRow; + + readonly attribute unsigned long bitsLength; + + + readonly attribute PRUint8 bits; /** * Sets \a length bytes of \a data in this object. diff --git a/mozilla/gfx2/src/xlib/nsImage.cpp b/mozilla/gfx2/src/xlib/nsImage.cpp index a074cd3782f..bd1e5cc9f2a 100644 --- a/mozilla/gfx2/src/xlib/nsImage.cpp +++ b/mozilla/gfx2/src/xlib/nsImage.cpp @@ -71,10 +71,22 @@ NS_IMETHODIMP nsImage::GetFormat(gfx_format *aFormat) return NS_OK; } -/* PRUint8 getBits (); */ -NS_IMETHODIMP nsImage::GetBits(PRUint8 *_retval) +/* readonly attribute unsigned long bytesPerRow; */ +NS_IMETHODIMP nsImage::GetBytesPerRow(PRUint32 *aBytesPerRow) { - return NS_ERROR_NOT_IMPLEMENTED; + return NS_ERROR_NOT_IMPLEMENTED; +} + +/* readonly attribute unsigned long bitsLength; */ +NS_IMETHODIMP nsImage::GetBitsLength(PRUint32 *aBitsLength) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +/* readonly attribute PRUint8 bits; */ +NS_IMETHODIMP nsImage::GetBits(PRUint8 *aBits) +{ + return NS_ERROR_NOT_IMPLEMENTED; } /* void setBits ([array, size_is (length), const] in PRUint8 data, in unsigned long length, in long offset); */