Repository navigation
Commit a8b1ef4
fix(annotators): draw masks and halos on grayscale scenes (#2755)
`MaskAnnotator` and `HaloAnnotator` raised `ValueError` on grayscale
scenes, shaped `(H, W)` or `(H, W, 1)` or given as a Pillow "L" image,
because `_paint_masks_by_area` assigned a three-value BGR color to
single-channel pixels. Other annotators draw on the same scenes through
OpenCV, which writes the first (blue) channel of the color.
Paint grayscale canvases with that first channel, restore the singleton
channel axis that OpenCV drops in `addWeighted` and `blur`, and compute
the halo alpha from the single channel instead of `COLOR_BGR2GRAY`.
BGR scenes are unchanged.
---------
Co-authored-by: jirka <6035284+borda@users.noreply.github.com>
Co-authored-by: Codex <codex@openai.com>1 parent 9399814 commit a8b1ef4
3 files changed
Lines changed: 149 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
438 | 438 | | |
439 | 439 | | |
440 | 440 | | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
441 | 455 | | |
442 | 456 | | |
443 | 457 | | |
| |||
454 | 468 | | |
455 | 469 | | |
456 | 470 | | |
457 | | - | |
| 471 | + | |
| 472 | + | |
458 | 473 | | |
459 | 474 | | |
460 | 475 | | |
| |||
482 | 497 | | |
483 | 498 | | |
484 | 499 | | |
485 | | - | |
486 | | - | |
487 | | - | |
488 | | - | |
489 | | - | |
490 | | - | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
491 | 509 | | |
492 | 510 | | |
493 | 511 | | |
| |||
508 | 526 | | |
509 | 527 | | |
510 | 528 | | |
511 | | - | |
| 529 | + | |
512 | 530 | | |
513 | 531 | | |
514 | 532 | | |
| |||
517 | 535 | | |
518 | 536 | | |
519 | 537 | | |
520 | | - | |
| 538 | + | |
521 | 539 | | |
522 | 540 | | |
523 | 541 | | |
| |||
564 | 582 | | |
565 | 583 | | |
566 | 584 | | |
567 | | - | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
568 | 588 | | |
569 | 589 | | |
570 | 590 | | |
| |||
627 | 647 | | |
628 | 648 | | |
629 | 649 | | |
630 | | - | |
| 650 | + | |
| 651 | + | |
631 | 652 | | |
632 | 653 | | |
633 | 654 | | |
| |||
866 | 887 | | |
867 | 888 | | |
868 | 889 | | |
869 | | - | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
870 | 893 | | |
871 | 894 | | |
872 | 895 | | |
| |||
910 | 933 | | |
911 | 934 | | |
912 | 935 | | |
913 | | - | |
914 | | - | |
915 | | - | |
916 | | - | |
917 | | - | |
918 | | - | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
919 | 945 | | |
920 | 946 | | |
921 | 947 | | |
922 | 948 | | |
923 | 949 | | |
924 | | - | |
| 950 | + | |
925 | 951 | | |
926 | 952 | | |
927 | 953 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
770 | 770 | | |
771 | 771 | | |
772 | 772 | | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
| 797 | + | |
| 798 | + | |
| 799 | + | |
| 800 | + | |
| 801 | + | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
773 | 875 | | |
774 | 876 | | |
775 | 877 | | |
| |||
0 commit comments