From 86e09b8600a35ca2712166b32023faba0a01bf53 Mon Sep 17 00:00:00 2001 From: "pavlov%netscape.com" Date: Sun, 14 Jan 2001 01:08:01 +0000 Subject: [PATCH] use memcpy for the data git-svn-id: svn://10.0.0.236/trunk@84933 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx2/src/windows/nsImage.cpp | 11 ++--------- mozilla/gfx2/src/xlib/nsImage.cpp | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/mozilla/gfx2/src/windows/nsImage.cpp b/mozilla/gfx2/src/windows/nsImage.cpp index b2e7fedd47d..c9a1598dbc9 100644 --- a/mozilla/gfx2/src/windows/nsImage.cpp +++ b/mozilla/gfx2/src/windows/nsImage.cpp @@ -208,9 +208,6 @@ NS_IMETHODIMP nsImage::GetFormat(gfx_format *aFormat) HWND bg = GetDesktopWindow(); HDC memDC = GetDC(NULL); -// HBITMAP memBM = CreateCompatibleBitmap(memDC, GFXCoordToIntCeil(mSize.width), GFXCoordToIntCeil(mSize.height)); - - LPBITMAPINFOHEADER mBHead = (LPBITMAPINFOHEADER)new char[sizeof(BITMAPINFO)]; mBHead->biSize = sizeof(BITMAPINFOHEADER); @@ -283,11 +280,7 @@ NS_IMETHODIMP nsImage::SetBits(const PRUint8 *data, PRUint32 length, PRInt32 off if (!mBits) return NS_ERROR_NOT_INITIALIZED; - PRUint32 i; - PRInt32 off; - // XXX i could unroll this loop a bit :-) - for (i=0, off = offset; i <= length; ++i, ++off) { - mBits[off] = data[i]; - } + memcpy(mBits + offset, data, length); + return NS_OK; } diff --git a/mozilla/gfx2/src/xlib/nsImage.cpp b/mozilla/gfx2/src/xlib/nsImage.cpp index d272aa7fdcd..ada66fffcc3 100644 --- a/mozilla/gfx2/src/xlib/nsImage.cpp +++ b/mozilla/gfx2/src/xlib/nsImage.cpp @@ -155,11 +155,7 @@ NS_IMETHODIMP nsImage::SetBits(const PRUint8 *data, PRUint32 length, PRInt32 off if (!mBits) return NS_ERROR_NOT_INITIALIZED; - PRUint32 i; - PRInt32 off; - // XXX i could unroll this loop a bit :-) - for (i=0, off = offset; i <= length; ++i, ++offset) { - mBits[off] = data[i]; - } + memcpy(mBits + offset, data, length); + return NS_OK; }