Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-24 21:58:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming nsIImage to nsIImage2 for now...

Browse Source
This commit is contained in:
pavlov%netscape.com 2001-01-13 02:59:24 +00:00
parent edc48f136d
commit b2cad21092
7 changed files with 117 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx2/public/Makefile.in
View File

@ -32,7 +32,7 @@ XPIDL_MODULE = gfx2
XPIDLSRCS = \
gfxtypes.idl \
nsIImage.idl \
nsIImage2.idl \
$(NULL)
EXPORTS = \

2
gfx2/public/makefile.win
View File

@ -29,7 +29,7 @@ XPIDL_MODULE = gfx2
XPIDLSRCS = \
.\gfxtypes.idl \
.\nsIImage.idl \
.\nsIImage2.idl \
$(NULL)
EXPORTS = \

2
gfx2/public/nsIImage.idl → gfx2/public/nsIImage2.idl
View File

@ -35,7 +35,7 @@ interface nsIDrawable;
* @see "gfx2"
*/
[scriptable, uuid(5e8405a4-1dd2-11b2-8385-bc8e3446cad3)]
interface nsIImage : nsISupports
interface nsIImage2 : nsISupports
{
/**
* Create a new \a aWidth x \a aHeight sized image.

208
gfx2/src/windows/nsImage.cpp
View File

@ -25,7 +25,7 @@
#include "nsUnitConverters.h"
NS_IMPL_ISUPPORTS1(nsImage, nsIImage)
NS_IMPL_ISUPPORTS1(nsImage, nsIImage2)
nsImage::nsImage() :
mBits(nsnull)
@ -41,103 +41,7 @@ nsImage::~nsImage()
mBits = nsnull;
}
/* void init (in gfx_dimension aWidth, in gfx_dimension aHeight, in gfx_format aFormat); */
NS_IMETHODIMP nsImage::Init(gfx_dimension aWidth, gfx_dimension aHeight, gfx_format aFormat)
{
if (aWidth <= 0 || aHeight <= 0) {
printf("error - negative image size\n");
return NS_ERROR_FAILURE;
}
delete[] mBits;
mSize.SizeTo(aWidth, aHeight);
mFormat = aFormat;
switch (aFormat) {
case nsIGFXFormat::RGB:
case nsIGFXFormat::RGB_A1:
case nsIGFXFormat::RGB_A8:
mDepth = 24;
break;
case nsIGFXFormat::RGBA:
mDepth = 32;
break;
default:
printf("unsupposed gfx_format\n");
break;
}
PRInt32 ceilWidth(GFXCoordToIntCeil(mSize.width));
mBytesPerRow = (ceilWidth * mDepth) >> 5;
if ((ceilWidth * mDepth) & 0x1F)
mBytesPerRow++;
mBytesPerRow <<= 2;
mBitsLength = mBytesPerRow * GFXCoordToIntCeil(mSize.height);
mBits = new PRUint8[mBitsLength];
return NS_OK;
}
/* void initFromDrawable (in nsIDrawable aDrawable, in gfx_coord aX, in gfx_coord aY, in gfx_dimension aWidth, in gfx_dimension aHeight); */
NS_IMETHODIMP nsImage::InitFromDrawable(nsIDrawable *aDrawable, gfx_coord aX, gfx_coord aY, gfx_dimension aWidth, gfx_dimension aHeight)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* readonly attribute gfx_dimension width; */
NS_IMETHODIMP nsImage::GetWidth(gfx_dimension *aWidth)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aWidth = mSize.width;
return NS_OK;
}
/* readonly attribute gfx_dimension height; */
NS_IMETHODIMP nsImage::GetHeight(gfx_dimension *aHeight)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aHeight = mSize.height;
return NS_OK;
}
/* readonly attribute gfx_format format; */
NS_IMETHODIMP nsImage::GetFormat(gfx_format *aFormat)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aFormat = mFormat;
return NS_OK;
}
/* readonly attribute unsigned long bytesPerRow; */
NS_IMETHODIMP nsImage::GetBytesPerRow(PRUint32 *aBytesPerRow)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBytesPerRow = mBytesPerRow;
return NS_OK;
}
/* readonly attribute unsigned long bitsLength; */
NS_IMETHODIMP nsImage::GetBitsLength(PRUint32 *aBitsLength)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBitsLength = mBitsLength;
return NS_OK;
}
#include <windows.h>
@ -223,14 +127,82 @@ void CreateBMPFile(HWND hwnd, LPTSTR pszFile, PBITMAPINFO pbi,
}
/* void getBits([array, size_is(length)] out PRUint8 bits, out unsigned long length); */
NS_IMETHODIMP nsImage::GetBits(PRUint8 **aBits, PRUint32 *length)
/* void init (in gfx_dimension aWidth, in gfx_dimension aHeight, in gfx_format aFormat); */
NS_IMETHODIMP nsImage::Init(gfx_dimension aWidth, gfx_dimension aHeight, gfx_format aFormat)
{
if (aWidth <= 0 || aHeight <= 0) {
printf("error - negative image size\n");
return NS_ERROR_FAILURE;
}
delete[] mBits;
mSize.SizeTo(aWidth, aHeight);
mFormat = aFormat;
switch (aFormat) {
case nsIGFXFormat::RGB:
case nsIGFXFormat::RGB_A1:
case nsIGFXFormat::RGB_A8:
mDepth = 24;
break;
case nsIGFXFormat::RGBA:
mDepth = 32;
break;
default:
printf("unsupposed gfx_format\n");
break;
}
PRInt32 ceilWidth(GFXCoordToIntCeil(mSize.width));
mBytesPerRow = (ceilWidth * mDepth) >> 5;
if ((ceilWidth * mDepth) & 0x1F)
mBytesPerRow++;
mBytesPerRow <<= 2;
mBitsLength = mBytesPerRow * GFXCoordToIntCeil(mSize.height);
mBits = new PRUint8[mBitsLength];
return NS_OK;
}
/* void initFromDrawable (in nsIDrawable aDrawable, in gfx_coord aX, in gfx_coord aY, in gfx_dimension aWidth, in gfx_dimension aHeight); */
NS_IMETHODIMP nsImage::InitFromDrawable(nsIDrawable *aDrawable, gfx_coord aX, gfx_coord aY, gfx_dimension aWidth, gfx_dimension aHeight)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* readonly attribute gfx_dimension width; */
NS_IMETHODIMP nsImage::GetWidth(gfx_dimension *aWidth)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aWidth = mSize.width;
return NS_OK;
}
/* readonly attribute gfx_dimension height; */
NS_IMETHODIMP nsImage::GetHeight(gfx_dimension *aHeight)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aHeight = mSize.height;
return NS_OK;
}
/* readonly attribute gfx_format format; */
NS_IMETHODIMP nsImage::GetFormat(gfx_format *aFormat)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBits = mBits;
*length = mBitsLength;
HWND bg = GetDesktopWindow();
@ -268,6 +240,40 @@ NS_IMETHODIMP nsImage::GetBits(PRUint8 **aBits, PRUint32 *length)
DeleteObject(memBM);
*aFormat = mFormat;
return NS_OK;
}
/* readonly attribute unsigned long bytesPerRow; */
NS_IMETHODIMP nsImage::GetBytesPerRow(PRUint32 *aBytesPerRow)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBytesPerRow = mBytesPerRow;
return NS_OK;
}
/* readonly attribute unsigned long bitsLength; */
NS_IMETHODIMP nsImage::GetBitsLength(PRUint32 *aBitsLength)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBitsLength = mBitsLength;
return NS_OK;
}
/* void getBits([array, size_is(length)] out PRUint8 bits, out unsigned long length); */
NS_IMETHODIMP nsImage::GetBits(PRUint8 **aBits, PRUint32 *length)
{
if (!mBits)
return NS_ERROR_NOT_INITIALIZED;
*aBits = mBits;
*length = mBitsLength;
return NS_OK;
}

