From 5b40da3215f6d47c489615689f60400be8b03c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=85=89=E8=80=80?= Date: Mon, 18 Aug 2025 15:42:11 +0800 Subject: [PATCH] fix_qiangji_20250818 update001 Signed-off-by heguangyao MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 何光耀 --- frameworks/innerkitsimpl/codec/src/image_source.cpp | 2 +- .../innerkitsimpl/converter/src/basic_transformer.cpp | 2 +- .../converter/src/image_format_convert_utils.cpp | 3 ++- frameworks/innerkitsimpl/picture/picture.cpp | 4 ++-- frameworks/innerkitsimpl/receiver/src/image_receiver.cpp | 4 ++-- .../innerkitsimpl/stream/src/file_source_stream.cpp | 8 ++++---- .../libextplugin/src/hardware/imagecodec/codec_state.cpp | 8 ++++---- .../common/libs/image/libjpegplugin/src/jpeg_utils.cpp | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/frameworks/innerkitsimpl/codec/src/image_source.cpp b/frameworks/innerkitsimpl/codec/src/image_source.cpp index 83b744325..3d8295873 100644 --- a/frameworks/innerkitsimpl/codec/src/image_source.cpp +++ b/frameworks/innerkitsimpl/codec/src/image_source.cpp @@ -4476,7 +4476,7 @@ static bool CopyRGBAToSurfaceBuffer(const DecodeContext& context, sptrGetStride() < 0; CHECK_ERROR_RETURN_RET(cond, false); - uint64_t dstStride = sb->GetStride(); + uint64_t dstStride = static_cast(sb->GetStride()); uint64_t srcStride = static_cast(plInfo.size.width * NUM_4); uint32_t dstHeight = static_cast(plInfo.size.height); for (uint32_t i = 0; i < dstHeight; i++) { diff --git a/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp b/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp index e68e95c6b..07e3bd624 100644 --- a/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp +++ b/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp @@ -248,7 +248,7 @@ bool BasicTransformer::DrawPixelmap(const PixmapInfo &pixmapInfo, const int32_t if (CheckOutOfRange(srcPoint, pixmapInfo.imageInfo.size)) { continue; } - uint32_t shiftBytes = (y * size.width + x) * pixelBytes; + uint32_t shiftBytes = static_cast((y * size.width + x) * pixelBytes); BilinearProc(srcPoint, pixmapInfo, rb, shiftBytes, data); } } diff --git a/frameworks/innerkitsimpl/converter/src/image_format_convert_utils.cpp b/frameworks/innerkitsimpl/converter/src/image_format_convert_utils.cpp index ff8093501..d48dedcf3 100644 --- a/frameworks/innerkitsimpl/converter/src/image_format_convert_utils.cpp +++ b/frameworks/innerkitsimpl/converter/src/image_format_convert_utils.cpp @@ -510,7 +510,8 @@ static bool RGBA1010102ToP010SoftDecode(const RGBDataInfo &rgbInfo, SrcConvertPa !ImageUtils::GetAlignedNumber(copyRgbInfo.height, EVEN_ODD_DIVISOR)) { return false; } - int32_t copySrcLen = static_cast(copyRgbInfo.width * copyRgbInfo.height * STRIDES_PER_PLANE); + int32_t copySrcLen = static_cast(copyRgbInfo.width) * + static_cast(copyRgbInfo.height) * STRIDES_PER_PLANE; std::unique_ptr copySrcBuffer = std::make_unique(copySrcLen); CHECK_ERROR_RETURN_RET_LOG((copySrcBuffer == nullptr), -1, "[RGBAToP010]Convert: alloc memory failed!"); uint8_t* copySrcPixels = copySrcBuffer.get(); diff --git a/frameworks/innerkitsimpl/picture/picture.cpp b/frameworks/innerkitsimpl/picture/picture.cpp index 6a98e8750..2ccc09d17 100644 --- a/frameworks/innerkitsimpl/picture/picture.cpp +++ b/frameworks/innerkitsimpl/picture/picture.cpp @@ -195,8 +195,8 @@ static void SetYuvDataInfo(std::unique_ptr &pixelMap, sptrplaneCount <= NUM_1; CHECK_ERROR_RETURN_LOG(cond, "Get planesInfo failed, retVal:%{public}d", retVal); if (planes->planeCount >= NUM_2) { - info.yWidth = info.imageSize.width; - info.yHeight = info.imageSize.height; + info.yWidth = static_cast(info.imageSize.width); + info.yHeight = static_cast(info.imageSize.height); info.yStride = planes->planes[NUM_0].columnStride; info.uvStride = planes->planes[NUM_1].columnStride; info.yOffset = planes->planes[NUM_0].offset; diff --git a/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp b/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp index be967d127..169424447 100644 --- a/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp +++ b/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp @@ -83,8 +83,8 @@ int64_t PackImage(int &fd, std::unique_ptr pixelMap) std::unique_ptr ImageReceiver::getSurfacePixelMap(InitializationOptions initializationOpts) { uint32_t *addr = reinterpret_cast(iraContext_->currentBuffer_->GetVirAddr()); - int32_t size = iraContext_->currentBuffer_->GetSize(); - return PixelMap::Create(addr, (uint32_t)size, initializationOpts); + uint32_t size = iraContext_->currentBuffer_->GetSize(); + return PixelMap::Create(addr, size, initializationOpts); } static int32_t SaveSTP(uint32_t *buffer, diff --git a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp index ffe748527..0724dcae6 100644 --- a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp +++ b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp @@ -446,18 +446,18 @@ int FileSourceStream::GetMMapFd() bool FileSourceStream::ShouldUseMmap(int fd) { - int location = INVALID_POSITION; + int offset = INVALID_POSITION; bool useMmap = false; - int err = ioctl(fd, HMDFS_IOC_GET_LOCATION, &location); + int err = ioctl(fd, HMDFS_IOC_GET_LOCATION, &offset); if (err != IOCTL_SUCCESS) { IMAGE_LOGD("[FileSourceStream] ioctl failed, error: %{public}d, errno: %{public}d.", err, errno); return useMmap; } - if (location == LOCAL_FILE_POSITION) { + if (offset == LOCAL_FILE_POSITION) { useMmap = true; } - IMAGE_LOGD("[FileSourceStream] File position: %{public}d.", location); + IMAGE_LOGD("[FileSourceStream] File offset: %{public}d.", offset); return useMmap; } diff --git a/plugins/common/libs/image/libextplugin/src/hardware/imagecodec/codec_state.cpp b/plugins/common/libs/image/libextplugin/src/hardware/imagecodec/codec_state.cpp index a197c02f4..0c93bddd4 100644 --- a/plugins/common/libs/image/libextplugin/src/hardware/imagecodec/codec_state.cpp +++ b/plugins/common/libs/image/libextplugin/src/hardware/imagecodec/codec_state.cpp @@ -129,7 +129,7 @@ void ImageCodec::BaseState::OnGetFormat(const MsgInfo &info) void ImageCodec::BaseState::OnCheckIfStuck(const MsgInfo &info) { - int32_t generation; + int32_t generation = 0; (void)info.param->GetValue("generation", generation); if (generation == codec_->stateGeneration_) { SLOGE("stucked"); @@ -140,7 +140,7 @@ void ImageCodec::BaseState::OnCheckIfStuck(const MsgInfo &info) void ImageCodec::BaseState::OnForceShutDown(const MsgInfo &info) { - int32_t generation; + int32_t generation = 0; (void)info.param->GetValue("generation", generation); codec_->ForceShutdown(generation); } @@ -389,7 +389,7 @@ void ImageCodec::StartingState::OnMsgReceived(const MsgInfo &info) return; } case MsgWhat::CHECK_IF_STUCK: { - int32_t generation; + int32_t generation = 0; if (info.param->GetValue("generation", generation) && generation == codec_->stateGeneration_) { SLOGE("stucked, force state transition"); @@ -667,7 +667,7 @@ void ImageCodec::StoppingState::OnMsgReceived(const MsgInfo &info) { switch (info.type) { case MsgWhat::CHECK_IF_STUCK: { - int32_t generation; + int32_t generation = 0; (void)info.param->GetValue("generation", generation); if (generation == codec_->stateGeneration_) { SLOGE("stucked, force state transition"); diff --git a/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp b/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp index 6e8fba408..1dec624d4 100644 --- a/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp +++ b/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp @@ -128,8 +128,8 @@ void SkipInputData(j_decompress_ptr dinfo, long numBytes) src->next_input_byte = src->streamData.inputStreamBuffer; src->bytes_in_buffer = 0; } else { - src->next_input_byte += numBytes; - src->bytes_in_buffer -= numBytes; + src->next_input_byte += static_cast(numBytes); + src->bytes_in_buffer -= static_cast(numBytes); } } -- Gitee