# HG changeset patch # User Benjamin Golinvaux # Date 1558077690 -7200 # Node ID 7c6197d9acc971622ed9dcbc29cc0ff2c841430b # Parent 9a474e90e8321cfc5330d35ffecffa2a8daa5692 Fixed a bunch of truncation warnings in various parts of the library diff -r 9a474e90e832 -r 7c6197d9acc9 Framework/Scene2D/Internals/OpenGLLinesProgram.cpp --- a/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Fri May 17 08:49:55 2019 +0200 +++ b/Framework/Scene2D/Internals/OpenGLLinesProgram.cpp Fri May 17 09:21:30 2019 +0200 @@ -420,12 +420,12 @@ glUniform1f(program_->GetUniformLocation("u_thickness"), static_cast(t1 / zoom)); - glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), + glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), static_cast(t0 / t1)); } else { - glUniform1f(program_->GetUniformLocation("u_thickness"), + glUniform1f(program_->GetUniformLocation("u_thickness"), static_cast(thickness / zoom)); } } @@ -436,14 +436,14 @@ double t1 = std::max(thickness, aliasingBorder / zoom); double t0 = std::max(0.0, thickness - aliasingBorder / zoom); - glUniform1f(program_->GetUniformLocation("u_thickness"), + glUniform1f(program_->GetUniformLocation("u_thickness"), static_cast(t1)); - glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), + glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), static_cast(t0 / t1)); } else { - glUniform1f(program_->GetUniformLocation("u_thickness"), + glUniform1f(program_->GetUniformLocation("u_thickness"), static_cast(thickness)); } } @@ -452,12 +452,14 @@ { glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - glDrawArrays(GL_TRIANGLES, 0, data.GetVerticesCount()); + glDrawArrays(GL_TRIANGLES, 0, + static_cast(data.GetVerticesCount())); glDisable(GL_BLEND); } else { - glDrawArrays(GL_TRIANGLES, 0, data.GetVerticesCount()); + glDrawArrays(GL_TRIANGLES, 0, + static_cast(data.GetVerticesCount())); } glDisableVertexAttribArray(locationPosition); diff -r 9a474e90e832 -r 7c6197d9acc9 Framework/Scene2D/ZoomSceneTracker.h --- a/Framework/Scene2D/ZoomSceneTracker.h Fri May 17 08:49:55 2019 +0200 +++ b/Framework/Scene2D/ZoomSceneTracker.h Fri May 17 09:21:30 2019 +0200 @@ -21,11 +21,14 @@ #pragma once + #include "IPointerTracker.h" #include "Internals/FixedPointAligner.h" namespace OrthancStone { + class Scene2D; + class ZoomSceneTracker : public IPointerTracker { private: