Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 173557 flawfinder warnings in inspector

Browse Source 
r=caillon sr=bz
This commit is contained in:
timeless%mozdev.org 2003-04-22 05:17:52 +00:00
parent 70407c0aee
commit d66191cdc9
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/inspector/base/src/inBitmap.cpp
View File

@ -37,7 +37,7 @@
* ***** END LICENSE BLOCK ***** */
#include "inBitmap.h"
#include "nsTextFormatter.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsReadableUtils.h"
@ -59,6 +59,7 @@ NS_IMPL_ISUPPORTS1(inBitmap, inIBitmap);
///////////////////////////////////////////////////////////////////////////////
// inIBitmap
// XXX this api currently takes bits per pixel
NS_IMETHODIMP
inBitmap::Init(PRUint32 aWidth, PRUint32 aHeight, PRUint8 aBytesPerPixel)
{
@ -71,6 +72,13 @@ inBitmap::Init(PRUint32 aWidth, PRUint32 aHeight, PRUint8 aBytesPerPixel)
mBits = new PRUint8[aWidth*aHeight*2];
} else if (aBytesPerPixel == 32 || aBytesPerPixel == 24) {
mBits = new PRUint8[aWidth*aHeight*3];
} else {
NS_ERROR("Expected 8, 16, 24 or 32 bits per pixel");
return NS_ERROR_UNEXPECTED;
}
if (!mBits) {
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
@ -100,28 +108,26 @@ inBitmap::GetBits(PRUint8** aBits)
NS_IMETHODIMP
inBitmap::GetPixelHex(PRUint32 aX, PRUint32 aY, PRUnichar **_retval)
{
if (aX < 0 || aX > mWidth || aY < 0 || aY > mHeight)
if (aX < 0 || aX >= mWidth || aY < 0 || aY >= mHeight)
return NS_ERROR_FAILURE;
PRUint8* c = mBits + ((aX+(mWidth*aY))*3);
PRUint8 b = c[0];
PRUint8 g = c[1];
PRUint8 r = c[2];
char* s = new char[7];
sprintf(s, "#%2X%2X%2X", r, g, b);
// sprintf won't 0-pad my hex values, so I have to space-pad it
// and then replace space characters with zero characters
for (PRUint8 i = 0; i < 6; ++i)
if (s[i] == 32)
s[i] = 48;
nsAutoString str;
str.AssignWithConversion(s);
delete s;
*_retval = ToNewUnicode(str);
// smprintf won't 0-pad my hex values, so I have to space-pad it
// and then replace space characters with zero characters
PRUnichar *out = nsTextFormatter::smprintf(NS_LITERAL_STRING("#%2X%2X%2X").get(), r, g, b);
if (!out)
return NS_ERROR_OUT_OF_MEMORY;
for (PRUintn i = 1; i <= 6; ++i)
if (out[i] == ' ')
out[i] = '0';
*_retval = out;
return NS_OK;
}

32
extensions/inspector/base/src/win/inScreenCapturer.cpp
View File

@ -61,7 +61,6 @@ static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID);
inScreenCapturer::inScreenCapturer()
{
mCSSUtils = do_GetService(kInspectorCSSUtilsCID);
}
inScreenCapturer::~inScreenCapturer()
@ -77,6 +76,12 @@ NS_IMETHODIMP
inScreenCapturer::CaptureElement(nsIDOMElement *aElement, inIBitmap **_retval)
{
if (!aElement) return NS_ERROR_FAILURE;
if (!mCSSUtils) {
nsresult rv;
mCSSUtils = do_GetService(kInspectorCSSUtilsCID, &rv);
if (NS_FAILED(rv)) return rv;
}
nsCOMPtr<nsIDOMWindowInternal> window = inLayoutUtils::GetWindowFor(aElement);
if (!window) return NS_ERROR_FAILURE;
@ -91,10 +96,10 @@ inScreenCapturer::CaptureElement(nsIDOMElement *aElement, inIBitmap **_retval)
nsRect screenpos = inLayoutUtils::GetScreenOrigin(aElement);
rect.x = screenpos.x;
rect.y = screenpos.y;
// adjust rect for margins
mCSSUtils->AdjustRectForMargins(frame, rect);
// get scale for converting frame dimensions to pixels
nsCOMPtr<nsIPresContext> pcontext;
presShell->GetPresContext(getter_AddRefs(pcontext));
@ -125,20 +130,25 @@ inScreenCapturer::CaptureRegion(nsIDOMWindowInternal *aWindow,
// determine pixel bit depth
PRUint32 depth = ::GetDeviceCaps(hdc, COLORRES);
nsCOMPtr<inIBitmap> bitmap(do_CreateInstance("@mozilla.org/inspector/bitmap;1"));
if (!bitmap) return NS_ERROR_OUT_OF_MEMORY;
bitmap->Init(aWidth, aHeight, depth);
nsresult rv;
nsCOMPtr<inIBitmap> bitmap(do_CreateInstance("@mozilla.org/inspector/bitmap;1", &rv));
if (NS_FAILED(rv)) return rv;
rv = bitmap->Init(aWidth, aHeight, depth);
if (NS_FAILED(rv)) return rv;
PRUint8* bits;
bitmap->GetBits(&bits);
rv = bitmap->GetBits(&bits);
if (NS_FAILED(rv)) return rv;
if (depth == 8) {
DoCopy8(bits, hdc, aX, aY, aWidth, aHeight);
rv = DoCopy8(bits, hdc, aX, aY, aWidth, aHeight);
} else if (depth == 16) {
DoCopy16(bits, hdc, aX, aY, aWidth, aHeight);
rv = DoCopy16(bits, hdc, aX, aY, aWidth, aHeight);
} else if (depth == 32 || depth == 24) {
DoCopy32(bits, hdc, aX, aY, aWidth, aHeight);
rv = DoCopy32(bits, hdc, aX, aY, aWidth, aHeight);
}
if (NS_FAILED(rv)) return rv;
*_retval = bitmap;
NS_ADDREF(*_retval);