diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-03-05 18:23:13 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-03-05 18:33:49 +0100 |
| commit | f52513b09580c1533e6c48a4162d3d5f61f3b081 (patch) | |
| tree | 141d0974a777f4ec5b51daed9879a2cb0d781505 /libgamma_internal_allocated_any_ramp.c | |
| parent | Split source files, merge public header files, eliminite use gpp, rewrite makefile (diff) | |
| download | libgamma-f52513b09580c1533e6c48a4162d3d5f61f3b081.tar.gz libgamma-f52513b09580c1533e6c48a4162d3d5f61f3b081.tar.bz2 libgamma-f52513b09580c1533e6c48a4162d3d5f61f3b081.tar.xz | |
misc
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | libgamma_internal_allocated_any_ramp.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libgamma_internal_allocated_any_ramp.c b/libgamma_internal_allocated_any_ramp.c index 7e6953d..28f6ba9 100644 --- a/libgamma_internal_allocated_any_ramp.c +++ b/libgamma_internal_allocated_any_ramp.c @@ -7,11 +7,6 @@ */ #define ANY bits64 -/** - * Concatenation of all ramps - */ -#define ALL red - /** * Allocate and initalise a gamma ramp with any depth @@ -25,11 +20,11 @@ * error identifier provided by this library */ int -libgamma_internal_allocated_any_ramp(gamma_ramps_any_t *restrict ramps_sys, gamma_ramps_any_t ramps, +libgamma_internal_allocated_any_ramp(gamma_ramps_any_t *restrict ramps_sys, const gamma_ramps_any_t *restrict ramps, signed depth, size_t *restrict elements) { /* Calculate the size of the allocation to do */ - size_t d, n = ramps.ANY.red_size + ramps.ANY.green_size + ramps.ANY.blue_size; + size_t d, n = ramps->ANY.red_size + ramps->ANY.green_size + ramps->ANY.blue_size; switch (depth) { case 8: d = sizeof(uint8_t); break; case 16: d = sizeof(uint16_t); break; @@ -42,7 +37,7 @@ libgamma_internal_allocated_any_ramp(gamma_ramps_any_t *restrict ramps_sys, gamm } /* Copy the gamma ramp sizes */ - ramps_sys->ANY = ramps.ANY; + ramps_sys->ANY = ramps->ANY; /* Allocate the new ramps */ #ifdef HAVE_LIBGAMMA_METHOD_LINUX_DRM /* Valgrind complains about us reading uninitialize memory if we just use malloc */ @@ -50,8 +45,8 @@ libgamma_internal_allocated_any_ramp(gamma_ramps_any_t *restrict ramps_sys, gamm #else ramps_sys->ANY.red = malloc(n * d); #endif - ramps_sys->ANY.green = (void *)&((char *)ramps_sys->ANY. red)[ramps.ANY. red_size * d / sizeof(char)]; - ramps_sys->ANY.blue = (void *)&((char *)ramps_sys->ANY.green)[ramps.ANY.green_size * d / sizeof(char)]; + ramps_sys->ANY.green = (void *)&((char *)ramps_sys->ANY. red)[ramps->ANY. red_size * d / sizeof(char)]; + ramps_sys->ANY.blue = (void *)&((char *)ramps_sys->ANY.green)[ramps->ANY.green_size * d / sizeof(char)]; /* Report the total gamma ramp size */ *elements = n; |