Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 4 insertions, 0 deletions

diff --git a/tests/OffscreenView.h b/tests/OffscreenView.h
index e3c8579..8b98b29 100644
--- a/tests/OffscreenView.h
+++ b/tests/OffscreenView.h
@@ -4,6 +4,7 @@
 #include "OffscreenContext.h"
 #include <Eigen/Core>
 #include <Eigen/Geometry>
+#include <string>
 #ifndef _MSC_VER
 #include <stdint.h>
 #endif
@@ -22,9 +23,12 @@ public:
 	void setupOrtho(bool offset=false);
 	void paintGL();
 	bool save(const char *filename);
+	std::string getInfo();
 
 	GLint shaderinfo[11];
 	OffscreenContext *ctx;
+	size_t width;
+	size_t height;
 private:
 	Renderer *renderer;
 	double w_h_ratio;