diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 18:13:59 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 18:13:59 +0000 |
| commit | 70aa09701aecc8cb58725af5de8bb4c5fa394610 (patch) | |
| tree | 2c39e5a0543d6d0faee40ffde7fd4edeb88b2fb8 /o3d | |
| parent | 5edab80091453ee38f28e2240649bf91c9e3e658 (diff) | |
| download | chromium_src-70aa09701aecc8cb58725af5de8bb4c5fa394610.zip chromium_src-70aa09701aecc8cb58725af5de8bb4c5fa394610.tar.gz chromium_src-70aa09701aecc8cb58725af5de8bb4c5fa394610.tar.bz2 | |
Fix for Canvas::DrawBitmap that I broke when adding
adding pitch to Texture2D::Lock
Review URL: http://codereview.chromium.org/177029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/core/cross/canvas.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/core/cross/canvas.cc b/o3d/core/cross/canvas.cc index 1ed088e..0484e33 100644 --- a/o3d/core/cross/canvas.cc +++ b/o3d/core/cross/canvas.cc @@ -184,7 +184,7 @@ void Canvas::DrawBitmap(Texture2D* texture2d, bitmap.getPixels()); for (int yy = 0; yy < height; ++yy) { - memcpy(bitmap_data + yy * width, + memcpy(bitmap_data + yy * width * 4, texture_data + yy * lock_helper.pitch(), width * 4); } |