From a20eb911542467ef82d1988407e6f0661373aa66 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Mon, 17 Jun 2013 22:22:40 +0000 Subject: [PATCH] Make ScreenCapturerMac work in versions of OSX before Lion. The screen capturer was broken when moving code to webrtc: width and height parameters for glReadPixels were swapped by mistkake. BUG=crbug.com/244102 R=alexeypa@chromium.org Review URL: https://webrtc-codereview.appspot.com/1678005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4239 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/desktop_capture/screen_capturer_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm index 90e9df21e3..435e3be674 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm +++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm @@ -482,7 +482,7 @@ void ScreenCapturerMac::GlBlitFast(const DesktopFrame& frame, CGLContextObj CGL_MACRO_CONTEXT = cgl_context_; glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pixel_buffer_object_.get()); - glReadPixels(0, 0, frame.size().height(), frame.size().width(), GL_BGRA, + glReadPixels(0, 0, frame.size().width(), frame.size().height(), GL_BGRA, GL_UNSIGNED_BYTE, 0); GLubyte* ptr = static_cast( glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB));