diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-29 12:29:13 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-29 12:29:13 +0000 |
| commit | fa5085428e6672f7f9e88a652e3c4a7f9c93d116 (patch) | |
| tree | ef453f1196cff48f99c0b0f45a95c11a4fd49b97 /modules/desktop_capture/win/cursor.cc | |
| parent | f3d27028ce9a280c02c286f9b98adf1e476c03d2 (diff) | |
| parent | 4a1b3e3a69d349b0d3e91f607f24e02d8b975688 (diff) | |
| download | webrtc-fa5085428e6672f7f9e88a652e3c4a7f9c93d116.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 4a1b3e3a69d349b0d3e91f607f24e02d8b975688
This commit was generated by merge_from_chromium.py.
Change-Id: Iada7abd78f123301a98db982a6272cd9487de72f
Diffstat (limited to 'modules/desktop_capture/win/cursor.cc')
| -rw-r--r-- | modules/desktop_capture/win/cursor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/desktop_capture/win/cursor.cc b/modules/desktop_capture/win/cursor.cc index 00055c44..e3c272ce 100644 --- a/modules/desktop_capture/win/cursor.cc +++ b/modules/desktop_capture/win/cursor.cc @@ -197,7 +197,7 @@ MouseCursor* CreateMouseCursorFromHCursor(HDC dc, HCURSOR cursor) { // The XOR mask becomes the color bitmap. memcpy( - image->data(), mask_plane + (width * height), image->stride() * width); + image->data(), mask_plane + (width * height), image->stride() * height); } // Reconstruct transparency from the mask if the color image does not has |