diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp index 237c96f626a..fd013b1349d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp @@ -811,7 +811,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, image_item->set_image_weights(weights, sigma_weights); } #endif - const Image* pWeights = sigma_weights > 0 + Image* const pWeights = sigma_weights > 0 ? image_item->image_weights() : nullptr; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp index f450ea85197..ad7594d0ea2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp @@ -302,7 +302,7 @@ Meshing_thread* cgal_code_mesh_3(const Image* pImage, float iso_value, float value_outside, bool inside_is_less, - const Image* pWeights) + Image* const pWeights) { if (nullptr == pImage) { return nullptr; } diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h index 03e9514ba65..90994613d93 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h @@ -81,5 +81,5 @@ Meshing_thread* cgal_code_mesh_3(const CGAL::Image_3* pImage, float iso_value = 3.f, float value_outside = 0.f, bool inside_is_less = true, - const CGAL::Image_3* pWeights = nullptr); + CGAL::Image_3* const pWeights); #endif diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp index 229aff8a7ff..c03260e4445 100644 --- a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp @@ -500,7 +500,7 @@ Scene_image_item::compute_bbox() const m_image->image()->tz+(m_image->zdim()-1) * m_image->vz())); } -const Image* +Image* const Scene_image_item::image_weights() const { return &d->m_image_weights; diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.h b/Polyhedron/demo/Polyhedron/Scene_image_item.h index f1470860c0b..9302eaa3c7c 100644 --- a/Polyhedron/demo/Polyhedron/Scene_image_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_image_item.h @@ -45,7 +45,7 @@ public: bool isGray(); Image* m_image; - const Image* image_weights() const; + Image* const image_weights() const; void set_image_weights(const Image& img, const float sigma); float sigma_weights() const;