diff --git a/include/Container/registered.h b/include/Container/registered.h index 78eeef8d293574dd684744f16f20431f525df804..67f881aeb6e0f759cf791f0a439f1fc35ecf6448 100644 --- a/include/Container/registered.h +++ b/include/Container/registered.h @@ -37,6 +37,8 @@ protected: std::string m_name; // TODO inutile ?? public: + + virtual ~RegisteredBaseAttribute() {} /** * affecte un nom de type a l'attribut */ diff --git a/include/Topology/generic/attribmap.hpp b/include/Topology/generic/attribmap.hpp index dd215c35b38cc9067de5d9ee56f95b4ec6999a32..54daf317d10cb7ec98bf74e7ace31feea38ed0f2 100644 --- a/include/Topology/generic/attribmap.hpp +++ b/include/Topology/generic/attribmap.hpp @@ -38,7 +38,7 @@ template inline bool AttribMap::removeAttribute(AttributeHandler& attr) { assert(attr.isValid() || !"Invalid attribute handler") ; - if(m_attribs[attr.getOrbit()].removeAttribute(attr.getIndex())) + if(m_attribs[attr.getOrbit()].template removeAttribute(attr.getIndex())) { typedef std::multimap::iterator IT ; std::pair bounds = attributeHandlers.equal_range(attr.getDataVector()) ; diff --git a/include/Utils/clippingPresets.h b/include/Utils/clippingPresets.h index 768d1c40871e9942ce6c7d5ea3dd5d7ac4e35898..6ca3c79593dc443a7bcc053ba2de20e6f5030a88 100644 --- a/include/Utils/clippingPresets.h +++ b/include/Utils/clippingPresets.h @@ -48,6 +48,8 @@ class ClippingPreset public : + virtual ~ClippingPreset() {} + /// public static constructor static ClippingPreset* CreateEmptyPreset(); @@ -92,7 +94,6 @@ protected : /// protected constructor (used by public static constructors or child class) ClippingPreset(); - /*********************************************** * * Preset settings diff --git a/include/Utils/textures.h b/include/Utils/textures.h index d1fe4db1898ee827b31e5e86e8682670ea59a1e4..638c1c3a0cd11680ba09e51a0eaa5fd81305bf0b 100644 --- a/include/Utils/textures.h +++ b/include/Utils/textures.h @@ -45,6 +45,7 @@ namespace Utils class GTexture { public: + virtual ~GTexture() {} virtual void bind() {} }; diff --git a/src/Utils/Qt/qtcolorschooser.cpp b/src/Utils/Qt/qtcolorschooser.cpp index dd63f9b32f7b72f3e64111ac4cc8666b0f5c92c2..307646e22ac9a51db61476cb1cd079290affb00a 100644 --- a/src/Utils/Qt/qtcolorschooser.cpp +++ b/src/Utils/Qt/qtcolorschooser.cpp @@ -36,7 +36,7 @@ namespace QT ColorsChooser::ColorsChooser(SimpleQT *interf): - QtPopUp(false),m_interf(interf),m_current(0) + QtPopUp(NULL,false),m_interf(interf),m_current(0) { m_list = new QListWidget(); m_diag = new QColorDialog(); diff --git a/src/Utils/svg.cpp b/src/Utils/svg.cpp index d3ebe4b40da933c7b6a5f20027c5efbd60b61509..aea98aff6f0245a936c667fdf726f35e451a589b 100644 --- a/src/Utils/svg.cpp +++ b/src/Utils/svg.cpp @@ -498,14 +498,14 @@ void SVGOut::endPoints() void SVGOut::addPoint(const Geom::Vec3f& P) { glm::vec3 Q = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,m_proj,m_viewport); - glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); m_current->addVertex(Geom::Vec3f(float(Q[0]),float(m_viewport[3])-float(Q[1]),float(Q[2]))); } void SVGOut::addPoint(const Geom::Vec3f& P, const Geom::Vec3f& C) { glm::vec3 Q = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,m_proj,m_viewport); - glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); m_current->addVertex(Geom::Vec3f(float(Q[0]),float(m_viewport[3])-float(Q[1]),float(Q[2])),C); } @@ -527,10 +527,10 @@ void SVGOut::endLines() void SVGOut::addLine(const Geom::Vec3f& P, const Geom::Vec3f& P2) { glm::vec3 Q = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,m_proj,m_viewport); - glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); glm::vec3 Q2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,m_proj,m_viewport); - glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport); m_current->addVertex(Geom::Vec3f(float(Q[0]),float(m_viewport[3])-float(Q[1]),float(Q[2]))); m_current->addVertex(Geom::Vec3f(float(Q2[0]),float(m_viewport[3])-float(Q2[1]),float(Q2[2]))); @@ -541,10 +541,10 @@ void SVGOut::addLine(const Geom::Vec3f& P, const Geom::Vec3f& P2) void SVGOut::addLine(const Geom::Vec3f& P, const Geom::Vec3f& P2, const Geom::Vec3f& C) { glm::vec3 Q = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,m_proj,m_viewport); - glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport); glm::vec3 Q2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,m_proj,m_viewport); - glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport); +// glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport); m_current->addVertex(Geom::Vec3f(float(Q[0]),float(m_viewport[3])-float(Q[1]),float(Q[2])),C); m_current->addVertex(Geom::Vec3f(float(Q2[0]),float(m_viewport[3])-float(Q2[1]),float(Q2[2])),C);