aboutsummaryrefslogtreecommitdiffstats
path: root/en_masse-template.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2017-06-10 15:46:56 +0200
committerMattias Andrée <maandree@kth.se>2017-06-10 15:46:56 +0200
commit41e9d6e8b767a960107e464a6fcab7c445f7479a (patch)
tree08f37ebc4bc9a264e265e6b444e0d0c1f30667b5 /en_masse-template.c
parentm + add libcolour_convert_en_masse.3 (diff)
downloadlibcolour-41e9d6e8b767a960107e464a6fcab7c445f7479a.tar.gz
libcolour-41e9d6e8b767a960107e464a6fcab7c445f7479a.tar.bz2
libcolour-41e9d6e8b767a960107e464a6fcab7c445f7479a.tar.xz
Test and fix libcolour_convert_en_masse2.1
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'en_masse-template.c')
-rw-r--r--en_masse-template.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/en_masse-template.c b/en_masse-template.c
index 7869d23..8d1d779 100644
--- a/en_masse-template.c
+++ b/en_masse-template.c
@@ -69,6 +69,7 @@ libcolour_convert_en_masse(const libcolour_colour_t *from, const libcolour_colou
out1 = in1;
out2 = in2;
out3 = in3;
+ out_alpha = in_alpha;
} else if (alpha_mode == LIBCOLOUR_CONVERT_EN_MASSE_NO_ALPHA) {
out1 = va_arg(args, TYPE *);
out2 = out1 + 1;
@@ -92,7 +93,7 @@ libcolour_convert_en_masse(const libcolour_colour_t *from, const libcolour_colou
va_end(args);
switch (from->model) {
-#define X(C, T, N) case C: memcpy(&tfrom, from, sizeof(T));
+#define X(C, T, N) case C: memcpy(&tfrom, from, sizeof(T)); break;
LIST_MODELS(X)
#undef X
default:
@@ -101,7 +102,7 @@ libcolour_convert_en_masse(const libcolour_colour_t *from, const libcolour_colou
}
switch (to->model) {
-#define X(C, T, N) case C: memcpy(&tto, to, sizeof(T));
+#define X(C, T, N) case C: memcpy(&tto, to, sizeof(T)); break;
LIST_MODELS(X)
#undef X
default: