Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 11 insertions, 0 deletions

diff --git a/src/imageutils.h b/src/imageutils.h
new file mode 100644
index 0000000..c9bb8de
--- /dev/null
+++ b/src/imageutils.h
@@ -0,0 +1,11 @@
+#ifndef IMAGEUTILS_H_
+#define IMAGEUTILS_H_
+
+#include <stdlib.h>
+#include <iostream>
+
+bool write_png(const char *filename, unsigned char *pixels, int width, int height);
+bool write_png(std::ostream &output, unsigned char *pixels, int width, int height);
+void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, size_t width, size_t height);
+
+#endif