Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef1854f authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Prevent conflict with deprecated pixel format constants"

parents eac988cd 0c6dde61

include/system/graphics-base.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ typedef enum { 
    HAL_PIXEL_FORMAT_RGB_888 = 3,

    HAL_PIXEL_FORMAT_RGB_565 = 4,

    HAL_PIXEL_FORMAT_BGRA_8888 = 5,

    HAL_PIXEL_FORMAT_RGBA_FP16 = 16, // 0x10

    HAL_PIXEL_FORMAT_RGBX_FP16 = 17, // 0x11

    HAL_PIXEL_FORMAT_RGBA_FP16 = 22, // 0x16

    HAL_PIXEL_FORMAT_RGBX_FP16 = 23, // 0x17

    HAL_PIXEL_FORMAT_YV12 = 842094169, // 0x32315659

    HAL_PIXEL_FORMAT_Y8 = 538982489, // 0x20203859

    HAL_PIXEL_FORMAT_Y16 = 540422489, // 0x20363159