Merge branch 'kintel-offscreen-refactor' of github.com:openscad/opens…

…cad into kintel-offscreen-refactor
openscad · Mar 30, 2023 · 0d81c0a · 0d81c0a
2 parents 48e9616 + d004991
commit 0d81c0a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/src/glview/Renderer.cc b/src/glview/Renderer.cc
@@ -132,7 +132,7 @@ bool Renderer::getColor(Renderer::ColorMode colormode, Color4f& col) const
 
 std::string Renderer::loadShaderSource(const std::string& name) {
   std::string shaderPath = (PlatformUtils::resourcePath("shaders") / name).string();
-  std::stringstream buffer;
+  std::ostringstream buffer;
   std::ifstream f(shaderPath);
   if (f.is_open()) {
     buffer << f.rdbuf();

diff --git a/src/glview/offscreen-old/OffscreenContextEGL.cc b/src/glview/offscreen-old/OffscreenContextEGL.cc
@@ -58,7 +58,7 @@ class OffscreenContextEGL : public OffscreenContext {
 
 std::string get_gl_info(EGLDisplay display)
 {
-  std::stringstream result;
+  std::ostringstream result;
 
   const char *vendor = eglQueryString(display, EGL_VENDOR);
   const char *version = eglQueryString(display, EGL_VERSION);

diff --git a/src/glview/offscreen-old/OffscreenContextGLX.cc b/src/glview/offscreen-old/OffscreenContextGLX.cc
@@ -72,7 +72,7 @@ std::string OffscreenContextGLX::getInfo() const {
     return {"No GL Context initialized. No information to report\n"};
   }
 
-  std::stringstream result;
+  std::ostringstream result;
 
   int major, minor;
   glXQueryVersion(this->xdisplay, &major, &minor);

diff --git a/src/glview/offscreen-old/OffscreenContextNSOpenGL.mm b/src/glview/offscreen-old/OffscreenContextNSOpenGL.mm
@@ -21,8 +21,6 @@
 
   NSOpenGLContext *openGLContext;
   NSAutoreleasePool *pool;
-  int width;
-  int height;
 };
 
 std::string OffscreenContextNSOpenGL::getInfo() const {

diff --git a/src/glview/offscreen-old/OffscreenContextWGL.cc b/src/glview/offscreen-old/OffscreenContextWGL.cc
@@ -43,9 +43,10 @@ class OffscreenContextWGL : public OffscreenContext {
 };
 
 std::string OffscreenContextWGL::getInfo() const {
+  std::stringstream result;
   // should probably get some info from WGL context here?
   result << "GL context creator: WGL\n"
-	 << "PNG generator: lodepng\n";
+      	 << "PNG generator: lodepng\n";
 
   return result.str();
 }

diff --git a/src/platform/PlatformUtils-mac.mm b/src/platform/PlatformUtils-mac.mm
@@ -55,7 +55,7 @@
 
 const std::string PlatformUtils::user_agent()
 {
-  std::stringstream result;
+  std::ostringstream result;
 
   result << "OpenSCAD/" << openscad_detailedversionnumber
          << " (" << sysinfo(false) << ")";
@@ -65,7 +65,7 @@
 
 const std::string PlatformUtils::sysinfo(bool extended)
 {
-  std::stringstream result;
+  std::ostringstream result;
 
   NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
   struct utsname name;