@@ -321,17 +321,12 @@ def get_unpack_parameters() -> (
321321 ("RGB" , "RGB;16L" , 6 , [(2 , 4 , 6 ), (8 , 10 , 12 )]),
322322 ("RGB" , "RGB;16B" , 6 , [(1 , 3 , 5 ), (7 , 9 , 11 )]),
323323 ("RGB" , "BGR" , 3 , [(3 , 2 , 1 ), (6 , 5 , 4 ), (9 , 8 , 7 )]),
324- ("RGB" , "RGB;15" , 2 , [(8 , 131 , 0 ), (24 , 0 , 8 )]),
325324 ("RGB" , "XRGB;1555" , 2 , [(0 , 132 , 8 ), (8 , 0 , 24 )]),
326325 ("RGB" , "ARGB;1555" , 2 , [(0 , 132 , 8 ), (8 , 0 , 24 )]),
327- ("RGB" , "BGR;15" , 2 , [(0 , 131 , 8 ), (8 , 0 , 24 )]),
328326 ("RGB" , "XBGR;1555" , 2 , [(8 , 132 , 0 ), (24 , 0 , 8 )]),
329327 ("RGB" , "ABGR;1555" , 2 , [(8 , 132 , 0 ), (24 , 0 , 8 )]),
330- ("RGB" , "RGB;16" , 2 , [(8 , 64 , 0 ), (24 , 129 , 0 )]),
331328 ("RGB" , "RGB;565" , 2 , [(0 , 65 , 8 ), (0 , 130 , 24 )]),
332- ("RGB" , "BGR;16" , 2 , [(0 , 64 , 8 ), (0 , 129 , 24 )]),
333329 ("RGB" , "BGR;565" , 2 , [(8 , 65 , 0 ), (24 , 130 , 0 )]),
334- ("RGB" , "RGB;4B" , 2 , [(17 , 0 , 34 ), (51 , 0 , 68 )]),
335330 ("RGB" , "XBGR;4" , 2 , [(17 , 0 , 34 ), (51 , 0 , 68 )]),
336331 ("RGB" , "ABGR;4" , 2 , [(17 , 0 , 34 ), (51 , 0 , 68 )]),
337332 ("RGB" , "RGBX" , 4 , [(1 , 2 , 3 ), (5 , 6 , 7 ), (9 , 10 , 11 )]),
@@ -488,11 +483,8 @@ def get_unpack_parameters() -> (
488483 ],
489484 ),
490485 ("RGBA" , "RGBA;L" , 4 , [(1 , 4 , 7 , 10 ), (2 , 5 , 8 , 11 ), (3 , 6 , 9 , 12 )]),
491- ("RGBA" , "RGBA;15" , 2 , [(8 , 131 , 0 , 0 ), (24 , 0 , 8 , 0 )]),
492486 ("RGBA" , "ARGB;1555" , 2 , [(0 , 132 , 8 , 0 ), (8 , 0 , 24 , 0 )]),
493- ("RGBA" , "BGRA;15" , 2 , [(0 , 131 , 8 , 0 ), (8 , 0 , 24 , 0 )]),
494487 ("RGBA" , "ABGR;1555" , 2 , [(8 , 132 , 0 , 0 ), (24 , 0 , 8 , 0 )]),
495- ("RGBA" , "RGBA;4B" , 2 , [(17 , 0 , 34 , 0 ), (51 , 0 , 68 , 0 )]),
496488 ("RGBA" , "ABGR;4" , 2 , [(17 , 0 , 34 , 0 ), (51 , 0 , 68 , 0 )]),
497489 ("RGBA" , "RGBA;16L" , 8 , [(2 , 4 , 6 , 8 ), (10 , 12 , 14 , 16 )]),
498490 ("RGBA" , "RGBA;16B" , 8 , [(1 , 3 , 5 , 7 ), (9 , 11 , 13 , 15 )]),
@@ -555,13 +547,10 @@ def get_unpack_parameters() -> (
555547 ("RGBX" , "RGB;L" , 3 , [(1 , 4 , 7 , X ), (2 , 5 , 8 , X ), (3 , 6 , 9 , X )]),
556548 ("RGBX" , "RGB;16B" , 6 , [(1 , 3 , 5 , X ), (7 , 9 , 11 , X )]),
557549 ("RGBX" , "BGR" , 3 , [(3 , 2 , 1 , X ), (6 , 5 , 4 , X ), (9 , 8 , 7 , X )]),
558- ("RGBX" , "RGB;15" , 2 , [(8 , 131 , 0 , X ), (24 , 0 , 8 , X )]),
559550 ("RGBX" , "XRGB;1555" , 2 , [(0 , 132 , 8 , X ), (8 , 0 , 24 , X )]),
560551 ("RGBX" , "RGB;565" , 2 , [(0 , 65 , 8 , X ), (0 , 130 , 24 , X )]),
561- ("RGBX" , "BGR;15" , 2 , [(0 , 131 , 8 , X ), (8 , 0 , 24 , X )]),
562552 ("RGBX" , "XBGR;1555" , 2 , [(8 , 132 , 0 , X ), (24 , 0 , 8 , X )]),
563553 ("RGBX" , "BGR;565" , 2 , [(8 , 65 , 0 , X ), (24 , 130 , 0 , X )]),
564- ("RGBX" , "RGB;4B" , 2 , [(17 , 0 , 34 , X ), (51 , 0 , 68 , X )]),
565554 ("RGBX" , "XBGR;4" , 2 , [(17 , 0 , 34 , X ), (51 , 0 , 68 , X )]),
566555 ("RGBX" , "RGBX" , 4 , [(1 , 2 , 3 , 4 ), (5 , 6 , 7 , 8 ), (9 , 10 , 11 , 12 )]),
567556 ("RGBX" , "RGBXX" , 5 , [(1 , 2 , 3 , 4 ), (6 , 7 , 8 , 9 ), (11 , 12 , 13 , 14 )]),
@@ -831,6 +820,18 @@ def test_unpack(
831820 ("BGR;15" , "BGR;15" , 3 , [(8 , 131 , 0 ), (24 , 0 , 8 ), (41 , 131 , 8 )]),
832821 ("BGR;16" , "BGR;16" , 3 , [(8 , 64 , 0 ), (24 , 129 , 0 ), (41 , 194 , 0 )]),
833822 ("BGR;24" , "BGR;24" , 3 , [(1 , 2 , 3 ), (4 , 5 , 6 ), (7 , 8 , 9 )]),
823+ # Rawmode RGB/BGR/RGBA/BGRA 15/16/4B
824+ ("RGB" , "RGB;15" , 2 , [(8 , 131 , 0 ), (24 , 0 , 8 )]),
825+ ("RGB" , "BGR;15" , 2 , [(0 , 131 , 8 ), (8 , 0 , 24 )]),
826+ ("RGB" , "RGB;16" , 2 , [(8 , 64 , 0 ), (24 , 129 , 0 )]),
827+ ("RGB" , "BGR;16" , 2 , [(0 , 64 , 8 ), (0 , 129 , 24 )]),
828+ ("RGB" , "RGB;4B" , 2 , [(17 , 0 , 34 ), (51 , 0 , 68 )]),
829+ ("RGBA" , "RGBA;15" , 2 , [(8 , 131 , 0 , 0 ), (24 , 0 , 8 , 0 )]),
830+ ("RGBA" , "BGRA;15" , 2 , [(0 , 131 , 8 , 0 ), (8 , 0 , 24 , 0 )]),
831+ ("RGBA" , "RGBA;4B" , 2 , [(17 , 0 , 34 , 0 ), (51 , 0 , 68 , 0 )]),
832+ ("RGBX" , "RGB;15" , 2 , [(8 , 131 , 0 , X ), (24 , 0 , 8 , X )]),
833+ ("RGBX" , "BGR;15" , 2 , [(0 , 131 , 8 , X ), (8 , 0 , 24 , X )]),
834+ ("RGBX" , "RGB;4B" , 2 , [(17 , 0 , 34 , X ), (51 , 0 , 68 , X )]),
834835 ),
835836)
836837def test_unpack_deprecated (
0 commit comments