From 4a9a42fa955c00a5501a4564bd3f601cf9433e24 Mon Sep 17 00:00:00 2001 From: h00574155 Date: Mon, 10 Jul 2023 07:23:30 +0000 Subject: [PATCH] Decoupling the use of display_type.h in surface Signed-off-by: h00574155 Change-Id: I62a1af65a944dd951c5746fcf2bfed6e3c803566 --- graphic/graphicnapitest/NativeBufferTest.cpp | 2 +- graphic/graphicnapitest/NativeImageTest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphic/graphicnapitest/NativeBufferTest.cpp b/graphic/graphicnapitest/NativeBufferTest.cpp index 655257182..1ce03836d 100644 --- a/graphic/graphicnapitest/NativeBufferTest.cpp +++ b/graphic/graphicnapitest/NativeBufferTest.cpp @@ -30,7 +30,7 @@ public: static inline OH_NativeBuffer_Config config = { .width = 0x100, .height = 0x100, - .format = PIXEL_FMT_RGBA_8888, + .format = GRAPHIC_PIXEL_FMT_RGBA_8888, .usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA, }; static inline OH_NativeBuffer_Config checkConfig = {}; diff --git a/graphic/graphicnapitest/NativeImageTest.cpp b/graphic/graphicnapitest/NativeImageTest.cpp index 8ad81b2ff..17c2ff494 100644 --- a/graphic/graphicnapitest/NativeImageTest.cpp +++ b/graphic/graphicnapitest/NativeImageTest.cpp @@ -319,7 +319,7 @@ HWTEST_F(NativeImageTest, OHNativeImageUpdateSurfaceImage003, Function | MediumT std::cout << "NativeWindowHandleOpt SET_STRIDE failed" << std::endl; } code = SET_FORMAT; - int32_t format = PIXEL_FMT_RGBA_8888; + int32_t format = GRAPHIC_PIXEL_FMT_RGBA_8888; ret = NativeWindowHandleOpt(nativeWindow, code, format); if (ret != GSERROR_OK) { std::cout << "NativeWindowHandleOpt SET_FORMAT failed" << std::endl; -- GitLab