From c3e680c1c8558b1a9f30f2ca938d11919a9d5de5 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Mon, 7 Aug 2023 01:33:32 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!9642=20?= =?UTF-8?q?:=20=E5=9B=9E=E9=80=80=20'Pull=20Request=20!9556=20:=20Add=20er?= =?UTF-8?q?ror=20message=20for=20Ndk=20&=20Js''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/test/ImageSource.test.ets | 4 +-- .../src/main/js/test/imageGif.test.js | 4 +-- .../cpp/napi/image_pixel_map_imgndk_test.cpp | 25 ++++++++----------- .../cpp/napi/image_pixel_map_imgndk_test.h | 5 +--- .../main/cpp/napi/image_receiver_mdk_test.cpp | 22 ++++++++-------- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/multimedia/image/image_js_standard/crossplatform/image/src/main/ets/test/ImageSource.test.ets b/multimedia/image/image_js_standard/crossplatform/image/src/main/ets/test/ImageSource.test.ets index 2c56a13ad..7cfc1d53f 100644 --- a/multimedia/image/image_js_standard/crossplatform/image/src/main/ets/test/ImageSource.test.ets +++ b/multimedia/image/image_js_standard/crossplatform/image/src/main/ets/test/ImageSource.test.ets @@ -239,7 +239,7 @@ export default function ImageSource() { } else { try { console.info(`${testNum} getDelayTimePromise create imagesource success`); - let delayTimes = await imageSourceApi.getDelayTime(); + let delayTimes = await imageSourceApi.getDelayTimeList(); if (delayTimes != undefined) { console.info(`${testNum} getDelayTimePromise getDelayTime success`); expect(true).assertTrue(); @@ -270,7 +270,7 @@ export default function ImageSource() { done(); } else { console.info(`${testNum} getDelayTimeCallBack create imagesource success`); - imageSourceApi.getDelayTime((err, delayTimes) => { + imageSourceApi.getDelayTimeList((err, delayTimes) => { if (err != undefined) { console.info(`${testNum} getDelayTimeCallBack getDelayTime failed err: ${err}`); expect(false).assertTrue(); diff --git a/multimedia/image/image_js_standard/imageGif/src/main/js/test/imageGif.test.js b/multimedia/image/image_js_standard/imageGif/src/main/js/test/imageGif.test.js index 12d9a3f96..c09ac6b53 100644 --- a/multimedia/image/image_js_standard/imageGif/src/main/js/test/imageGif.test.js +++ b/multimedia/image/image_js_standard/imageGif/src/main/js/test/imageGif.test.js @@ -115,7 +115,7 @@ export default function imageGif() { } else { try { console.info(`${testNum} getDelayTimePromise create imagesource success`); - let delayTimes = await imageSourceApi.getDelayTime(); + let delayTimes = await imageSourceApi.getDelayTimeList(); if (delayTimes != undefined) { console.info(`${testNum} getDelayTimePromise getDelayTime success`); expect(true).assertTrue(); @@ -147,7 +147,7 @@ export default function imageGif() { done(); } else { console.info(`${testNum} getDelayTimeCallBack create imagesource success`); - imageSourceApi.getDelayTime((err, delayTimes) => { + imageSourceApi.getDelayTimeList((err, delayTimes) => { if (err != undefined) { console.info(`${testNum} getDelayTimeCallBack getDelayTime failed err: ${err}`); expect(false).assertTrue(); diff --git a/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.cpp b/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.cpp index 3ecaf62d4..239ef693b 100644 --- a/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.cpp +++ b/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.cpp @@ -15,7 +15,6 @@ #include "image_pixel_map_imgndk_test.h" #include "node_api.h" -#include "image_pixel_map_napi.h" namespace { constexpr uint32_t NUM_0 = 0; @@ -26,8 +25,6 @@ namespace { constexpr uint32_t NUM_5 = 5; } -namespace OHOS { -namespace Media { #define STATIC_FUNCTION(n, f) { (n), nullptr, (f), nullptr, nullptr, nullptr, napi_static, nullptr } napi_value ImagePixelMapNDKTest::Init(napi_env env, napi_value exports) @@ -163,7 +160,7 @@ napi_value ImagePixelMapNDKTest::CreatePixelMap(napi_env env, napi_callback_info return udfVar; } int32_t res = OH_PixelMap_CreatePixelMap(env, createOps, buffer, bufferSize, &pixelmap); - if (res != OHOS_IMAGE_RESULT_SUCCESS || pixelmap == nullptr) { + if (res != IMAGE_RESULT_SUCCESS || pixelmap == nullptr) { return udfVar; } return pixelmap; @@ -185,7 +182,7 @@ napi_value ImagePixelMapNDKTest::CreateAlphaPixelMap(napi_env env, napi_callback return udfVar; } int32_t res = OH_PixelMap_CreateAlphaPixelMap(env, argValue[NUM_0], &alphaPixelmap); - if (res != OHOS_IMAGE_RESULT_SUCCESS || alphaPixelmap == nullptr) { + if (res != IMAGE_RESULT_SUCCESS || alphaPixelmap == nullptr) { return udfVar; } return alphaPixelmap; @@ -213,7 +210,7 @@ napi_value ImagePixelMapNDKTest::InitNativePixelMap(napi_env env, napi_callback_ return result; } - napi_create_int32(env, OHOS_IMAGE_RESULT_SUCCESS, &result); + napi_create_int32(env, IMAGE_RESULT_SUCCESS, &result); return result; } @@ -229,7 +226,7 @@ napi_value ImagePixelMapNDKTest::GetBytesNumberPerRow(napi_env env, napi_callbac int32_t rowBytes = NUM_0; int32_t res = OH_PixelMap_GetBytesNumberPerRow(native, &rowBytes); - if (res != OHOS_IMAGE_RESULT_SUCCESS || rowBytes == NUM_0) { + if (res != IMAGE_RESULT_SUCCESS || rowBytes == NUM_0) { return result; } @@ -249,7 +246,7 @@ napi_value ImagePixelMapNDKTest::GetIsEditable(napi_env env, napi_callback_info int32_t editable = NUM_0; int32_t res = OH_PixelMap_GetIsEditable(native, &editable); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } @@ -269,7 +266,7 @@ napi_value ImagePixelMapNDKTest::IsSupportAlpha(napi_env env, napi_callback_info int32_t supportAlpha = NUM_0; int32_t res = OH_PixelMap_IsSupportAlpha(native, &supportAlpha); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } @@ -316,7 +313,7 @@ napi_value ImagePixelMapNDKTest::GetDensity(napi_env env, napi_callback_info inf int32_t density = NUM_0; int32_t res = OH_PixelMap_GetDensity(native, &density); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } @@ -564,9 +561,9 @@ napi_value ImagePixelMapNDKTest::GetImageInfo(napi_env env, napi_callback_info i return result; } - OhosPixelMapInfo pixelmapInfo; + OhosPixelMapInfos pixelmapInfo; int32_t res = OH_PixelMap_GetImageInfo(native, &pixelmapInfo); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } napi_create_object(env, &result); @@ -589,7 +586,7 @@ napi_value ImagePixelMapNDKTest::AccessPixels(napi_env env, napi_callback_info i void* pixelAddr = nullptr; int32_t res = OH_PixelMap_AccessPixels(native, &pixelAddr); - if (res != OHOS_IMAGE_RESULT_SUCCESS || pixelAddr == nullptr) { + if (res != IMAGE_RESULT_SUCCESS || pixelAddr == nullptr) { return result; } napi_create_int32(env, res, &result); @@ -633,5 +630,3 @@ __attribute__((constructor)) void RegisterModule(void) napi_module_register(&demoModule); } EXTERN_C_END -} -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.h b/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.h index 4eb2c889f..88732dfb5 100644 --- a/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.h +++ b/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/napi/image_pixel_map_imgndk_test.h @@ -20,10 +20,9 @@ #include #include "napi/native_api.h" +#include "image_pixel_map_mdk.h" #include "image_pixel_map_napi.h" -namespace OHOS { -namespace Media { class ImagePixelMapNDKTest { public: static napi_value Init(napi_env env, napi_value exports); @@ -47,6 +46,4 @@ public: static napi_value UnAccessPixels(napi_env env, napi_callback_info info); private: }; -} // namespace Media -} // namespace OHOS #endif \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/napi/image_receiver_mdk_test.cpp b/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/napi/image_receiver_mdk_test.cpp index be24fc826..50611814c 100644 --- a/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/napi/image_receiver_mdk_test.cpp +++ b/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/napi/image_receiver_mdk_test.cpp @@ -88,7 +88,7 @@ napi_value ImageReceiverNDKTest::JsCreateImageReceiver(napi_env env, napi_callba return udfVar; } int32_t res = OH_Image_Receiver_CreateImageReceiver(env, receiverInfo, &receiver); - if (res != OHOS_IMAGE_RESULT_SUCCESS || receiver == nullptr) { + if (res != IMAGE_RESULT_SUCCESS || receiver == nullptr) { return udfVar; } return receiver; @@ -118,7 +118,7 @@ napi_value ImageReceiverNDKTest::JsGetReceivingSurfaceId(napi_env env, napi_call } char buf[ID_SIZE] = {0}; int32_t res = OH_Image_Receiver_GetReceivingSurfaceId(native, buf, ID_SIZE); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } HiviewDFX::HiLog::Debug(LABEL, "JsGetReceivingSurfaceId IN [%{public}x]", buf[0]); @@ -139,7 +139,7 @@ napi_value ImageReceiverNDKTest::JsReadLatestImage(napi_env env, napi_callback_i } int32_t res = OH_Image_Receiver_ReadLatestImage(native, &result); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { napi_get_undefined(env, &result); return result; } @@ -157,7 +157,7 @@ napi_value ImageReceiverNDKTest::JsReadNextImage(napi_env env, napi_callback_inf } int32_t res = OH_Image_Receiver_ReadNextImage(native, &result); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { napi_get_undefined(env, &result); return result; } @@ -228,7 +228,7 @@ napi_value ImageReceiverNDKTest::JsGetSize(napi_env env, napi_callback_info info } struct OhosImageSize size; int32_t res = OH_Image_Receiver_GetSize(native, &size); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } @@ -249,7 +249,7 @@ napi_value ImageReceiverNDKTest::JsGetCapacity(napi_env env, napi_callback_info } int32_t capacity; int32_t res = OH_Image_Receiver_GetCapacity(native, &capacity); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } napi_create_int32(env, capacity, &result); @@ -267,7 +267,7 @@ napi_value ImageReceiverNDKTest::JsGetFormat(napi_env env, napi_callback_info in } int32_t format; int32_t res = OH_Image_Receiver_GetFormat(native, &format); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } napi_create_int32(env, format, &result); @@ -321,7 +321,7 @@ napi_value ImageReceiverNDKTest::JsImageClipRect(napi_env env, napi_callback_inf } struct OhosImageRect rect; int32_t res = OH_Image_ClipRect(native, &rect); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } @@ -344,7 +344,7 @@ napi_value ImageReceiverNDKTest::JsImageSize(napi_env env, napi_callback_info in } struct OhosImageSize size; int32_t res = OH_Image_Size(native, &size); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } napi_create_object(env, &result); @@ -364,7 +364,7 @@ napi_value ImageReceiverNDKTest::JsImageFormat(napi_env env, napi_callback_info } int32_t format; int32_t res = OH_Image_Format(native, &format); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } napi_create_uint32(env, format, &result); @@ -393,7 +393,7 @@ napi_value ImageReceiverNDKTest::JsImageGetComponent(napi_env env, napi_callback struct OhosImageComponent component; int32_t res = OH_Image_GetComponent(native, componentType, &component); - if (res != OHOS_IMAGE_RESULT_SUCCESS) { + if (res != IMAGE_RESULT_SUCCESS) { return result; } -- GitLab