summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-11-23 11:24:12 +0059
committerAmit Pundir <amit.pundir@linaro.org>2013-11-03 04:46:08 +0530
commit40254778c5f89751a1246a5e06171c2cbb07dc71 (patch)
treee2b6578a6ac3337ff24b4c5e03bd5906c8472096
parent79318950a5ce26c08b9d5f0fff6e1ff6d13cfa07 (diff)
downloadlibhardware-linaro_android_4.4_juice.tar.gz
gralloc: Fix inverted colors on BRGAlinaro_android_4.4_juice
Don't assume any 32bpp mode is RGBX. This is a forward-port of commit f50b075a8b88eff482628e8ab62a04539117c7ea Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--modules/gralloc/framebuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index e0831df0..b7ba3b1a 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -98,7 +98,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
m->info.activate = FB_ACTIVATE_VBL;
m->info.yoffset = offset / m->finfo.line_length;
if (ioctl(m->framebuffer->fd, FBIOPAN_DISPLAY, &m->info) == -1) {
- LOGE("FBIOPAN_DISPLAY failed");
+ ALOGE("FBIOPAN_DISPLAY failed");
m->base.unlock(&m->base, buffer);
return -errno;
}
@@ -330,7 +330,7 @@ int fb_device_open(hw_module_t const* module, const char* name,
if (status >= 0) {
int stride = m->finfo.line_length / (m->info.bits_per_pixel >> 3);
int format = (m->info.bits_per_pixel == 32)
- ? HAL_PIXEL_FORMAT_RGBX_8888
+ ? (m->info.red.offset ? HAL_PIXEL_FORMAT_BGRA_8888 : HAL_PIXEL_FORMAT_RGBX_8888)
: HAL_PIXEL_FORMAT_RGB_565;
const_cast<uint32_t&>(dev->device.flags) = 0;
const_cast<uint32_t&>(dev->device.width) = m->info.xres;