diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-30 08:57:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-30 08:57:49 +0100 |
| commit | 7abec64c676e6b1a8f7c005a9f4b2c710b69473d (patch) | |
| tree | 314464f3d84428416c892323d54b3221f3b8bc38 /chart2 | |
| parent | 3cea15792452ea779e79c572e7287e2fe8ed9740 (diff) | |
Fix various MSVC warnings in new chart2 OpenGL code
Change-Id: I5de9020f42004e21b58b9d2ef5d41b5338da43ba
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/inc/DummyXShape.hxx | 7 | ||||
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx index fc70cba23498..7d2c25e5f0b6 100644 --- a/chart2/source/view/inc/DummyXShape.hxx +++ b/chart2/source/view/inc/DummyXShape.hxx @@ -61,13 +61,6 @@ #include <map> #include <boost/scoped_ptr.hpp> -#if defined( _WIN32 ) -#include "prewin.h" -#include "windows.h" -#include "postwin.h" -#endif - - #include <GL/gl.h> #include <GL/glu.h> #include <vcl/window.hxx> diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index e80e210408a5..474a125070f0 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -497,7 +497,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int listLength) int OpenGLRender::RenderLine2FBO(int) { - m_fZStep += 0.001; + m_fZStep += 0.001f; CHECK_GL_ERROR(); glLineWidth(m_fLineWidth); size_t listNum = m_Line2DShapePointList.size(); @@ -1116,7 +1116,6 @@ bool OpenGLRender::WGLisExtensionSupported(const char *extension) if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' ')) return 1; // Match } - return 1; } #endif @@ -1277,7 +1276,7 @@ int OpenGLRender::RectangleShapePoint(float x, float y, float directionX, float int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) { - m_fZStep += 0.001; + m_fZStep += 0.001f; size_t listNum = m_RectangleShapePointList.size(); for (size_t i = 0; i < listNum; i++) { |