diff --git a/Examples/OBIA/CMakeLists.txt b/Examples/OBIA/CMakeLists.txt index 1e3b2ee4d4c42290e8d7bef369aacdd6b344505c..64b113bbaac069bc1b36f44076be349cb27f2dd2 100644 --- a/Examples/OBIA/CMakeLists.txt +++ b/Examples/OBIA/CMakeLists.txt @@ -53,11 +53,11 @@ ADD_TEST(trTeOBIAShapeAttributeComputationTest ${EXE_TESTS} ) ADD_TEST(trTeOBIARadiometricAttributesLabelMapFilterTest ${EXE_TESTS} - --compare-image ${TOL} ${BASELINE}/OBIARadiometricAttributes.tif - ${TEMP}/OBIARadiometricAttributes.tif + --compare-image ${TOL} ${BASELINE}/OBIARadiometricAttributes.png + ${TEMP}/OBIARadiometricAttributes.png RadiometricAttributesLabelMapFilterExample ${INPUTDATA}/qb_RoadExtract.tif - ${TEMP}/OBIARadiometricAttributes.tif + ${TEMP}/OBIARadiometricAttributes.png ${TEMP}/qb_RoadExtract_Radiometry_pretty.png STATS::Band1::Mean 0 diff --git a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx index 4cb0395f89aa2d3ea7e3cc478482b20c0b5046e8..fb8dc88f59889903ad83c3ba28fdc54f6b75234a 100644 --- a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx +++ b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx @@ -18,7 +18,7 @@ // Software Guide : BeginCommandLineArgs // INPUTS: {qb_RoadExtract.tif} -// OUTPUTS: {OBIARadiometricAttribute1.tif}, {qb_ExtractRoad_Radiometry_pretty.jpg} +// OUTPUTS: {OBIARadiometricAttribute1.png}, {qb_ExtractRoad_Radiometry_pretty.jpg} // STATS::Band1::Mean 0 0.5 16 16 50 1.0 // Software Guide : EndCommandLineArgs @@ -86,15 +86,17 @@ int main(int argc, char * argv[]) // Labeled image type typedef unsigned short LabelType; + typedef unsigned char MaskPixelType; typedef double PixelType; typedef otb::Image<LabelType, Dimension> LabeledImageType; + typedef otb::Image<MaskPixelType, Dimension> MaskImageType; typedef otb::Image<PixelType, Dimension> ImageType; typedef otb::VectorImage<PixelType, Dimension> VectorImageType; typedef otb::VectorImage<unsigned char, Dimension> OutputVectorImageType; typedef otb::ImageFileReader<LabeledImageType> LabeledReaderType; typedef otb::ImageFileReader<ImageType> ReaderType; typedef otb::ImageFileReader<VectorImageType> VectorReaderType; - typedef otb::ImageFileWriter<LabeledImageType> WriterType; + typedef otb::ImageFileWriter<MaskImageType> WriterType; typedef otb::ImageFileWriter<OutputVectorImageType> VectorWriterType; typedef otb::VectorRescaleIntensityImageFilter <VectorImageType, OutputVectorImageType> VectorRescalerType; @@ -120,7 +122,7 @@ int main(int argc, char * argv[]) typedef otb::AttributesMapOpeningLabelMapFilter<LabelMapType> OpeningLabelMapFilterType; typedef itk::LabelMapToBinaryImageFilter<LabelMapType, - LabeledImageType> + MaskImageType> LabelMapToBinaryImageFilterType; typedef otb::MultiChannelRAndNIRIndexImageFilter<VectorImageType, ImageType> NDVIImageFilterType;