disabled plugins loading (#206)

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
bigcat88 · Feb 3, 2024 · ac62312 · ac62312
1 parent 5859b29
commit ac62312
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,12 @@
 All notable changes to this project will be documented in this file.
 
-## [0.15.0 - 2024-02-02]
+## [0.15.0 - 2024-02-03]
 
 ### Added
 
 - `libheif_info` function: added `encoders` and `decoders` keys to the result, for future libheif plugins support. #189
 - `options.PREFERRED_ENCODER` - to use `encoder` different from the default one. #192
 - `options.PREFERRED_DECODER` - to use `decoder` different from the default one. #193
-- New `load_plugin` function. `ENABLE_PLUGIN_LOADING` option now is `ON` in the libheif configuration. #154
 
 ### Changed
 

diff --git a/libheif/linux_build_libs.py b/libheif/linux_build_libs.py
@@ -209,7 +209,7 @@ def build_lib_linux(url: str, name: str):
                     "-DWITH_JPEG_ENCODER=OFF "
                     "-DWITH_OpenJPEG_DECODER=OFF "
                     "-DWITH_OpenJPEG_ENCODER=OFF "
-                    "-DENABLE_PLUGIN_LOADING=ON "
+                    "-DENABLE_PLUGIN_LOADING=OFF "
                     "-DWITH_LIBSHARPYUV=OFF "
                     "-DWITH_EXAMPLES=OFF".split()
                 )

diff --git a/libheif/macos/libheif.rb b/libheif/macos/libheif.rb
@@ -42,7 +42,7 @@ def install
       -DWITH_JPEG_ENCODER=OFF
       -DWITH_OpenJPEG_DECODER=OFF
       -DWITH_OpenJPEG_ENCODER=OFF
-      -DENABLE_PLUGIN_LOADING=ON
+      -DENABLE_PLUGIN_LOADING=OFF
       -DWITH_LIBSHARPYUV=OFF
       -DCMAKE_INSTALL_RPATH=#{rpath}
     ]

diff --git a/libheif/windows/mingw-w64-libheif/PKGBUILD b/libheif/windows/mingw-w64-libheif/PKGBUILD
@@ -57,7 +57,7 @@ build() {
       -DWITH_JPEG_ENCODER=OFF \
       -DWITH_OpenJPEG_DECODER=OFF \
       -DWITH_OpenJPEG_ENCODER=OFF \
-      -DENABLE_PLUGIN_LOADING=ON \
+      -DENABLE_PLUGIN_LOADING=OFF \
       -DWITH_LIBSHARPYUV=OFF \
       -DWITH_EXAMPLES=OFF \
       -DX265_CFLAGS="-DX265_API_IMPORTS" \

diff --git a/pi-heif/libheif/macos/libheif.rb b/pi-heif/libheif/macos/libheif.rb
@@ -37,7 +37,7 @@ def install
       -DWITH_JPEG_ENCODER=OFF
       -DWITH_OpenJPEG_DECODER=OFF
       -DWITH_OpenJPEG_ENCODER=OFF
-      -DENABLE_PLUGIN_LOADING=ON
+      -DENABLE_PLUGIN_LOADING=OFF
       -DWITH_LIBSHARPYUV=OFF
       -DWITH_EXAMPLES=OFF
       -DCMAKE_INSTALL_RPATH=#{rpath}

diff --git a/pi-heif/libheif/windows/mingw-w64-libheif/PKGBUILD b/pi-heif/libheif/windows/mingw-w64-libheif/PKGBUILD
@@ -54,7 +54,7 @@ build() {
       -DWITH_JPEG_ENCODER=OFF \
       -DWITH_OpenJPEG_DECODER=OFF \
       -DWITH_OpenJPEG_ENCODER=OFF \
-      -DENABLE_PLUGIN_LOADING=ON \
+      -DENABLE_PLUGIN_LOADING=OFF \
       -DWITH_LIBSHARPYUV=OFF \
       -DWITH_EXAMPLES=OFF \
       ../${_realname}-${pkgver}

diff --git a/pillow_heif/__init__.py b/pillow_heif/__init__.py
@@ -26,4 +26,4 @@
     open_heif,
     read_heif,
 )
-from .misc import get_file_mimetype, load_plugin, set_orientation
+from .misc import get_file_mimetype, load_libheif_plugin, set_orientation
diff --git a/pillow_heif/misc.py b/pillow_heif/misc.py
@@ -448,6 +448,6 @@ def bit_depth(self) -> int:
         return MODE_INFO[self.mode][1]
 
 
-def load_plugin(plugin_path: Union[str, Path]) -> None:
+def load_libheif_plugin(plugin_path: Union[str, Path]) -> None:
     """Load specified LibHeif plugin."""
     _pillow_heif.load_plugin(plugin_path)
diff --git a/tests/basic_test.py b/tests/basic_test.py
@@ -130,6 +130,6 @@ def test_light_build():
 
 @pytest.mark.skipif(not os.getenv("TEST_PLUGIN_LOAD"), reason="Only when plugins present")
 def test_load_plugin():
-    pillow_heif.load_plugin(os.environ["TEST_PLUGIN_LOAD"])
+    pillow_heif.load_libheif_plugin(os.environ["TEST_PLUGIN_LOAD"])
     with pytest.raises(RuntimeError):
-        pillow_heif.load_plugin("invalid path")
+        pillow_heif.load_libheif_plugin("invalid path")