# HG changeset patch # User Benjamin Golinvaux # Date 1557834692 -7200 # Node ID 1e26bb5f2a02a91033372db7fe622b5b7678ee90 # Parent 462a5074f9144d13cfc3aa1d2f21ab301a1b5bcc Fixed truncating conversion warnings + fixed deletion of incomplete type (seemingly due to M$ auto_ptr implementation) diff -r 462a5074f914 -r 1e26bb5f2a02 Framework/Radiography/RadiographyDicomLayer.cpp --- a/Framework/Radiography/RadiographyDicomLayer.cpp Tue May 14 13:51:00 2019 +0200 +++ b/Framework/Radiography/RadiographyDicomLayer.cpp Tue May 14 13:51:32 2019 +0200 @@ -47,6 +47,11 @@ } + RadiographyDicomLayer::RadiographyDicomLayer(MessageBroker& broker, const RadiographyScene& scene) : RadiographyLayer(broker, scene) + { + + } + void RadiographyDicomLayer::SetDicomTags(const OrthancPlugins::FullOrthancDataset& dataset) { converter_.reset(new DicomFrameConverter); diff -r 462a5074f914 -r 1e26bb5f2a02 Framework/Radiography/RadiographyDicomLayer.h --- a/Framework/Radiography/RadiographyDicomLayer.h Tue May 14 13:51:00 2019 +0200 +++ b/Framework/Radiography/RadiographyDicomLayer.h Tue May 14 13:51:32 2019 +0200 @@ -41,10 +41,7 @@ void ApplyConverter(); public: - RadiographyDicomLayer(MessageBroker& broker, const RadiographyScene& scene) - : RadiographyLayer(broker, scene) - { - } + RadiographyDicomLayer(MessageBroker& broker, const RadiographyScene& scene); void SetInstance(const std::string& instanceId, unsigned int frame) { diff -r 462a5074f914 -r 1e26bb5f2a02 Framework/Scene2D/Internals/OpenGLBasicPolylineRenderer.cpp --- a/Framework/Scene2D/Internals/OpenGLBasicPolylineRenderer.cpp Tue May 14 13:51:00 2019 +0200 +++ b/Framework/Scene2D/Internals/OpenGLBasicPolylineRenderer.cpp Tue May 14 13:51:32 2019 +0200 @@ -13,7 +13,7 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . **/ @@ -28,13 +28,13 @@ namespace Internals { OpenGLBasicPolylineRenderer::OpenGLBasicPolylineRenderer(OpenGL::IOpenGLContext& context, - const PolylineSceneLayer& layer) : + const PolylineSceneLayer& layer) : context_(context) { layer_.Copy(layer); } - + void OpenGLBasicPolylineRenderer::Render(const AffineTransform2D& transform) { AffineTransform2D t = AffineTransform2D::Combine( @@ -58,8 +58,10 @@ { ScenePoint2D p = chain[j].Apply(t); - glVertex2f(previous.GetX(), previous.GetY()); - glVertex2f(p.GetX(), p.GetY()); + glVertex2f(static_cast(previous.GetX()), + static_cast(previous.GetY())); + glVertex2f(static_cast(p.GetX()), + static_cast(p.GetY())); previous = p; } @@ -68,8 +70,10 @@ { ScenePoint2D p = chain[0].Apply(t); - glVertex2f(previous.GetX(), previous.GetY()); - glVertex2f(p.GetX(), p.GetY()); + glVertex2f(static_cast(previous.GetX()), + static_cast(previous.GetY())); + glVertex2f(static_cast(p.GetX()), + static_cast(p.GetY())); } } } @@ -77,7 +81,7 @@ glEnd(); } - + void OpenGLBasicPolylineRenderer::Update(const ISceneLayer& layer) { layer_.Copy(dynamic_cast(layer));