From daab7f9b6b4ce26b5f414bb515ec093d749124c6 Mon Sep 17 00:00:00 2001
From: huchao <huchao53@huawei.com>
Date: Thu, 4 Sep 2025 08:30:17 +0800
Subject: [PATCH] add !ios&&!and

Signed-off-by: huchao <huchao53@huawei.com>
---
 frameworks/innerkitsimpl/codec/src/image_source.cpp | 2 +-
 interfaces/innerkits/include/image_source.h         | 4 ++--
 plugins/cross/image_native_android.gni              | 1 +
 plugins/cross/image_native_ios.gni                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frameworks/innerkitsimpl/codec/src/image_source.cpp b/frameworks/innerkitsimpl/codec/src/image_source.cpp
index dfa222c2a..66307c1de 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> &picture, const std::set<MetadataType> &metadataTypes,
     ImageInfo &info, uint32_t &errorCode)
@@ -5257,6 +5256,7 @@ void ImageSource::DecodeBlobMetaData(std::unique_ptr<Picture> &picture, const st
         }
     }
 }
+#endif
 
 bool ImageSource::CompressToAstcFromPixelmap(const DecodeOptions &opts, unique_ptr<PixelMap> &rgbaPixelmap,
     unique_ptr<AbsMemory> &dstMemory)
diff --git a/interfaces/innerkits/include/image_source.h b/interfaces/innerkits/include/image_source.h
index d0dbc2eb8..9052f7052 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> &picture, const std::set<MetadataType> &metadataTypes,
-        ImageInfo &info, uint32_t &errorCode);
     void SetPixelMapColorSpace(ImagePlugin::DecodeContext& context, std::unique_ptr<PixelMap>& pixelMap,
         std::unique_ptr<ImagePlugin::AbsImageDecoder>& 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> &picture, uint32_t index);
+    void DecodeBlobMetaData(std::unique_ptr<Picture> &picture, const std::set<MetadataType> &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 e46843d34..b18bc13a9 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 c5e73db85..b062d182d 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) {
-- 
Gitee