diff --git a/frameworks/innerkitsimpl/codec/src/image_source.cpp b/frameworks/innerkitsimpl/codec/src/image_source.cpp index dfa222c2af7c5f8a54f101d941587ee7b5a129e4..66307c1de96b23c94c7256a2ecba7f9f35c332e8 100644 --- a/frameworks/innerkitsimpl/codec/src/image_source.cpp +++ b/frameworks/innerkitsimpl/codec/src/image_source.cpp @@ -5219,7 +5219,6 @@ void ImageSource::DecodeJpegAuxiliaryPicture( } } } -#endif void ImageSource::DecodeBlobMetaData(std::unique_ptr &picture, const std::set &metadataTypes, ImageInfo &info, uint32_t &errorCode) @@ -5257,6 +5256,7 @@ void ImageSource::DecodeBlobMetaData(std::unique_ptr &picture, const st } } } +#endif bool ImageSource::CompressToAstcFromPixelmap(const DecodeOptions &opts, unique_ptr &rgbaPixelmap, unique_ptr &dstMemory) diff --git a/interfaces/innerkits/include/image_source.h b/interfaces/innerkits/include/image_source.h index d0dbc2eb8d2ad6b919b1286eaca7b1b6d8afb223..9052f7052b407788bdb30e02d3c1829de4517b3a 100644 --- a/interfaces/innerkits/include/image_source.h +++ b/interfaces/innerkits/include/image_source.h @@ -358,8 +358,6 @@ private: ImagePlugin::DecodeContext &context, ImagePlugin::PlImageInfo &plInfo); ImagePlugin::DecodeContext DecodeImageDataToContextExtended(uint32_t index, ImageInfo &info, ImagePlugin::PlImageInfo &plInfo, ImageEvent &imageEvent, uint32_t &errorCode); - void DecodeBlobMetaData(std::unique_ptr &picture, const std::set &metadataTypes, - ImageInfo &info, uint32_t &errorCode); void SetPixelMapColorSpace(ImagePlugin::DecodeContext& context, std::unique_ptr& pixelMap, std::unique_ptr& decoder); bool IsSingleHdrImage(ImageHdrType type); @@ -395,6 +393,8 @@ private: bool CheckJpegSourceStream(StreamInfo &streamInfo); uint32_t CreatePictureAtIndexPreCheck(uint32_t index, const ImageInfo &info); uint32_t SetGifMetadataForPicture(std::unique_ptr &picture, uint32_t index); + void DecodeBlobMetaData(std::unique_ptr &picture, const std::set &metadataTypes, + ImageInfo &info, uint32_t &errorCode); #endif const std::string NINE_PATCH = "ninepatch"; diff --git a/plugins/cross/image_native_android.gni b/plugins/cross/image_native_android.gni index e46843d340e5c1849c56996585a742797d07d244..b18bc13a9a316c8842c1468b2dfdef0e44304737 100644 --- a/plugins/cross/image_native_android.gni +++ b/plugins/cross/image_native_android.gni @@ -54,6 +54,7 @@ image_native_android_sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/file_metadata_stream.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/heif_exif_metadata_accessor.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/jpeg_exif_metadata_accessor.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/metadata.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/metadata_accessor_factory.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/png_exif_metadata_accessor.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/png_image_chunk_utils.cpp", diff --git a/plugins/cross/image_native_ios.gni b/plugins/cross/image_native_ios.gni index c5e73db85b4d2316f17aa905e4873e0300bade08..b062d182da35e4b9f6c845df8f788e44137b44aa 100644 --- a/plugins/cross/image_native_ios.gni +++ b/plugins/cross/image_native_ios.gni @@ -79,6 +79,7 @@ image_native_ios_sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/file_metadata_stream.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/heif_exif_metadata_accessor.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/jpeg_exif_metadata_accessor.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/metadata.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/metadata_accessor_factory.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/png_exif_metadata_accessor.cpp", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/accessor/src/png_image_chunk_utils.cpp", @@ -262,7 +263,6 @@ image_native_ios_deps = [ # heif "${image_subsystem}/plugins/common/libs/image/libextplugin:heifparser", - ] if (image_use_new_skia) {