Merge branch 'master' into visitortests

Conflicts:
	tests/opencsgtest.cc

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/imageutils.cc b/tests/imageutils.cc
new file mode 100644
index 0000000..7358674
--- /dev/null
+++ b/tests/imageutils.cc
@@ -0,0 +1,16 @@
+#include "imageutils.h"
+#include <strings.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++) {
+    bcopy(src + i * rowBytes, dst + (height - i - 1) * rowBytes, rowBytes);
+  }
+}
+
+#ifdef __APPLE__
+#include "imageutils-macosx.cc"
+#else
+#include "imageutils-lodepng.cc"
+#endif