From 33d90d58b4e982371926bf90b559648fb12df1f8 Mon Sep 17 00:00:00 2001 From: wxc Date: Fri, 1 Aug 2025 12:16:18 +0800 Subject: [PATCH] add static in GetApiVersion function Signed-off-by: wxc --- frameworks/innerkitsimpl/utils/include/image_utils.h | 1 + frameworks/innerkitsimpl/utils/src/image_utils.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkitsimpl/utils/include/image_utils.h b/frameworks/innerkitsimpl/utils/include/image_utils.h index 45fce12f0..fd8261b66 100644 --- a/frameworks/innerkitsimpl/utils/include/image_utils.h +++ b/frameworks/innerkitsimpl/utils/include/image_utils.h @@ -162,6 +162,7 @@ private: static uint32_t SaveDataToFile(const std::string& fileName, const char* data, const size_t& totalSize); static std::string GetLocalTime(); static std::string GetPixelMapName(PixelMap* pixelMap); + static int32_t GetAPIVersionInner(); }; } // namespace Media } // namespace OHOS diff --git a/frameworks/innerkitsimpl/utils/src/image_utils.cpp b/frameworks/innerkitsimpl/utils/src/image_utils.cpp index f33ae97c7..676667396 100644 --- a/frameworks/innerkitsimpl/utils/src/image_utils.cpp +++ b/frameworks/innerkitsimpl/utils/src/image_utils.cpp @@ -1155,7 +1155,17 @@ std::string ImageUtils::GetEncodedHeifFormat() int32_t ImageUtils::GetAPIVersion() { -#if !defined(IOS_PLATFORM) && !defined(ANDROID_PLATFORM) + static int32_t apiVersion = GetAPIVersionInner(); + if (apiVersion <= 0) { + apiVersion = GetAPIVersionInner(); + } + return apiVersion; +} + +int32_t ImageUtils::GetAPIVersionInner() +{ +#if !defined(CROSS_PLATFORM) + // second commit uint32_t targetVersion = 0; auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { -- Gitee