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;
 }