From d5981c20a63bcbde8b72633574b08080357b337c Mon Sep 17 00:00:00 2001 From: "jinhyung.jo" Date: Thu, 9 Jul 2015 17:29:15 +0900 Subject: [PATCH] maru-camera: Fixed a compilation error The virtual camera module use the "Designated Initializers" introduced in ISO C99, but it is not implemented in GNU C++. So initialize in a fixed order. Change-Id: I483cb42b58edd33d01d60030424ef3865d9fc56f Signed-off-by: Jinhyung Jo --- tizen/src/hw/pci/maru_camera_qtimage.cpp | 51 +++++++------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/tizen/src/hw/pci/maru_camera_qtimage.cpp b/tizen/src/hw/pci/maru_camera_qtimage.cpp index 546bee7..8060135 100644 --- a/tizen/src/hw/pci/maru_camera_qtimage.cpp +++ b/tizen/src/hw/pci/maru_camera_qtimage.cpp @@ -53,56 +53,27 @@ enum pim_color { }; static const pixman_color_t colors[] = { + // { RED, GREEN, BLUE, ALPHA }, // WHITE - { .red = 0xFF << 8, - .green = 0xFF << 8, - .blue = 0xFF << 8, - .alpha = 0 }, + { 0xFF << 8, 0xFF << 8, 0xFF << 8, 0 }, // YELLOW - { .red = 0xFF << 8, - .green = 0xFF << 8, - .blue = 0, - .alpha = 0 }, + { 0xFF << 8, 0xFF << 8, 0, 0 }, // CYAN - { .red = 0, - .green = 0xFF << 8, - .blue = 0xFF << 8, - .alpha = 0 }, + { 0, 0xFF << 8, 0xFF << 8, 0 }, // GREEN - { .red = 0, - .green = 0xFF << 8, - .blue = 0, - .alpha = 0 }, + { 0, 0xFF << 8, 0, 0 }, // MAGENTA - { .red = 0xFF << 8, - .green = 0, - .blue = 0xFF << 8, - .alpha = 0 }, + { 0xFF << 8, 0, 0xFF << 8, 0 }, // RED - { .red = 0xFF << 8, - .green = 0, - .blue = 0, - .alpha = 0 }, + { 0xFF << 8, 0, 0, 0 }, // BLUE - { .red = 0, - .green = 0, - .blue = 0xFF << 8, - .alpha = 0 }, + { 0, 0, 0xFF << 8, 0 }, // BLACK - { .red = 0, - .green = 0, - .blue = 0, - .alpha = 0 }, + { 0, 0, 0, 0 }, // GRAY (#202020) - { .red = 0x20 << 8, - .green = 0x20 << 8, - .blue = 0x20 << 8, - .alpha = 0 }, + { 0x20 << 8, 0x20 << 8, 0x20 << 8, 0 }, // GREY (#505050) - { .red = 0x50 << 8, - .green = 0x50 << 8, - .blue = 0x50 << 8, - .alpha = 0 }, + { 0x50 << 8, 0x50 << 8, 0x50 << 8, 0 }, }; class PixmanImageManager -- 2.7.4