commit 67d3daabae6fd00b40280662d4377b84ea849fca
parent f757761b310a899dc8ece7ad7845ed0a22ff752b
Author: Mattias Andrée <maandree@kth.se>
Date: Thu, 26 Jan 2017 12:53:23 +0100
Forgot to commit two files
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat:
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -5,9 +5,11 @@ BIN =\
blind-arithm\
blind-colour-ciexyz\
blind-colour-srgb\
+ blind-compress\
blind-concat\
blind-crop\
blind-cut\
+ blind-decompress\
blind-dissolve\
blind-extend\
blind-flip\
diff --git a/src/util/emalloc.h b/src/util/emalloc.h
@@ -3,6 +3,7 @@
#define emalloc(...) enmalloc(1, __VA_ARGS__)
#define ecalloc(...) encalloc(1, __VA_ARGS__)
+#define erealloc(...) enrealloc(1, __VA_ARGS__)
static inline void *
enmalloc(int status, size_t n)
@@ -18,6 +19,15 @@ encalloc(int status, size_t n, size_t m)
{
void *ptr = calloc(n, m);
if (!ptr)
- enprintf(status, "malloc: out of memory\n");
+ enprintf(status, "calloc: out of memory\n");
+ return ptr;
+}
+
+static inline void *
+enrealloc(int status, void *ptr, size_t n)
+{
+ ptr = realloc(ptr, n);
+ if (!ptr)
+ enprintf(status, "realloc: out of memory\n");
return ptr;
}