From c96259b3d2b3dd134db145768100d56d274b2469 Mon Sep 17 00:00:00 2001 From: Lotol Date: Wed, 24 May 2023 08:39:44 +0000 Subject: [PATCH 1/7] update services/dbms/test/unittest/distributed_bms_host_test/mock_distributed_bms_interface.cpp. Signed-off-by: Lotol --- .../distributed_bms_host_test/mock_distributed_bms_interface.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/dbms/test/unittest/distributed_bms_host_test/mock_distributed_bms_interface.cpp b/services/dbms/test/unittest/distributed_bms_host_test/mock_distributed_bms_interface.cpp index 9842231..7a23188 100644 --- a/services/dbms/test/unittest/distributed_bms_host_test/mock_distributed_bms_interface.cpp +++ b/services/dbms/test/unittest/distributed_bms_host_test/mock_distributed_bms_interface.cpp @@ -78,6 +78,5 @@ int32_t MockDistributedBmsHost::GetDistributedBundleName(const std::string &netw { return 0; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file -- Gitee From fc83a70f3fc497a3325d5689c0799a7bf38640fd Mon Sep 17 00:00:00 2001 From: Lotol Date: Wed, 24 May 2023 08:41:30 +0000 Subject: [PATCH 2/7] update services/dbms/src/image_compress.cpp. Signed-off-by: Lotol --- services/dbms/src/image_compress.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/dbms/src/image_compress.cpp b/services/dbms/src/image_compress.cpp index aab452f..933214e 100644 --- a/services/dbms/src/image_compress.cpp +++ b/services/dbms/src/image_compress.cpp @@ -50,6 +50,8 @@ namespace { constexpr int32_t INDEX_ONE = 1; constexpr int32_t INDEX_TWO = 2; constexpr int32_t INDEX_THREE = 3; + constexpr int32_t EMPTY_FILE_SIZE = 0; + constexpr double FILE_SIZE_ERR = -1.0; } bool ImageCompress::IsPathValid(const std::string &srcPath) { @@ -67,6 +69,9 @@ bool ImageCompress::IsImageNeedCompressBySize(size_t fileSize) double ImageCompress::CalculateRatio(size_t fileSize, const std::string &imageType) { + if (fileSize == EMPTY_FILE_SIZE) { + return FILE_SIZE_ERR; + } if (imageType == WEBP_FORMAT) { return sqrt(static_cast(WEBP_COMPRESS_SIZE) / fileSize); } @@ -155,6 +160,10 @@ bool ImageCompress::CompressImageByContent(const std::unique_ptr &fil return false; } double ratio = CalculateRatio(fileSize, imageType); + if (ratio == FILE_SIZE_ERR) { + APP_LOGE("CalculateRatio failed: ratio is %{public}f", ratio); + return false; + } APP_LOGE("ratio is %{public}f", ratio); pixMap->scale(ratio, ratio); Media::ImagePacker imagePacker; -- Gitee From 49d023d8174528abd3959af48c188ca6f166d7bf Mon Sep 17 00:00:00 2001 From: Lotol Date: Wed, 24 May 2023 08:42:45 +0000 Subject: [PATCH 3/7] update services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp. Signed-off-by: Lotol --- .../dbms_services_kit_test/dbms_services_kit_test.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp index 84ff533..812ab79 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp +++ b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp @@ -94,15 +94,13 @@ void DbmsServicesKitTest::TearDownTestCase() void DbmsServicesKitTest::SetUp() { std::string strExtra = std::to_string(402); - auto extraArgv = strExtra.c_str(); - ServiceControlWithExtra("d-bms", START, &extraArgv, 1); + ServiceControlWithExtra("d-bms", START, &(strExtra.c_str()), 1); } void DbmsServicesKitTest::TearDown() { std::string strExtra = std::to_string(402); - auto extraArgv = strExtra.c_str(); - ServiceControlWithExtra("d-bms", STOP, &extraArgv, 1); + ServiceControlWithExtra("d-bms", STOP, &(strExtra.c_str()), 1); } std::shared_ptr DbmsServicesKitTest::GetDistributedBms() -- Gitee From dc21059d60489493caa4ad7f683eb1b249a52249 Mon Sep 17 00:00:00 2001 From: Lotol Date: Wed, 24 May 2023 11:17:45 +0000 Subject: [PATCH 4/7] update services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp. Signed-off-by: Lotol --- .../dbms_services_kit_test/dbms_services_kit_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp index 812ab79..d2d10c5 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp +++ b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp @@ -94,13 +94,15 @@ void DbmsServicesKitTest::TearDownTestCase() void DbmsServicesKitTest::SetUp() { std::string strExtra = std::to_string(402); - ServiceControlWithExtra("d-bms", START, &(strExtra.c_str()), 1); + const char *argv[] = {strExtra}; + ServiceControlWithExtra("d-bms", START, argv, 1); } void DbmsServicesKitTest::TearDown() { std::string strExtra = std::to_string(402); - ServiceControlWithExtra("d-bms", STOP, &(strExtra.c_str()), 1); + const char *argv[] = {strExtra}; + ServiceControlWithExtra("d-bms", STOP, argv, 1); } std::shared_ptr DbmsServicesKitTest::GetDistributedBms() -- Gitee From 3376869700370f09bed3a45317a1759f20327ed7 Mon Sep 17 00:00:00 2001 From: Lotol Date: Thu, 25 May 2023 02:06:39 +0000 Subject: [PATCH 5/7] update services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp. Signed-off-by: Lotol --- .../dbms_services_kit_test/dbms_services_kit_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp index d2d10c5..9ded476 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp +++ b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp @@ -94,14 +94,16 @@ void DbmsServicesKitTest::TearDownTestCase() void DbmsServicesKitTest::SetUp() { std::string strExtra = std::to_string(402); - const char *argv[] = {strExtra}; + const char *argv[strlen(strExtra.c_str()) + 1]; + strcpy(argv,strExtra.c_str()); ServiceControlWithExtra("d-bms", START, argv, 1); } void DbmsServicesKitTest::TearDown() { std::string strExtra = std::to_string(402); - const char *argv[] = {strExtra}; + const char *argv[strlen(strExtra.c_str()) + 1]; + strcpy(argv,strExtra.c_str()); ServiceControlWithExtra("d-bms", STOP, argv, 1); } -- Gitee From 9c5422d3781b4d5d88de26f3d8b0b4d9e8fb34fb Mon Sep 17 00:00:00 2001 From: Lotol Date: Thu, 25 May 2023 04:59:31 +0000 Subject: [PATCH 6/7] update services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp. Signed-off-by: Lotol --- .../dbms_services_kit_test/dbms_services_kit_test.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp index 9ded476..84ff533 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp +++ b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp @@ -94,17 +94,15 @@ void DbmsServicesKitTest::TearDownTestCase() void DbmsServicesKitTest::SetUp() { std::string strExtra = std::to_string(402); - const char *argv[strlen(strExtra.c_str()) + 1]; - strcpy(argv,strExtra.c_str()); - ServiceControlWithExtra("d-bms", START, argv, 1); + auto extraArgv = strExtra.c_str(); + ServiceControlWithExtra("d-bms", START, &extraArgv, 1); } void DbmsServicesKitTest::TearDown() { std::string strExtra = std::to_string(402); - const char *argv[strlen(strExtra.c_str()) + 1]; - strcpy(argv,strExtra.c_str()); - ServiceControlWithExtra("d-bms", STOP, argv, 1); + auto extraArgv = strExtra.c_str(); + ServiceControlWithExtra("d-bms", STOP, &extraArgv, 1); } std::shared_ptr DbmsServicesKitTest::GetDistributedBms() -- Gitee From 90673ea1e04c6921841b55a1a9f26d8c6fc3cc0c Mon Sep 17 00:00:00 2001 From: Lotol Date: Thu, 25 May 2023 06:41:36 +0000 Subject: [PATCH 7/7] update services/dbms/src/image_compress.cpp. Signed-off-by: Lotol --- services/dbms/src/image_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/dbms/src/image_compress.cpp b/services/dbms/src/image_compress.cpp index 933214e..894bc16 100644 --- a/services/dbms/src/image_compress.cpp +++ b/services/dbms/src/image_compress.cpp @@ -164,7 +164,7 @@ bool ImageCompress::CompressImageByContent(const std::unique_ptr &fil APP_LOGE("CalculateRatio failed: ratio is %{public}f", ratio); return false; } - APP_LOGE("ratio is %{public}f", ratio); + APP_LOGD("ratio is %{public}f", ratio); pixMap->scale(ratio, ratio); Media::ImagePacker imagePacker; Media::PackOption packOption; -- Gitee