Skip to content

C
core
Kaydet (Commit) 7abec64c authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Fix various MSVC warnings in new chart2 OpenGL code 

Change-Id: I5de9020f42004e21b58b9d2ef5d41b5338da43ba
üst 3cea1579
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
chart2/source/view/inc/DummyXShape.hxx
Dosyayı görüntüle @ 7abec64c
...@@ -61,13 +61,6 @@ ...@@ -61,13 +61,6 @@
#include <map> #include <map>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#if defined( _WIN32 )
#include "prewin.h"
#include "windows.h"
#include "postwin.h"
#endif
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#include <vcl/window.hxx> #include <vcl/window.hxx>
......
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @ 7abec64c
...@@ -497,7 +497,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int listLength) ...@@ -497,7 +497,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int listLength)
int OpenGLRender::RenderLine2FBO(int) int OpenGLRender::RenderLine2FBO(int)
{ {
m_fZStep += 0.001; m_fZStep += 0.001f;
CHECK_GL_ERROR(); CHECK_GL_ERROR();
glLineWidth(m_fLineWidth); glLineWidth(m_fLineWidth);
size_t listNum = m_Line2DShapePointList.size(); size_t listNum = m_Line2DShapePointList.size();
...@@ -1116,7 +1116,6 @@ bool OpenGLRender::WGLisExtensionSupported(const char *extension) ...@@ -1116,7 +1116,6 @@ bool OpenGLRender::WGLisExtensionSupported(const char *extension)
if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' ')) if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' '))
return 1; // Match return 1; // Match
} }
return 1;
} }
#endif #endif
...@@ -1277,7 +1276,7 @@ int OpenGLRender::RectangleShapePoint(float x, float y, float directionX, float ...@@ -1277,7 +1276,7 @@ int OpenGLRender::RectangleShapePoint(float x, float y, float directionX, float
int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill)
{ {
m_fZStep += 0.001; m_fZStep += 0.001f;
size_t listNum = m_RectangleShapePointList.size(); size_t listNum = m_RectangleShapePointList.size();
for (size_t i = 0; i < listNum; i++) for (size_t i = 0; i < listNum; i++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment