aboutsummaryrefslogtreecommitdiffstats
path: root/en_masse-template.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2017-06-15 18:09:02 +0200
committerMattias Andrée <maandree@kth.se>2017-06-15 18:09:02 +0200
commitd9fd5eb7fbbcbf47c7398c591d7eda0ef2c5cce7 (patch)
treec438136fdfcc7810bd953485ee4e613e44d7c7f8 /en_masse-template.c
parentDoc YES (diff)
downloadlibcolour-d9fd5eb7fbbcbf47c7398c591d7eda0ef2c5cce7.tar.gz
libcolour-d9fd5eb7fbbcbf47c7398c591d7eda0ef2c5cce7.tar.bz2
libcolour-d9fd5eb7fbbcbf47c7398c591d7eda0ef2c5cce7.tar.xz
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'en_masse-template.c')
-rw-r--r--en_masse-template.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/en_masse-template.c b/en_masse-template.c
index e131188..8dc8bcc 100644
--- a/en_masse-template.c
+++ b/en_masse-template.c
@@ -637,7 +637,6 @@ int
libcolour_convert_en_masse(const libcolour_colour_t *from, const libcolour_colour_t *to,
libcolour_convert_en_masse_mode_t mode, size_t n, ...)
{
- libcolour_colour_t tfrom, tto;
libcolour_convert_en_masse_mode_t alpha_mode = mode & 3;
int on_cpu = mode & LIBCOLOUR_CONVERT_EN_MASSE_ON_CPU;
int no_override = mode & LIBCOLOUR_CONVERT_EN_MASSE_NO_OVERRIDE;
@@ -715,7 +714,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)); break;
+#define X(C, T, N) case C: break;
LIST_MODELS(X)
#undef X
default:
@@ -726,8 +725,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));\
- to_##N(ARGUMENTS(&tfrom, &tto.N));\
+ to_##N(ARGUMENTS(from, &to->N));\
break;
LIST_MODELS(X)
#undef X