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