From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 From: Marco Callieri Date: Mon, 9 Jan 2017 16:06:14 +0100 Subject: [PATCH 1/3] resolved ambiguity for abs overloads diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp index 364d53bf..ef3d4a2d 100644 --- a/src/meshlabplugins/edit_quality/eqhandle.cpp +++ b/src/meshlabplugins/edit_quality/eqhandle.cpp @@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) setCursor(Qt::OpenHandCursor); QPointF newPos = event->scenePos(); - qreal handleOffset = abs(newPos.x()-pos().x()); + qreal handleOffset = std::fabs(newPos.x()-pos().x()); if (handleOffset >= std::numeric_limits::epsilon()) { -- 2.15.0 From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 From: Marco Callieri Date: Tue, 10 Jan 2017 10:05:05 +0100 Subject: [PATCH 2/3] again, fabs ambiguity diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp index ef3d4a2d..d29f8c45 100644 --- a/src/meshlabplugins/edit_quality/eqhandle.cpp +++ b/src/meshlabplugins/edit_quality/eqhandle.cpp @@ -30,6 +30,7 @@ FIRST RELEASE #include "eqhandle.h" #include #include +#include EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, @@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) setCursor(Qt::OpenHandCursor); QPointF newPos = event->scenePos(); - qreal handleOffset = std::fabs(newPos.x()-pos().x()); + qreal handleOffset = fabs(newPos.x()-pos().x()); if (handleOffset >= std::numeric_limits::epsilon()) { -- 2.15.0 From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Mon, 4 Dec 2017 21:27:23 +0100 Subject: [PATCH 3/3] io_TXT -> io_txt diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro index 6ea7f1db..2a95c127 100644 --- a/src/meshlab_full.pro +++ b/src/meshlab_full.pro @@ -16,7 +16,7 @@ SUBDIRS = common \ meshlabplugins/io_x3d \ meshlabplugins/io_expe \ meshlabplugins/io_pdb \ - plugins_experimental/io_TXT \ + plugins_experimental/io_txt \ # Filter plugins meshlabplugins/filter_aging \ meshlabplugins/filter_ao \ diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp similarity index 100% rename from src/plugins_experimental/io_TXT/io_txt.cpp rename to src/plugins_experimental/io_txt/io_txt.cpp diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h similarity index 100% rename from src/plugins_experimental/io_TXT/io_txt.h rename to src/plugins_experimental/io_txt/io_txt.h diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro similarity index 100% rename from src/plugins_experimental/io_TXT/io_txt.pro rename to src/plugins_experimental/io_txt/io_txt.pro -- 2.15.0