Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 265084. Progress towards floating point nscoord: make image interfaces and libpr0n use PRInt32 instead of nscoord. r+sr=tor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165362 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu 2004-11-15 04:34:51 +00:00
parent c7c7de2c58
commit 37ebb7f146
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/gfx/src/shared/gfxImageFrame.cpp
View File

@ -58,8 +58,8 @@ gfxImageFrame::~gfxImageFrame()
/* destructor code */
}
/* void init (in nscoord aX, in nscoord aY, in nscoord aWidth, in nscoord aHeight, in gfx_format aFormat); */
NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight, gfx_format aFormat,gfx_depth aDepth)
/* void init (in PRInt32 aX, in PRInt32 aY, in PRInt32 aWidth, in PRInt32 aHeight, in gfx_format aFormat); */
NS_IMETHODIMP gfxImageFrame::Init(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, gfx_format aFormat,gfx_depth aDepth)
{
if (mInitalized)
return NS_ERROR_FAILURE;
@ -70,7 +70,7 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
}
/* check to make sure we don't overflow a 32-bit */
nscoord tmp = aWidth * aHeight;
PRInt32 tmp = aWidth * aHeight;
if (tmp / aHeight != aWidth) {
NS_ASSERTION(0, "width or height too large\n");
return NS_ERROR_FAILURE;
@ -170,8 +170,8 @@ NS_IMETHODIMP gfxImageFrame::SetMutable(PRBool aMutable)
return NS_OK;
}
/* readonly attribute nscoord x; */
NS_IMETHODIMP gfxImageFrame::GetX(nscoord *aX)
/* readonly attribute PRInt32 x; */
NS_IMETHODIMP gfxImageFrame::GetX(PRInt32 *aX)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
@ -180,8 +180,8 @@ NS_IMETHODIMP gfxImageFrame::GetX(nscoord *aX)
return NS_OK;
}
/* readonly attribute nscoord y; */
NS_IMETHODIMP gfxImageFrame::GetY(nscoord *aY)
/* readonly attribute PRInt32 y; */
NS_IMETHODIMP gfxImageFrame::GetY(PRInt32 *aY)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
@ -191,8 +191,8 @@ NS_IMETHODIMP gfxImageFrame::GetY(nscoord *aY)
}
/* readonly attribute nscoord width; */
NS_IMETHODIMP gfxImageFrame::GetWidth(nscoord *aWidth)
/* readonly attribute PRInt32 width; */
NS_IMETHODIMP gfxImageFrame::GetWidth(PRInt32 *aWidth)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
@ -201,8 +201,8 @@ NS_IMETHODIMP gfxImageFrame::GetWidth(nscoord *aWidth)
return NS_OK;
}
/* readonly attribute nscoord height; */
NS_IMETHODIMP gfxImageFrame::GetHeight(nscoord *aHeight)
/* readonly attribute PRInt32 height; */
NS_IMETHODIMP gfxImageFrame::GetHeight(PRInt32 *aHeight)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
@ -212,7 +212,7 @@ NS_IMETHODIMP gfxImageFrame::GetHeight(nscoord *aHeight)
}
/* void getRect(in nsRectRef rect); */
NS_IMETHODIMP gfxImageFrame::GetRect(nsRect &aRect)
NS_IMETHODIMP gfxImageFrame::GetRect(nsIntRect &aRect)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
@ -310,7 +310,7 @@ NS_IMETHODIMP gfxImageFrame::SetImageData(const PRUint8 *aData, PRUint32 aLength
// adjust for aLength < row_stride
PRInt32 numnewrows = ((aLength - 1) / row_stride) + 1;
nsRect r(0, row, mSize.width, numnewrows);
nsIntRect r(0, row, mSize.width, numnewrows);
mImage->ImageUpdated(nsnull, nsImageUpdateFlags_kBitsChanged, &r);
return NS_OK;
@ -430,7 +430,7 @@ NS_IMETHODIMP gfxImageFrame::UnlockAlphaData()
/* void drawTo */
NS_IMETHODIMP gfxImageFrame::DrawTo(gfxIImageFrame* aDst, nscoord aDX, nscoord aDY, nscoord aDWidth, nscoord aDHeight)
NS_IMETHODIMP gfxImageFrame::DrawTo(gfxIImageFrame* aDst, PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;

4
mozilla/gfx/src/shared/gfxImageFrame.h
View File

@ -68,7 +68,7 @@ public:
virtual ~gfxImageFrame();
protected:
nsSize mSize;
nsIntSize mSize;
private:
/* private members */
@ -80,7 +80,7 @@ private:
gfx_format mFormat;
PRInt32 mTimeout; // -1 means display forever
nsPoint mOffset;
nsIntPoint mOffset;
gfx_color mBackgroundColor;