Mercurial > hg > orthanc-stone
diff Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 698:8b6adfb62a2f refactor-viewport-controller
Code is broken -- stashing ongoing work in a branch
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 15 May 2019 16:56:17 +0200 |
| parents | e3f21a265be5 |
| children | 5c551f078c18 |
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Tue May 14 19:38:51 2019 +0200 +++ b/Framework/Scene2D/Internals/OpenGLTextProgram.cpp Wed May 15 16:56:17 2019 +0200 @@ -155,8 +155,8 @@ program_->Use(); double dx, dy; // In pixels - ComputeAnchorTranslation(dx, dy, data.GetAnchor(), - data.GetTextWidth(), data.GetTextHeight(), data.GetBorder()); + ComputeAnchorTranslation(dx, dy, data.GetAnchor(), data.GetTextWidth(), + data.GetTextHeight(), static_cast<unsigned int>(data.GetBorder())); double x = data.GetX(); double y = data.GetY(); @@ -182,7 +182,8 @@ glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - glDrawArrays(GL_TRIANGLES, 0, data.GetCoordinatesCount() / COMPONENTS); + glDrawArrays(GL_TRIANGLES, 0, + static_cast<GLsizei>(data.GetCoordinatesCount() / COMPONENTS)); glDisable(GL_BLEND); glDisableVertexAttribArray(positionLocation_);