@@ -475,7 +475,7 @@ def read_icc_profile(slide: _OpenSlide) -> bytes | None:
475
475
'openslide_get_property_names' , POINTER (c_char_p ), [_OpenSlide ], _check_name_list
476
476
)
477
477
478
- get_property_value : _Func [[_OpenSlide , str ], str ] = _func (
478
+ get_property_value : _Func [[_OpenSlide , str | bytes ], str ] = _func (
479
479
'openslide_get_property_value' , c_char_p , [_OpenSlide , _utf8_p ]
480
480
)
481
481
@@ -487,7 +487,7 @@ def read_icc_profile(slide: _OpenSlide) -> bytes | None:
487
487
)
488
488
489
489
_get_associated_image_dimensions : _Func [
490
- [_OpenSlide , str , _Pointer [c_int64 ], _Pointer [c_int64 ]], None
490
+ [_OpenSlide , str | bytes , _Pointer [c_int64 ], _Pointer [c_int64 ]], None
491
491
] = _func (
492
492
'openslide_get_associated_image_dimensions' ,
493
493
None ,
@@ -496,46 +496,54 @@ def read_icc_profile(slide: _OpenSlide) -> bytes | None:
496
496
497
497
498
498
@_wraps_funcs ([_get_associated_image_dimensions ])
499
- def get_associated_image_dimensions (slide : _OpenSlide , name : str ) -> tuple [int , int ]:
499
+ def get_associated_image_dimensions (
500
+ slide : _OpenSlide , name : str | bytes
501
+ ) -> tuple [int , int ]:
500
502
w , h = c_int64 (), c_int64 ()
501
503
_get_associated_image_dimensions (slide , name , byref (w ), byref (h ))
502
504
return w .value , h .value
503
505
504
506
505
- _read_associated_image : _Func [[_OpenSlide , str , _Pointer [c_uint32 ]], None ] = _func (
506
- 'openslide_read_associated_image' , None , [_OpenSlide , _utf8_p , POINTER (c_uint32 )]
507
+ _read_associated_image : _Func [[_OpenSlide , str | bytes , _Pointer [c_uint32 ]], None ] = (
508
+ _func (
509
+ 'openslide_read_associated_image' ,
510
+ None ,
511
+ [_OpenSlide , _utf8_p , POINTER (c_uint32 )],
512
+ )
507
513
)
508
514
509
515
510
516
@_wraps_funcs ([get_associated_image_dimensions , _read_associated_image ])
511
- def read_associated_image (slide : _OpenSlide , name : str ) -> Image .Image :
517
+ def read_associated_image (slide : _OpenSlide , name : str | bytes ) -> Image .Image :
512
518
w , h = get_associated_image_dimensions (slide , name )
513
519
buf = (w * h * c_uint32 )()
514
520
_read_associated_image (slide , name , buf )
515
521
return _load_image (buf , (w , h ))
516
522
517
523
518
- get_associated_image_icc_profile_size : _Func [[_OpenSlide , str ], int ] = _func (
524
+ get_associated_image_icc_profile_size : _Func [[_OpenSlide , str | bytes ], int ] = _func (
519
525
'openslide_get_associated_image_icc_profile_size' ,
520
526
c_int64 ,
521
527
[_OpenSlide , _utf8_p ],
522
528
minimum_version = '4.0.0' ,
523
529
)
524
530
525
- _read_associated_image_icc_profile : _Func [[ _OpenSlide , str , _Pointer [ c_char ]], None ] = (
526
- _func (
527
- 'openslide_read_associated_image_icc_profile' ,
528
- None ,
529
- [ _OpenSlide , _utf8_p , POINTER ( c_char )] ,
530
- minimum_version = '4.0.0' ,
531
- )
531
+ _read_associated_image_icc_profile : _Func [
532
+ [ _OpenSlide , str | bytes , _Pointer [ c_char ]], None
533
+ ] = _func (
534
+ 'openslide_read_associated_image_icc_profile' ,
535
+ None ,
536
+ [ _OpenSlide , _utf8_p , POINTER ( c_char )] ,
537
+ minimum_version = '4.0.0' ,
532
538
)
533
539
534
540
535
541
@_wraps_funcs (
536
542
[get_associated_image_icc_profile_size , _read_associated_image_icc_profile ]
537
543
)
538
- def read_associated_image_icc_profile (slide : _OpenSlide , name : str ) -> bytes | None :
544
+ def read_associated_image_icc_profile (
545
+ slide : _OpenSlide , name : str | bytes
546
+ ) -> bytes | None :
539
547
size = get_associated_image_icc_profile_size (slide , name )
540
548
if size == 0 :
541
549
return None
0 commit comments