Have nonpremul SRC_OVER keep transparent red/blue

This commit is contained in:
Nigel Tao committed 2021-11-21 21:16:10 +11:00
1 parent f5c68a13cb
commit 55cad41d6c
3 files changed
+75 -39

No files matched your search

+26 -8
View File
@@ -501,14 +501,23 @@ static inline uint32_t //
wuffs_base__composite_nonpremul_nonpremul_u32_axxx(uint32_t dst_nonpremul,
uint32_t src_nonpremul) {
// Extract 16-bit color components.
//
// If the destination is transparent then SRC_OVER is equivalent to SRC: just
// return src_nonpremul. This isn't just an optimization (skipping the rest
// of the function's computation). It also preserves the nonpremul
// distinction between e.g. transparent red and transparent blue that would
// otherwise be lost by converting from nonpremul to premul and back.
uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
if (da == 0) {
return src_nonpremul;
}
uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));
uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));
uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));
uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));
uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
// Convert dst from nonpremul to premul.
dr = (dr * da) / 0xFFFF;
@@ -545,14 +554,23 @@ static inline uint64_t //
wuffs_base__composite_nonpremul_nonpremul_u64_axxx(uint64_t dst_nonpremul,
uint64_t src_nonpremul) {
// Extract components.
//
// If the destination is transparent then SRC_OVER is equivalent to SRC: just
// return src_nonpremul. This isn't just an optimization (skipping the rest
// of the function's computation). It also preserves the nonpremul
// distinction between e.g. transparent red and transparent blue that would
// otherwise be lost by converting from nonpremul to premul and back.
uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
if (da == 0) {
return src_nonpremul;
}
uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
uint64_t sa = 0xFFFF & (src_nonpremul >> 48);
uint64_t sr = 0xFFFF & (src_nonpremul >> 32);
uint64_t sg = 0xFFFF & (src_nonpremul >> 16);
uint64_t sb = 0xFFFF & (src_nonpremul >> 0);
uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
// Convert dst from nonpremul to premul.
dr = (dr * da) / 0xFFFF;
+26 -8
View File
@@ -16164,14 +16164,23 @@ static inline uint32_t //
wuffs_base__composite_nonpremul_nonpremul_u32_axxx(uint32_t dst_nonpremul,
uint32_t src_nonpremul) {
// Extract 16-bit color components.
//
// If the destination is transparent then SRC_OVER is equivalent to SRC: just
// return src_nonpremul. This isn't just an optimization (skipping the rest
// of the function's computation). It also preserves the nonpremul
// distinction between e.g. transparent red and transparent blue that would
// otherwise be lost by converting from nonpremul to premul and back.
uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
if (da == 0) {
return src_nonpremul;
}
uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));
uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));
uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));
uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));
uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
// Convert dst from nonpremul to premul.
dr = (dr * da) / 0xFFFF;
@@ -16208,14 +16217,23 @@ static inline uint64_t //
wuffs_base__composite_nonpremul_nonpremul_u64_axxx(uint64_t dst_nonpremul,
uint64_t src_nonpremul) {
// Extract components.
//
// If the destination is transparent then SRC_OVER is equivalent to SRC: just
// return src_nonpremul. This isn't just an optimization (skipping the rest
// of the function's computation). It also preserves the nonpremul
// distinction between e.g. transparent red and transparent blue that would
// otherwise be lost by converting from nonpremul to premul and back.
uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
if (da == 0) {
return src_nonpremul;
}
uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
uint64_t sa = 0xFFFF & (src_nonpremul >> 48);
uint64_t sr = 0xFFFF & (src_nonpremul >> 32);
uint64_t sg = 0xFFFF & (src_nonpremul >> 16);
uint64_t sb = 0xFFFF & (src_nonpremul >> 0);
uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
// Convert dst from nonpremul to premul.
dr = (dr * da) / 0xFFFF;
+23 -23
View File
@@ -11,10 +11,10 @@ d1ae61d3 test/3pdata/pngsuite/basi2c08.png
ad12897b test/3pdata/pngsuite/basi3p02.png
81c22b59 test/3pdata/pngsuite/basi3p04.png
e59ecea5 test/3pdata/pngsuite/basi3p08.png
6be1b716 test/3pdata/pngsuite/basi4a08.png
05ac622b test/3pdata/pngsuite/basi4a16.png
3c337968 test/3pdata/pngsuite/basi6a08.png
04188ea5 test/3pdata/pngsuite/basi6a16.png
1b468494 test/3pdata/pngsuite/basi4a08.png
8a6dd244 test/3pdata/pngsuite/basi4a16.png
2b1044ce test/3pdata/pngsuite/basi6a08.png
b039babf test/3pdata/pngsuite/basi6a16.png
926d3aa2 test/3pdata/pngsuite/basn0g01.png
8f50bdc6 test/3pdata/pngsuite/basn0g02.png
6d612626 test/3pdata/pngsuite/basn0g04.png
@@ -26,18 +26,18 @@ d1ae61d3 test/3pdata/pngsuite/basn2c08.png
ad12897b test/3pdata/pngsuite/basn3p02.png
81c22b59 test/3pdata/pngsuite/basn3p04.png
e59ecea5 test/3pdata/pngsuite/basn3p08.png
6be1b716 test/3pdata/pngsuite/basn4a08.png
05ac622b test/3pdata/pngsuite/basn4a16.png
3c337968 test/3pdata/pngsuite/basn6a08.png
04188ea5 test/3pdata/pngsuite/basn6a16.png
6be1b716 test/3pdata/pngsuite/bgai4a08.png
05ac622b test/3pdata/pngsuite/bgai4a16.png
3c337968 test/3pdata/pngsuite/bgan6a08.png
04188ea5 test/3pdata/pngsuite/bgan6a16.png
6be1b716 test/3pdata/pngsuite/bgbn4a08.png
05ac622b test/3pdata/pngsuite/bggn4a16.png
3c337968 test/3pdata/pngsuite/bgwn6a08.png
04188ea5 test/3pdata/pngsuite/bgyn6a16.png
1b468494 test/3pdata/pngsuite/basn4a08.png
8a6dd244 test/3pdata/pngsuite/basn4a16.png
2b1044ce test/3pdata/pngsuite/basn6a08.png
b039babf test/3pdata/pngsuite/basn6a16.png
1b468494 test/3pdata/pngsuite/bgai4a08.png
8a6dd244 test/3pdata/pngsuite/bgai4a16.png
2b1044ce test/3pdata/pngsuite/bgan6a08.png
b039babf test/3pdata/pngsuite/bgan6a16.png
1b468494 test/3pdata/pngsuite/bgbn4a08.png
8a6dd244 test/3pdata/pngsuite/bggn4a16.png
2b1044ce test/3pdata/pngsuite/bgwn6a08.png
b039babf test/3pdata/pngsuite/bgyn6a16.png
b58985e2 test/3pdata/pngsuite/ccwn2c08.png
b7f7127d test/3pdata/pngsuite/ccwn3p08.png
c7b4c0fa test/3pdata/pngsuite/cdfn2c08.png
@@ -102,7 +102,7 @@ bb956205 test/3pdata/pngsuite/oi4n0g16.png
bb956205 test/3pdata/pngsuite/oi9n0g16.png
84bc9be8 test/3pdata/pngsuite/oi9n2c16.png
84bc9be8 test/3pdata/pngsuite/pp0n2c16.png
91dbb0d0 test/3pdata/pngsuite/pp0n6a08.png
8ed1f246 test/3pdata/pngsuite/pp0n6a08.png
024cf410 test/3pdata/pngsuite/ps1n0g08.png
84bc9be8 test/3pdata/pngsuite/ps1n2c16.png
024cf410 test/3pdata/pngsuite/ps2n0g08.png
@@ -145,18 +145,18 @@ a377dcdd test/3pdata/pngsuite/s33n3p04.png
8cc6b93d test/3pdata/pngsuite/s40n3p04.png
4e406947 test/3pdata/pngsuite/tbbn0g04.png
c6e83019 test/3pdata/pngsuite/tbbn2c16.png
ea7d20e2 test/3pdata/pngsuite/tbbn3p08.png
46deef3b test/3pdata/pngsuite/tbbn3p08.png
c6e83019 test/3pdata/pngsuite/tbgn2c16.png
ea7d20e2 test/3pdata/pngsuite/tbgn3p08.png
46deef3b test/3pdata/pngsuite/tbgn3p08.png
c6e83019 test/3pdata/pngsuite/tbrn2c08.png
2289ed1e test/3pdata/pngsuite/tbwn0g16.png
ea7d20e2 test/3pdata/pngsuite/tbwn3p08.png
ea7d20e2 test/3pdata/pngsuite/tbyn3p08.png
9b9384c7 test/3pdata/pngsuite/tm3n3p02.png
46deef3b test/3pdata/pngsuite/tbwn3p08.png
46deef3b test/3pdata/pngsuite/tbyn3p08.png
59b23555 test/3pdata/pngsuite/tm3n3p02.png
f2457b64 test/3pdata/pngsuite/tp0n0g08.png
05846c5f test/3pdata/pngsuite/tp0n2c08.png
3d7708a8 test/3pdata/pngsuite/tp0n3p08.png
ea7d20e2 test/3pdata/pngsuite/tp1n3p08.png
46deef3b test/3pdata/pngsuite/tp1n3p08.png
f286cbfc test/3pdata/pngsuite/xcsn0g01.png
9098c4d8 test/3pdata/pngsuite/z00n2c08.png
9098c4d8 test/3pdata/pngsuite/z03n2c08.png