Skip to content

Commit ac62312

Browse files
authored
disabled plugins loading (#206)
Signed-off-by: Alexander Piskun <[email protected]>
1 parent 5859b29 commit ac62312

File tree

9 files changed

+10
-11
lines changed

9 files changed

+10
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
All notable changes to this project will be documented in this file.
22

3-
## [0.15.0 - 2024-02-02]
3+
## [0.15.0 - 2024-02-03]
44

55
### Added
66

77
- `libheif_info` function: added `encoders` and `decoders` keys to the result, for future libheif plugins support. #189
88
- `options.PREFERRED_ENCODER` - to use `encoder` different from the default one. #192
99
- `options.PREFERRED_DECODER` - to use `decoder` different from the default one. #193
10-
- New `load_plugin` function. `ENABLE_PLUGIN_LOADING` option now is `ON` in the libheif configuration. #154
1110

1211
### Changed
1312

libheif/linux_build_libs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def build_lib_linux(url: str, name: str):
209209
"-DWITH_JPEG_ENCODER=OFF "
210210
"-DWITH_OpenJPEG_DECODER=OFF "
211211
"-DWITH_OpenJPEG_ENCODER=OFF "
212-
"-DENABLE_PLUGIN_LOADING=ON "
212+
"-DENABLE_PLUGIN_LOADING=OFF "
213213
"-DWITH_LIBSHARPYUV=OFF "
214214
"-DWITH_EXAMPLES=OFF".split()
215215
)

libheif/macos/libheif.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def install
4242
-DWITH_JPEG_ENCODER=OFF
4343
-DWITH_OpenJPEG_DECODER=OFF
4444
-DWITH_OpenJPEG_ENCODER=OFF
45-
-DENABLE_PLUGIN_LOADING=ON
45+
-DENABLE_PLUGIN_LOADING=OFF
4646
-DWITH_LIBSHARPYUV=OFF
4747
-DCMAKE_INSTALL_RPATH=#{rpath}
4848
]

libheif/windows/mingw-w64-libheif/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ build() {
5757
-DWITH_JPEG_ENCODER=OFF \
5858
-DWITH_OpenJPEG_DECODER=OFF \
5959
-DWITH_OpenJPEG_ENCODER=OFF \
60-
-DENABLE_PLUGIN_LOADING=ON \
60+
-DENABLE_PLUGIN_LOADING=OFF \
6161
-DWITH_LIBSHARPYUV=OFF \
6262
-DWITH_EXAMPLES=OFF \
6363
-DX265_CFLAGS="-DX265_API_IMPORTS" \

pi-heif/libheif/macos/libheif.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def install
3737
-DWITH_JPEG_ENCODER=OFF
3838
-DWITH_OpenJPEG_DECODER=OFF
3939
-DWITH_OpenJPEG_ENCODER=OFF
40-
-DENABLE_PLUGIN_LOADING=ON
40+
-DENABLE_PLUGIN_LOADING=OFF
4141
-DWITH_LIBSHARPYUV=OFF
4242
-DWITH_EXAMPLES=OFF
4343
-DCMAKE_INSTALL_RPATH=#{rpath}

pi-heif/libheif/windows/mingw-w64-libheif/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ build() {
5454
-DWITH_JPEG_ENCODER=OFF \
5555
-DWITH_OpenJPEG_DECODER=OFF \
5656
-DWITH_OpenJPEG_ENCODER=OFF \
57-
-DENABLE_PLUGIN_LOADING=ON \
57+
-DENABLE_PLUGIN_LOADING=OFF \
5858
-DWITH_LIBSHARPYUV=OFF \
5959
-DWITH_EXAMPLES=OFF \
6060
../${_realname}-${pkgver}

pillow_heif/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
open_heif,
2727
read_heif,
2828
)
29-
from .misc import get_file_mimetype, load_plugin, set_orientation
29+
from .misc import get_file_mimetype, load_libheif_plugin, set_orientation

pillow_heif/misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,6 @@ def bit_depth(self) -> int:
448448
return MODE_INFO[self.mode][1]
449449

450450

451-
def load_plugin(plugin_path: Union[str, Path]) -> None:
451+
def load_libheif_plugin(plugin_path: Union[str, Path]) -> None:
452452
"""Load specified LibHeif plugin."""
453453
_pillow_heif.load_plugin(plugin_path)

tests/basic_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@ def test_light_build():
130130

131131
@pytest.mark.skipif(not os.getenv("TEST_PLUGIN_LOAD"), reason="Only when plugins present")
132132
def test_load_plugin():
133-
pillow_heif.load_plugin(os.environ["TEST_PLUGIN_LOAD"])
133+
pillow_heif.load_libheif_plugin(os.environ["TEST_PLUGIN_LOAD"])
134134
with pytest.raises(RuntimeError):
135-
pillow_heif.load_plugin("invalid path")
135+
pillow_heif.load_libheif_plugin("invalid path")

0 commit comments

Comments
 (0)