summaryrefslogtreecommitdiffstats
path: root/src/libnr/nr-compose.cpp
diff options
context:
space:
mode:
authorRalf Stephan <ralf@ark.in-berlin.de>2006-02-13 19:14:47 +0000
committerrwst <rwst@users.sourceforge.net>2006-02-13 19:14:47 +0000
commitdce08c184686d4cef1f1961926cce339429f5aba (patch)
tree58a437a00423768c653d1a90ddb5cf65bfe71efd /src/libnr/nr-compose.cpp
parentclosed up denial-of-service attack vector (ironically located in an (diff)
downloadinkscape-dce08c184686d4cef1f1961926cce339429f5aba.tar.gz
inkscape-dce08c184686d4cef1f1961926cce339429f5aba.zip
bulk whitespace removal patch #1198588 by gigaclon
(bzr r134)
Diffstat (limited to 'src/libnr/nr-compose.cpp')
-rw-r--r--src/libnr/nr-compose.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libnr/nr-compose.cpp b/src/libnr/nr-compose.cpp
index 8eed6e84c..f0e9c5e4e 100644
--- a/src/libnr/nr-compose.cpp
+++ b/src/libnr/nr-compose.cpp
@@ -210,8 +210,8 @@ nr_R8G8B8A8_N_R8G8B8A8_N_R8G8B8A8_P (unsigned char *px, int w, int h, int rs, co
} else {
// calculate premultiplied from two premultiplieds:
d[0] = NR_COMPOSEPPP(NR_PREMUL (s[0], alpha), a, NR_PREMUL (d[0], d[3]), 0); // last parameter not used
- d[1] = NR_COMPOSEPPP(NR_PREMUL (s[1], alpha), a, NR_PREMUL (d[1], d[3]), 0);
- d[2] = NR_COMPOSEPPP(NR_PREMUL (s[2], alpha), a, NR_PREMUL (d[2], d[3]), 0);
+ d[1] = NR_COMPOSEPPP(NR_PREMUL (s[1], alpha), a, NR_PREMUL (d[1], d[3]), 0);
+ d[2] = NR_COMPOSEPPP(NR_PREMUL (s[2], alpha), a, NR_PREMUL (d[2], d[3]), 0);
// total opacity:
d[3] = (65025 - (255 - a) * (255 - d[3]) + 127) / 255;
// un-premultiply channels:
@@ -498,8 +498,8 @@ nr_R8G8B8A8_N_R8G8B8A8_N_R8G8B8A8_P_A8 (unsigned char *px, int w, int h, int rs,
} else {
// calculate premultiplied from two premultiplieds:
d[0] = NR_COMPOSEPPP(NR_PREMUL (s[0], m[0]), a, NR_PREMUL (d[0], d[3]), 0); // last parameter not used
- d[1] = NR_COMPOSEPPP(NR_PREMUL (s[1], m[0]), a, NR_PREMUL (d[1], d[3]), 0);
- d[2] = NR_COMPOSEPPP(NR_PREMUL (s[2], m[0]), a, NR_PREMUL (d[2], d[3]), 0);
+ d[1] = NR_COMPOSEPPP(NR_PREMUL (s[1], m[0]), a, NR_PREMUL (d[1], d[3]), 0);
+ d[2] = NR_COMPOSEPPP(NR_PREMUL (s[2], m[0]), a, NR_PREMUL (d[2], d[3]), 0);
// total opacity:
d[3] = (65025 - (255 - a) * (255 - d[3]) + 127) / 255;
// un-premultiply channels: