Commit 44ab559d authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'cpp_check' into 'master'

gcc compiler warning



See merge request !176
parents 067d4413 41f6da5a
Pipeline #3330 passed with stage
in 70 minutes and 24 seconds
......@@ -1461,8 +1461,8 @@ void IRenderer::renderLineThicknessGL42()
Texture2D* lineColorImg2D = 0;
TextureBuffer* lineColorImgBuf = 0;
GLsizei w = prevViewport_[2], h = prevViewport_[3];
GLsizei lineBPP = useIntegerTexture ? 4 : 16; // bytes per pixel
size_t w = static_cast<size_t>(prevViewport_[2]), h = static_cast<size_t>(prevViewport_[3]);
size_t lineBPP = static_cast<size_t>(useIntegerTexture ? 4 : 16); // bytes per pixel
if (useBufferTexture)
......@@ -1491,7 +1491,7 @@ void IRenderer::renderLineThicknessGL42()
}
// resize
if (lineColorImg2D->getWidth() != w || lineColorImg2D->getHeight() != h)
if (lineColorImg2D->getWidth() != static_cast<int>(w) || lineColorImg2D->getHeight() != static_cast<int>(h))
lineColorImg2D->setData(0,
useIntegerTexture ? GL_R32UI : GL_RGBA32F,
w, h,
......
......@@ -971,10 +971,10 @@ private:
// final buffers used for drawing
/// # vertices in vbo
int numDrawVerts_;
size_t numDrawVerts_;
/// # isolated vertices
int numIsolatedVerts_;
size_t numIsolatedVerts_;
/// index buffer
std::vector<int> indices_;
......
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