Commit ff93bbbd authored by Cédric Traizet's avatar Cédric Traizet

Merge branch 'warnings-7.2' into 'release-7.2'

Fix warnings for release 7.2

See merge request !741
parents d0bf1d22 b281fc1b
Pipeline #5601 passed with stages
in 281 minutes and 9 seconds
#
# Copyright (C) 2005-2020 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# This cmake module is based on a module written by Nuno Fachada, below is the
# original header of the module:
#
# This cmake module sets the project version and partial version
# variables by analysing the git tag and commit history. It expects git
......
......@@ -41,8 +41,8 @@ GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>::Grid
m_OutputOrigin(),
m_OutputSpacing(),
m_EdgePaddingValue(),
m_CheckOutputBounds(true),
m_InterpolationMargin(0.0),
m_CheckOutputBounds(true),
m_Interpolator(),
m_ReachableOutputRegion()
{
......
......@@ -225,7 +225,7 @@ void ExtendedFilenameToWriterOptions::SetExtendedFileName(const std::string& ext
{
code = std::stoi(map["epsg"]);
}
catch(const std::invalid_argument& e)
catch(const std::invalid_argument&)
{
itkWarningMacro("Invalid value ("
<< map["epsg"]
......
......@@ -433,9 +433,9 @@ HistogramModel
template <typename TImageModel>
void HistogramModel::template_BuildModel_M(BuildContext*)
{
QTime lMain;
QTime lPass1;
QTime lPass2;
QElapsedTimer lMain;
QElapsedTimer lPass1;
QElapsedTimer lPass2;
lMain.start();
......
......@@ -332,7 +332,7 @@ void HistogramModel::virtual_Read(QIODevice* device)
qDebug() << tr("%1: Reading histogram...").arg(QDateTime::currentDateTime().toString(Qt::ISODate));
QTime time;
QElapsedTimer time;
time.start();
......@@ -385,7 +385,7 @@ void HistogramModel::virtual_Write(QIODevice& device) const
qDebug() << tr("%1: Writing histogram...").arg(QDateTime::currentDateTime().toString(Qt::ISODate));
QTime time;
QElapsedTimer time;
time.start();
#if 0
......
......@@ -214,10 +214,10 @@ QwtText HistogramPlotPicker::trackerTextF(const QPointF& point) const
return QwtPlotPicker::trackerTextF(point);
if (!isActive())
return QwtText(QString().sprintf("%.4f, %.4f", point.x(), point.y()));
return QwtText(QString("%.4f, %.4f").arg(point.x()).arg(point.y()));
QString text;
text.sprintf("%.4f", point.x());
text = QString("%.4f").arg(point.x());
CountType start = 0;
CountType stop = 0;
......@@ -232,7 +232,7 @@ QwtText HistogramPlotPicker::trackerTextF(const QPointF& point) const
Find(m_PlotCurves[i], point.x(), c0, c1, cf);
text.append(QString().sprintf("\n[%.4f; %.4f[, %.0f", c0, c1, cf));
text.append(QString("\n[%.4f; %.4f[, %.0f").arg(c0).arg(c1).arg(cf));
}
return text;
......
......@@ -55,8 +55,8 @@ endif()
ExternalProject_Add(QWT
PREFIX QWT
URL "http://downloads.sourceforge.net/project/qwt/qwt/6.1.3/qwt-6.1.3.zip"
URL_MD5 558911df37aee4c0c3049860e967401c
URL "http://downloads.sourceforge.net/project/qwt/qwt/6.1.5/qwt-6.1.5.zip"
URL_MD5 61a8cae35ab6201d916304ec4a6f06b8
SOURCE_DIR ${QWT_SB_SRC}
BINARY_DIR ${QWT_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -8,7 +8,7 @@ diff -burN qwt-6.1.3-orig/qwtbuild.pri qwt-6.1.3/qwtbuild.pri
- # On Windows you can't mix release and debug libraries.
- # The designer is built in release mode. If you like to use it
- # you need a release version. For your own application development you
- # might need a debug version.
- # might need a debug version.
- # Enable debug_and_release + build_all if you want to build both.
- CONFIG += debug_and_release
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment