From a32c0551290303be97e71bf367d87610eff59388 Mon Sep 17 00:00:00 2001 From: zhaona45 Date: Mon, 18 Aug 2025 10:35:24 +0800 Subject: [PATCH] Fix taihe codecheck Signed-off-by: zhaona45 Change-Id: Idf787b13a11d17e54bd12e02e37cbf26723e81bd --- frameworks/kits/taihe/include/image_taihe.h | 2 +- frameworks/kits/taihe/src/auxiliary_picture_taihe.cpp | 4 ++-- frameworks/kits/taihe/src/image_source_taihe.cpp | 4 ++-- frameworks/kits/taihe/src/image_taihe.cpp | 4 ++-- frameworks/kits/taihe/src/picture_taihe.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frameworks/kits/taihe/include/image_taihe.h b/frameworks/kits/taihe/include/image_taihe.h index 53ed3c004..c3eb4437b 100644 --- a/frameworks/kits/taihe/include/image_taihe.h +++ b/frameworks/kits/taihe/include/image_taihe.h @@ -52,7 +52,7 @@ public: private: static OHOS::Media::ImageHolderManager sNativeImageHolder_; std::shared_ptr nativeImage_; - bool isTestImage_; + bool isTestImage_ = false; }; } // namespace ANI::Image diff --git a/frameworks/kits/taihe/src/auxiliary_picture_taihe.cpp b/frameworks/kits/taihe/src/auxiliary_picture_taihe.cpp index bcb393f4b..9c2a92710 100644 --- a/frameworks/kits/taihe/src/auxiliary_picture_taihe.cpp +++ b/frameworks/kits/taihe/src/auxiliary_picture_taihe.cpp @@ -81,8 +81,8 @@ void AuxiliaryPictureImpl::WritePixelsFromBufferSync(array_view data) static bool ReadPixelsToBufferSyncExecute(std::unique_ptr &context) { OHOS::Media::AuxiliaryPictureInfo info = context->rAuxiliaryPicture->GetAuxiliaryPictureInfo(); - context->arrayBufferSize = - info.size.width * info.size.height * OHOS::Media::ImageUtils::GetPixelBytes(info.pixelFormat); + context->arrayBufferSize = static_cast(info.size.width * info.size.height * + OHOS::Media::ImageUtils::GetPixelBytes(info.pixelFormat)); context->arrayBuffer = new uint8_t[context->arrayBufferSize]; if (context->arrayBuffer != nullptr) { context->status = context->rAuxiliaryPicture->ReadPixels( diff --git a/frameworks/kits/taihe/src/image_source_taihe.cpp b/frameworks/kits/taihe/src/image_source_taihe.cpp index 9866a270f..ff41432d6 100644 --- a/frameworks/kits/taihe/src/image_source_taihe.cpp +++ b/frameworks/kits/taihe/src/image_source_taihe.cpp @@ -1169,8 +1169,8 @@ void ImageSourceImpl::UpdateDataSync(array_view buf, bool isFinished, i taiheContext->updataBufferSize = buf.size(); taiheContext->isCompleted = isFinished; - taiheContext->updataBufferOffset = offset; - taiheContext->updataLength = length; + taiheContext->updataBufferOffset = static_cast(offset); + taiheContext->updataLength = static_cast(length); UpdateDataExecute(taiheContext); if (!taiheContext->isSuccess) { diff --git a/frameworks/kits/taihe/src/image_taihe.cpp b/frameworks/kits/taihe/src/image_taihe.cpp index f9725ce8e..7a9e4fa3f 100644 --- a/frameworks/kits/taihe/src/image_taihe.cpp +++ b/frameworks/kits/taihe/src/image_taihe.cpp @@ -34,9 +34,10 @@ namespace { namespace ANI::Image { OHOS::Media::ImageHolderManager ImageImpl::sNativeImageHolder_; -ImageImpl::ImageImpl() : nativeImage_(nullptr) {} +ImageImpl::ImageImpl() : nativeImage_(nullptr), isTestImage_(false) {} ImageImpl::ImageImpl(std::shared_ptr nativeImage) + : nativeImage_(nullptr), isTestImage_(false) { if (nativeImage == nullptr) { IMAGE_LOGE("nativeImage is nullptr"); @@ -47,7 +48,6 @@ ImageImpl::ImageImpl(std::shared_ptr nativeImage) auto id = sNativeImageHolder_.save(nativeImage); nativeImage->SetId(id); nativeImage_ = sNativeImageHolder_.get(id); - isTestImage_ = false; if (nativeImage_ == nullptr) { if (MY_NAME.compare(id.c_str()) == 0) { isTestImage_ = true; diff --git a/frameworks/kits/taihe/src/picture_taihe.cpp b/frameworks/kits/taihe/src/picture_taihe.cpp index 9780775b6..79fc6e841 100644 --- a/frameworks/kits/taihe/src/picture_taihe.cpp +++ b/frameworks/kits/taihe/src/picture_taihe.cpp @@ -201,8 +201,8 @@ void PictureImpl::SetMetadataSync(MetadataType metadataType, weak::Metadata meta } OHOS::Media::MetadataType type; - uint32_t typeValue = metadataType.get_value(); - if (typeValue == static_cast(OHOS::Media::MetadataType::EXIF)) { + int32_t typeValue = metadataType.get_value(); + if (typeValue == static_cast(OHOS::Media::MetadataType::EXIF)) { type = OHOS::Media::MetadataType(typeValue); } else { ImageTaiheUtils::ThrowExceptionError(IMAGE_UNSUPPORTED_METADATA, "Unsupport MetadataType"); @@ -231,8 +231,8 @@ Metadata PictureImpl::GetMetadataSync(MetadataType metadataType) return make_holder(); } - uint32_t typeValue = metadataType.get_value(); - if (typeValue != static_cast(OHOS::Media::MetadataType::EXIF)) { + int32_t typeValue = metadataType.get_value(); + if (typeValue != static_cast(OHOS::Media::MetadataType::EXIF)) { ImageTaiheUtils::ThrowExceptionError(IMAGE_UNSUPPORTED_METADATA, "Unsupport MetadataType"); return make_holder(); } -- Gitee