Commit 935472f1 authored by Rashad Kanavath's avatar Rashad Kanavath

Merge remote-tracking branch 'origin/develop' into app_domain_transform

parents 83646392 fdbc28ab
......@@ -6,10 +6,10 @@ dist: trusty
compiler:
- clang
addons:
apt:
packages:
- libboost-all-dev
# addons:
# apt:
# packages:
# - libboost-all-dev
cache: ccache
......
......@@ -260,8 +260,7 @@ ImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
typename TargetListSampleType::ConstIterator labIt = labels->Begin();
maskIt.GoToBegin();
for (outIt.GoToBegin(); labIt!=labels->End() && !outIt.IsAtEnd();
++outIt)
for (outIt.GoToBegin(); !outIt.IsAtEnd(); ++outIt)
{
double confidenceIndex = 0.0;
TargetValueType labelValue(m_DefaultLabel);
......@@ -270,7 +269,7 @@ ImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
validPoint = maskIt.Get() > 0;
++maskIt;
}
if (validPoint)
if (validPoint && labIt!=labels->End())
{
labelValue = labIt.GetMeasurementVector()[0];
......
......@@ -172,7 +172,10 @@ ChoiceParameter::SetValue(std::string choiceKey)
++i;
}
itkExceptionMacro(<< "Cannot find " << choiceKey);
itkExceptionMacro(<< "Invalid parameter value '"
<< choiceKey << "'"
<< " given for parameter '-"
<< this->GetKey() << "'");
}
unsigned int
......
......@@ -63,11 +63,11 @@ QT_INSTALL_TRANSLATIONS:PATH=${XDK_INSTALL_DIR}/translations
QT_MOC_EXECUTABLE:FILEPATH=${XDK_INSTALL_DIR}/bin/moc
QT_UIC_EXECUTABLE:FILEPATH=${XDK_INSTALL_DIR}/bin/uic
QT_RCC_EXECUTABLE:FILEPATH=${XDK_INSTALL_DIR}/bin/rcc
QT_LRELEASE_EXECUTABLE:FILEPATH=${XDK_INSTALL_DIR}/bin/lrelease
QT_INSTALL_PLUGINS:PATH=${XDK_INSTALL_DIR}/plugins
QT_INSTALL_HEADERS:PATH=${XDK_INSTALL_DIR}/include
QMAKE_MKSPECS:PATH=${XDK_INSTALL_DIR}/mkspecs
"
)
file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" ${INITIAL_CACHE})
......
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