6
gfx2/src/windows/nsImage.h
View File

@ -21,7 +21,7 @@
* Stuart Parmenter <pavlov@netscape.com>
*/
#include "nsIImage.h"
#include "nsIImage2.h"
#include "nsSize2.h"
@ -29,11 +29,11 @@
{0x73c72e6c, 0x1dd2, 0x11b2, \
{ 0x98, 0xb7, 0xae, 0x59, 0x35, 0xee, 0x63, 0xf5 }}
class nsImage : public nsIImage
class nsImage : public nsIImage2
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIIMAGE
NS_DECL_NSIIMAGE2
nsImage();
virtual ~nsImage();

2
gfx2/src/xlib/nsImage.cpp
View File

@ -25,7 +25,7 @@
#include "nsUnitConverters.h"
NS_IMPL_ISUPPORTS1(nsImage, nsIImage)
NS_IMPL_ISUPPORTS1(nsImage, nsIImage2)
nsImage::nsImage() :
mBits(nsnull)

6
gfx2/src/xlib/nsImage.h
View File

@ -21,7 +21,7 @@
* Stuart Parmenter <pavlov@netscape.com>
*/
#include "nsIImage.h"
#include "nsIImage2.h"
#include "nsSize2.h"
@ -29,11 +29,11 @@
{0x73c72e6c, 0x1dd2, 0x11b2, \
{ 0x98, 0xb7, 0xae, 0x59, 0x35, 0xee, 0x63, 0xf5 }}
class nsImage : public nsIImage
class nsImage : public nsIImage2
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIIMAGE
NS_DECL_NSIIMAGE2
nsImage();
virtual ~nsImage();