diff --git a/BUILD.gn b/BUILD.gn index 733549aa0d041423b2d2602d6d82ebb12f102306..e7f33ac501bfe0b852b596d63cfa374ad4072d98 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -17,6 +17,7 @@ group("image_framework") { deps = [ "frameworks/innerkitsimpl/utils:image_utils", "interfaces/innerkits:image", + "interfaces/innerkits:image_native", ] } diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 4c1ceac593f2bc7f7bc93d7e3356d05795d30647..72f3d28a70af59b594f2df1e6b104831d8ae70c6 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -30,8 +30,7 @@ ohos_unittest("imagepixelmaptest") { deps = [ # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -102,7 +101,7 @@ ohos_unittest("imagesourcetest") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -127,8 +126,7 @@ ohos_unittest("colorconvertertest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -153,8 +151,7 @@ ohos_unittest("transformtest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index 0e14b2bdfb3c074ca0f0ad21c553d72aaa263a38..1319a0e80725754d7153e5b443b9ebb937ee25c4 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -64,7 +64,8 @@ ohos_shared_library("image_utils") { "hiviewdfx_hilog_native:libhilog", ] } - relative_install_dir = "module/multimedia" + + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 5771cdf70d8f6f3e2043c9013a75c763f8be66e9..bf893f776a2cc0dc5d2b8fb8f7fe9493fbd1992a 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -65,6 +65,51 @@ ohos_copy("image_declaration") { ohos_shared_library("image") { public_configs = [ ":image_external_config" ] + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + relative_install_dir = "module/multimedia" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + +ohos_shared_library("image_native") { + public_configs = [ ":image_external_config" ] sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", @@ -148,7 +193,46 @@ ohos_shared_library("image") { "ipc:ipc_core", ] } - relative_install_dir = "module/multimedia" + + # relative_install_dir = "module/multimedia" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} +ohos_static_library("image_static_napi") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] subsystem_name = "multimedia" part_name = "multimedia_image_standard" } diff --git a/interfaces/kits/native/test/BUILD.gn b/interfaces/kits/native/test/BUILD.gn index 803592a7fcfd62e34661cc611b431578f747b48b..44d70663fb9ba9ba55b04f82009719715aa99b34 100644 --- a/interfaces/kits/native/test/BUILD.gn +++ b/interfaces/kits/native/test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("pixlmapndktest") { sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/test/unittest/pixel_map_ndk_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/interfaces/kits/native:multimedia_target", "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example:image_ndk_test_jni", "//third_party/googletest:gtest_main", diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index a28899daa4e176e37f0cf7857c78554f388228bd..593d55dbec497da7bbcf3601f7b3ce4533c712a3 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("jpegplugin") { include_dirs += [ "//utils/native/base/include" ] sources += [ "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", "//third_party/libjpeg:libjpeg_static", "//utils/native/base:utils",