From f17a282220903d7bb494deae046d3e786ef6b1ca Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 26 Jan 2013 23:18:31 +0100
Subject: [PATCH] cleanups. and restore accidentally deleted old system-gl.h

---
 src/fbo.cc                 |  2 +-
 src/imageutils-lodepng.cc  |  6 ++++--
 src/mainwin.cc             |  9 ---------
 src/system-gl.h            | 18 +++++++++---------
 tests/cgalcachetest.cc     |  9 ---------
 tests/cgalpngtest.cc       |  9 ---------
 tests/cgalstlsanitytest.cc |  9 ---------
 tests/cgaltest.cc          |  9 ---------
 tests/csgtestcore.cc       |  9 ---------
 9 files changed, 14 insertions(+), 66 deletions(-)

diff --git a/src/fbo.cc b/src/fbo.cc
index e12c2958..186cb955 100644
--- a/src/fbo.cc
+++ b/src/fbo.cc
@@ -59,7 +59,7 @@ bool check_fbo_status()
 	else if (status == GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT)
 		cerr << "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\n";
 	else
-		cerr << "Unknown Code: glCheckFramebufferStatusEXT returned:" <<status <<"\n";
+		cerr << "Unknown Code: glCheckFramebufferStatusEXT returned:" << status <<"\n";
 	return result;
 }
 
diff --git a/src/imageutils-lodepng.cc b/src/imageutils-lodepng.cc
index fab1cd93..a0347028 100644
--- a/src/imageutils-lodepng.cc
+++ b/src/imageutils-lodepng.cc
@@ -8,17 +8,19 @@ bool write_png(std::ostream &output, unsigned char *pixels, int width, int heigh
   //encoder.settings.zlibsettings.windowSize = 2048;
   //LodePNG_Text_add(&encoder.infoPng.text, "Comment", "Created with LodePNG");
   size_t dataout_size = -1;
+	bool result = false;
   unsigned char *dataout = (unsigned char *)malloc(width*height*4);
 	if (!dataout) {
 		perror("Error allocating memory while writing png\n");
-		return false;
+		return result;
 	}
   LodePNG_encode(&dataout, &dataout_size, pixels, width, height, LCT_RGBA, 8);
 	try {
 		output.write( reinterpret_cast<const char*>(dataout), dataout_size );
+		result = true;
 	} catch (const std::ios_base::failure &e) {
     std::cerr << "Error writing to ostream:" << e.what() << "\n";
 	}
 	free( dataout );
-  return true;
+  return result;
 }
diff --git a/src/mainwin.cc b/src/mainwin.cc
index d596186b..cf79b5ac 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -576,15 +576,6 @@ void MainWindow::refreshDocument()
 	setCurrentOutput();
 }
 
-/*AbstractNode *MainWindow::find_root_tag(AbstractNode *n)
-{
-	BOOST_FOREACH (AbstractNode *v, n->children) {
-		if (v->modinst->isRoot()) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 /*!
 	Parse and evaluate the design => this->root_node
 
diff --git a/src/system-gl.h b/src/system-gl.h
index dd465f6f..d7de3c6d 100644
--- a/src/system-gl.h
+++ b/src/system-gl.h
@@ -1,16 +1,16 @@
 #ifndef SYSTEMGL_H_
 #define SYSTEMGL_H_
 
-#ifdef _WIN32
-// Prevent obtuse compile errors on Win32/mingw32. This is related
-// GLU Tessellation callback definitions, and how glew deals with them.
-#include <windows.h>
-#endif
-
 #include <GL/glew.h>
-#include <string>
 
-std::string glew_dump(bool dumpall=false);
-bool report_glerror(const char *task);
+#ifdef __APPLE__
+ #include <OpenGL/OpenGL.h>
+#else
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ #ifdef _WIN32
+  #include <windows.h> // For the CALLBACK macro
+ #endif
+#endif
 
 #endif
diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc
index 7f24fc57..3a0a855a 100644
--- a/tests/cgalcachetest.cc
+++ b/tests/cgalcachetest.cc
@@ -70,15 +70,6 @@ void cgalTree(Tree &tree)
 	evaluate.execute();
 }
 
-/*AbstractNode *find_root_tag(AbstractNode *n)
-{
-	foreach(AbstractNode *v, n->children) {
-		if (v->modinst->tag_root) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 po::variables_map parse_options(int argc, char *argv[])
 {
 	po::options_description desc("Allowed options");
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index dd5084c3..ac4ebdfa 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -70,15 +70,6 @@ void cgalTree(Tree &tree)
 	evaluate.execute();
 }
 
-/*AbstractNode *find_root_tag(AbstractNode *n)
-{
-	foreach(AbstractNode *v, n->children) {
-		if (v->modinst->tag_root) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 struct CsgInfo
 {
 	OffscreenView *glview;
diff --git a/tests/cgalstlsanitytest.cc b/tests/cgalstlsanitytest.cc
index ca44dc75..28154637 100644
--- a/tests/cgalstlsanitytest.cc
+++ b/tests/cgalstlsanitytest.cc
@@ -69,15 +69,6 @@ void cgalTree(Tree &tree)
 	evaluate.execute();
 }
 
-/*AbstractNode *find_root_tag(AbstractNode *n)
-{
-	foreach(AbstractNode *v, n->children) {
-		if (v->modinst->tag_root) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 int main(int argc, char **argv)
 {
 	int retval = 0;
diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index 5131f172..4a15050a 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -65,15 +65,6 @@ void cgalTree(Tree &tree)
 	evaluate.execute();
 }
 
-/*AbstractNode *find_root_tag(AbstractNode *n)
-{
-	foreach(AbstractNode *v, n->children) {
-		if (v->modinst->tag_root) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 int main(int argc, char **argv)
 {
 	if (argc != 2) {
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc
index 7a031f31..3b4a935e 100644
--- a/tests/csgtestcore.cc
+++ b/tests/csgtestcore.cc
@@ -65,15 +65,6 @@ CsgInfo::CsgInfo() {
         glview = NULL;
 }
 
-/*AbstractNode *find_root_tag(AbstractNode *n)
-{
-	foreach(AbstractNode *v, n->children) {
-		if (v->modinst->tag_root) return v;
-		if (AbstractNode *vroot = find_root_tag(v)) return vroot;
-	}
-	return NULL;
-}*/
-
 string info_dump(OffscreenView *glview)
 {
 	assert(glview);