Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 0 insertions, 16 deletions

diff --git a/tests/imageutils.cc b/tests/imageutils.cc
deleted file mode 100644
index e15ba2b..0000000
--- a/tests/imageutils.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "imageutils.h"
-#include <string.h>
-
-void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, size_t width, size_t height)
-{
-	size_t rowBytes = pixelsize * width;
-	for (size_t i = 0 ; i < height ; i++) {
-    memmove(dst + (height - i - 1) * rowBytes, src + i * rowBytes, rowBytes);
-  }
-}
-
-#ifdef __APPLE__
-#include "imageutils-macosx.cc"
-#else
-#include "imageutils-lodepng.cc"
-#endif