diff --git a/frameworks/innerkitsimpl/stream/include/file_source_stream.h b/frameworks/innerkitsimpl/stream/include/file_source_stream.h index 40e69204446d090d2a3e68bd965d2827aebd5009..7241eddf781d9915a9a62a1c1697de11d0611b08 100644 --- a/frameworks/innerkitsimpl/stream/include/file_source_stream.h +++ b/frameworks/innerkitsimpl/stream/include/file_source_stream.h @@ -47,7 +47,6 @@ public: uint8_t *GetDataPtr() override; uint8_t *GetDataPtr(bool populate) override; uint32_t GetStreamType() override; - ImagePlugin::OutputDataStream* ToOutputDataStream() override; int GetMMapFd(); private: diff --git a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp index ffe748527bf8e26854d777a26cb473a581985272..5a85cfa7b35957f584e8752c9169066755940bd3 100644 --- a/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp +++ b/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp @@ -425,19 +425,6 @@ void FileSourceStream::ResetReadBuffer() fileData_ = nullptr; } -OutputDataStream* FileSourceStream::ToOutputDataStream() -{ - int dupFd = -1; - if (filePtr_ == nullptr) { - return nullptr; - } - if (DupFd(filePtr_, dupFd)) { - IMAGE_LOGE("[FileSourceStream] ToOutputDataStream fd failed"); - return nullptr; - } - return new (std::nothrow) FilePackerStream(dupFd); -} - int FileSourceStream::GetMMapFd() { mmapFdPassedOn_ = true; diff --git a/frameworks/innerkitsimpl/test/unittest/stream_test/file_source_stream_test.cpp b/frameworks/innerkitsimpl/test/unittest/stream_test/file_source_stream_test.cpp index 6707c8ede88906d29dc786bb3488530c9b531515..f2fe79b1968e8e18597901aad75a265e76c494b0 100644 --- a/frameworks/innerkitsimpl/test/unittest/stream_test/file_source_stream_test.cpp +++ b/frameworks/innerkitsimpl/test/unittest/stream_test/file_source_stream_test.cpp @@ -579,21 +579,5 @@ HWTEST_F(FileSourceStreamTest, FileSourceStreamTest0027, TestSize.Level3) fileSourceStream->fileData_ = nullptr; GTEST_LOG_(INFO) << "FileSourceStreamTest: FileSourceStreamTest0027 end"; } - -/** - * @tc.name: FileSourceStreamTest0028 - * @tc.desc: ToOutputDataStream - * @tc.type: FUNC - */ -HWTEST_F(FileSourceStreamTest, FileSourceStreamTest0028, TestSize.Level3) -{ - GTEST_LOG_(INFO) << "FileSourceStreamTest: FileSourceStreamTest0028 start"; - std::unique_ptr fileSourceStream = FileSourceStream::CreateSourceStream(IMAGE_INPUT_JPG_PATH); - ASSERT_NE(fileSourceStream, nullptr); - fileSourceStream->filePtr_ = fopen("/data/local/tmp/image/test.jpg", "w+"); - auto ret = fileSourceStream->ToOutputDataStream(); - ASSERT_EQ(ret, nullptr); - GTEST_LOG_(INFO) << "FileSourceStreamTest: FileSourceStreamTest0028 end"; -} } } diff --git a/frameworks/innerkitsimpl/utils/src/image_utils.cpp b/frameworks/innerkitsimpl/utils/src/image_utils.cpp index c5f89405a848273f0c64d62837a2f0d78acc4deb..f33ae97c7bdba12913088cab2bf9ce3aa497f21e 100644 --- a/frameworks/innerkitsimpl/utils/src/image_utils.cpp +++ b/frameworks/innerkitsimpl/utils/src/image_utils.cpp @@ -805,11 +805,15 @@ std::string ImageUtils::GetLocalTime() auto now = std::chrono::system_clock::now(); auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; std::time_t t = std::chrono::system_clock::to_time_t(now); - std::tm tm = *std::localtime(&t); + std::tm* tm = std::localtime(&t); + if (tm == nullptr) { + IMAGE_LOGE("ImageUtils::GetLocalTime error, returned nullptr"); + return ""; + } std::stringstream ss; int millSecondWidth = 3; - ss << std::put_time(&tm, "%Y-%m-%d %H_%M_%S.") << std::setfill('0') << std::setw(millSecondWidth) << ms.count(); + ss << std::put_time(tm, "%Y-%m-%d %H_%M_%S.") << std::setfill('0') << std::setw(millSecondWidth) << ms.count(); return ss.str(); } diff --git a/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp b/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp index 42ff4c42483bc2deb1de39190008e5dba926b8a8..ccea559684aeacdfddaa8378045000402579568f 100644 --- a/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp +++ b/plugins/common/libs/image/libextplugin/src/hardware/jpeg_hw_decoder.cpp @@ -267,7 +267,7 @@ bool JpegHardwareDecoder::HuffmanTblTransform(JHUFF_TBL* huffTbl, CodecJpegHuffT actualHuffValLen += huffTbl->bits[i]; } JPEG_HW_LOGD("actualHuffValLen=%{public}d", actualHuffValLen); - if (actualHuffValLen > MAX_LIST_HUFFVAL_LEN) { + if (actualHuffValLen >= MAX_LIST_HUFFVAL_LEN) { JPEG_HW_LOGE("invalid huffVal len: %{public}d", actualHuffValLen); return false; }