diff options
Diffstat (limited to 'src/libnr/nr-pixblock-pixel.cpp')
| -rw-r--r-- | src/libnr/nr-pixblock-pixel.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/libnr/nr-pixblock-pixel.cpp b/src/libnr/nr-pixblock-pixel.cpp index c778c0c7f..109ed69dc 100644 --- a/src/libnr/nr-pixblock-pixel.cpp +++ b/src/libnr/nr-pixblock-pixel.cpp @@ -47,14 +47,14 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[2] = s[2]; break; case NR_PIXBLOCK_MODE_R8G8B8A8N: - d[0] = NR_COMPOSEN11 (s[0], s[3], 255); - d[1] = NR_COMPOSEN11 (s[1], s[3], 255); - d[2] = NR_COMPOSEN11 (s[2], s[3], 255); + d[0] = NR_COMPOSEN11_1111 (s[0], s[3], 255); + d[1] = NR_COMPOSEN11_1111 (s[1], s[3], 255); + d[2] = NR_COMPOSEN11_1111 (s[2], s[3], 255); break; case NR_PIXBLOCK_MODE_R8G8B8A8P: - d[0] = NR_COMPOSEP11 (s[0], s[3], 255); - d[1] = NR_COMPOSEP11 (s[1], s[3], 255); - d[2] = NR_COMPOSEP11 (s[2], s[3], 255); + d[0] = NR_COMPOSEP11_1111 (s[0], s[3], 255); + d[1] = NR_COMPOSEP11_1111 (s[1], s[3], 255); + d[2] = NR_COMPOSEP11_1111 (s[2], s[3], 255); break; default: break; @@ -82,9 +82,9 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[1] = 255; d[2] = 255; } else { - d[0] = (s[0] * 255) / s[3]; - d[1] = (s[1] * 255) / s[3]; - d[2] = (s[2] * 255) / s[3]; + d[0] = NR_DEMUL_111(s[0], s[3]); + d[1] = NR_DEMUL_111(s[0], s[3]); + d[2] = NR_DEMUL_111(s[0], s[3]); } d[3] = s[3]; break; @@ -103,9 +103,9 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[3] = 255; break; case NR_PIXBLOCK_MODE_R8G8B8A8N: - d[0] = NR_PREMUL (s[0], s[3]); - d[1] = NR_PREMUL (s[1], s[3]); - d[2] = NR_PREMUL (s[2], s[3]); + d[0] = NR_PREMUL_111 (s[0], s[3]); + d[1] = NR_PREMUL_111 (s[1], s[3]); + d[2] = NR_PREMUL_111 (s[2], s[3]); d[3] = s[3]; break; case NR_PIXBLOCK_MODE_R8G8B8A8P: @@ -132,10 +132,10 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[0] = 255; break; case NR_PIXBLOCK_MODE_R8G8B8A8N: - d[0] = NR_A7_NORMALIZED(s[3],d[0]); + d[0] = NR_COMPOSEA_111(s[3], d[0]); break; case NR_PIXBLOCK_MODE_R8G8B8A8P: - d[0] = NR_A7_NORMALIZED(s[3],d[0]); + d[0] = NR_COMPOSEA_111(s[3], d[0]); break; default: break; @@ -151,14 +151,14 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[2] = s[2]; break; case NR_PIXBLOCK_MODE_R8G8B8A8N: - d[0] = NR_COMPOSEN11 (s[0], s[3], d[0]); - d[1] = NR_COMPOSEN11 (s[1], s[3], d[1]); - d[2] = NR_COMPOSEN11 (s[2], s[3], d[2]); + d[0] = NR_COMPOSEN11_1111 (s[0], s[3], d[0]); + d[1] = NR_COMPOSEN11_1111 (s[1], s[3], d[1]); + d[2] = NR_COMPOSEN11_1111 (s[2], s[3], d[2]); break; case NR_PIXBLOCK_MODE_R8G8B8A8P: - d[0] = NR_COMPOSEP11 (s[0], s[3], d[0]); - d[1] = NR_COMPOSEP11 (s[1], s[3], d[1]); - d[2] = NR_COMPOSEP11 (s[2], s[3], d[2]); + d[0] = NR_COMPOSEP11_1111 (s[0], s[3], d[0]); + d[1] = NR_COMPOSEP11_1111 (s[1], s[3], d[1]); + d[2] = NR_COMPOSEP11_1111 (s[2], s[3], d[2]); break; default: break; @@ -176,21 +176,21 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP case NR_PIXBLOCK_MODE_R8G8B8A8N: if (s[3] != 0) { unsigned int ca; - ca = NR_A7 (s[3], d[3]); - d[0] = NR_COMPOSENNN_A7 (s[0], s[3], d[0], d[3], ca); - d[1] = NR_COMPOSENNN_A7 (s[1], s[3], d[1], d[3], ca); - d[2] = NR_COMPOSENNN_A7 (s[2], s[3], d[2], d[3], ca); - d[3] = (ca + 127) / 255; + ca = NR_COMPOSEA_112(s[3], d[3]); + d[0] = NR_COMPOSENNN_111121 (s[0], s[3], d[0], d[3], ca); + d[1] = NR_COMPOSENNN_111121 (s[1], s[3], d[1], d[3], ca); + d[2] = NR_COMPOSENNN_111121 (s[2], s[3], d[2], d[3], ca); + d[3] = NR_NORMALIZE_21(ca); } break; case NR_PIXBLOCK_MODE_R8G8B8A8P: if (s[3] != 0) { unsigned int ca; - ca = NR_A7 (s[3], d[3]); - d[0] = NR_COMPOSEPNN_A7 (s[0], s[3], d[0], d[3], ca); - d[1] = NR_COMPOSEPNN_A7 (s[1], s[3], d[0], d[3], ca); - d[2] = NR_COMPOSEPNN_A7 (s[2], s[3], d[0], d[3], ca); - d[3] = (ca + 127) / 255; + ca = NR_COMPOSEA_112(s[3], d[3]); + d[0] = NR_COMPOSEPNN_111121 (s[0], s[3], d[0], d[3], ca); + d[1] = NR_COMPOSEPNN_111121 (s[1], s[3], d[0], d[3], ca); + d[2] = NR_COMPOSEPNN_111121 (s[2], s[3], d[0], d[3], ca); + d[3] = NR_NORMALIZE_21(ca); } break; default: @@ -207,16 +207,16 @@ nr_compose_pixblock_pixblock_pixel (NRPixBlock *dpb, unsigned char *d, const NRP d[2] = s[2]; break; case NR_PIXBLOCK_MODE_R8G8B8A8N: - d[0] = NR_COMPOSENPP (s[0], s[3], d[0], d[3]); - d[1] = NR_COMPOSENPP (s[1], s[3], d[1], d[3]); - d[2] = NR_COMPOSENPP (s[2], s[3], d[2], d[3]); - d[3] = NR_A7_NORMALIZED(s[3],d[3]); + d[0] = NR_COMPOSENPP_1111 (s[0], s[3], d[0]); + d[1] = NR_COMPOSENPP_1111 (s[1], s[3], d[1]); + d[2] = NR_COMPOSENPP_1111 (s[2], s[3], d[2]); + d[3] = NR_COMPOSEA_111(s[3], d[3]); break; case NR_PIXBLOCK_MODE_R8G8B8A8P: - d[0] = NR_COMPOSEPPP (s[0], s[3], d[0], d[3]); - d[1] = NR_COMPOSEPPP (s[1], s[3], d[1], d[3]); - d[2] = NR_COMPOSEPPP (s[2], s[3], d[2], d[3]); - d[3] = NR_A7_NORMALIZED(s[3],d[3]); + d[0] = NR_COMPOSEPPP_1111 (s[0], s[3], d[0]); + d[1] = NR_COMPOSEPPP_1111 (s[1], s[3], d[1]); + d[2] = NR_COMPOSEPPP_1111 (s[2], s[3], d[2]); + d[3] = NR_COMPOSEA_111(s[3], d[3]); break; default: break; |