Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
d5cde7f0
Commit
d5cde7f0
authored
Jun 18, 2012
by
Jonathan Guinet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: ImageListToVectorImageFilter has been moved to Code/Common.
parent
bb4ccf63
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
32 deletions
+35
-32
Code/Common/otbImageListToVectorImageFilter.h
Code/Common/otbImageListToVectorImageFilter.h
+0
-0
Code/Common/otbImageListToVectorImageFilter.txx
Code/Common/otbImageListToVectorImageFilter.txx
+0
-0
Testing/Code/BasicFilters/CMakeLists.txt
Testing/Code/BasicFilters/CMakeLists.txt
+0
-29
Testing/Code/BasicFilters/otbBasicFiltersTests3.cxx
Testing/Code/BasicFilters/otbBasicFiltersTests3.cxx
+0
-3
Testing/Code/Common/CMakeLists.txt
Testing/Code/Common/CMakeLists.txt
+32
-0
Testing/Code/Common/otbCommonTests14.cxx
Testing/Code/Common/otbCommonTests14.cxx
+3
-0
Testing/Code/Common/otbImageListToVectorImageFilter.cxx
Testing/Code/Common/otbImageListToVectorImageFilter.cxx
+0
-0
Testing/Code/Common/otbImageListToVectorImageFilter2.cxx
Testing/Code/Common/otbImageListToVectorImageFilter2.cxx
+0
-0
Testing/Code/Common/otbImageListToVectorImageFilterNew.cxx
Testing/Code/Common/otbImageListToVectorImageFilterNew.cxx
+0
-0
No files found.
Code/
BasicFilters
/otbImageListToVectorImageFilter.h
→
Code/
Common
/otbImageListToVectorImageFilter.h
View file @
d5cde7f0
File moved
Code/
BasicFilters
/otbImageListToVectorImageFilter.txx
→
Code/
Common
/otbImageListToVectorImageFilter.txx
View file @
d5cde7f0
File moved
Testing/Code/BasicFilters/CMakeLists.txt
View file @
d5cde7f0
...
...
@@ -331,32 +331,6 @@ ADD_TEST(bfTvVectorImageToImageListFilter ${BASICFILTERS_TESTS3}
)
# ------- otb::ImageListToVectorImageFilter ----------------------------
ADD_TEST
(
bfTuImageListToVectorImageFilterNew
${
BASICFILTERS_TESTS3
}
otbImageListToVectorImageFilterNew
)
ADD_TEST
(
bfTvImageListToVectorImageFilter
${
BASICFILTERS_TESTS3
}
--compare-image
${
EPSILON_7
}
${
BASELINE
}
/bfTvImageListToVectorImageFilter.png
${
TEMP
}
/bfTvImageListToVectorImageFilter.png
otbImageListToVectorImageFilter
${
INPUTDATA
}
/poupees_c1.hdr
${
INPUTDATA
}
/poupees_c2.hdr
${
INPUTDATA
}
/poupees_c3.hdr
#${INPUTDATA}/poupees.c1.hdr
#${INPUTDATA}/poupees.c2.hdr
#${INPUTDATA}/poupees.c3.hdr
${
TEMP
}
/bfTvImageListToVectorImageFilter.png
)
ADD_TEST
(
bfTvImageListToVectorImageFilter2
${
BASICFILTERS_TESTS3
}
otbImageListToVectorImageFilter2
${
INPUTDATA
}
/poupees_c1.hdr
${
INPUTDATA
}
/poupees_c2.hdr
${
INPUTDATA
}
/poupees_c3.hdr
)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests4 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -2848,9 +2822,6 @@ otbVectorRescaleIntensityImageFilterNew.cxx
otbVectorRescaleIntensityImageFilter.cxx
otbVectorImageToImageListFilterNew.cxx
otbVectorImageToImageListFilter.cxx
otbImageListToVectorImageFilterNew.cxx
otbImageListToVectorImageFilter.cxx
otbImageListToVectorImageFilter2.cxx
otbShiftScaleVectorImageFilterNew.cxx
otbShiftScaleVectorImageFilterTest.cxx
)
...
...
Testing/Code/BasicFilters/otbBasicFiltersTests3.cxx
View file @
d5cde7f0
...
...
@@ -33,9 +33,6 @@ void RegisterTests()
REGISTER_TEST
(
otbVectorRescaleIntensityImageFilter
);
REGISTER_TEST
(
otbVectorImageToImageListFilterNew
);
REGISTER_TEST
(
otbVectorImageToImageListFilter
);
REGISTER_TEST
(
otbImageListToVectorImageFilterNew
);
REGISTER_TEST
(
otbImageListToVectorImageFilter
);
REGISTER_TEST
(
otbImageListToVectorImageFilter2
);
REGISTER_TEST
(
otbShiftScaleVectorImageFilterNew
);
REGISTER_TEST
(
otbShiftScaleVectorImageFilterTest
);
}
Testing/Code/Common/CMakeLists.txt
View file @
d5cde7f0
...
...
@@ -1241,6 +1241,35 @@ ADD_TEST(bfTvPolygonizationRasterization_Index ${COMMON_TESTS14}
${
INPUTDATA
}
/QB_Toulouse_labelImage_Index.tif
)
# ------- otb::ImageListToVectorImageFilter ----------------------------
ADD_TEST
(
coTuImageListToVectorImageFilterNew
${
COMMON_TESTS14
}
otbImageListToVectorImageFilterNew
)
ADD_TEST
(
coTvImageListToVectorImageFilter
${
COMMON_TESTS14
}
--compare-image
${
EPSILON_7
}
${
BASELINE
}
/bfTvImageListToVectorImageFilter.png
${
TEMP
}
/coTvImageListToVectorImageFilter.png
otbImageListToVectorImageFilter
${
INPUTDATA
}
/poupees_c1.hdr
${
INPUTDATA
}
/poupees_c2.hdr
${
INPUTDATA
}
/poupees_c3.hdr
#${INPUTDATA}/poupees.c1.hdr
#${INPUTDATA}/poupees.c2.hdr
#${INPUTDATA}/poupees.c3.hdr
${
TEMP
}
/coTvImageListToVectorImageFilter.png
)
ADD_TEST
(
coTvImageListToVectorImageFilter2
${
COMMON_TESTS14
}
otbImageListToVectorImageFilter2
${
INPUTDATA
}
/poupees_c1.hdr
${
INPUTDATA
}
/poupees_c2.hdr
${
INPUTDATA
}
/poupees_c3.hdr
)
# ------- Fichiers sources CXX -----------------------------------
SET
(
BasicCommon_SRCS1
otbCommonTests1.cxx
...
...
@@ -1414,6 +1443,9 @@ otbVectorDataRasterizeFilter.cxx
otbVectorDataToLabelImageFilter.cxx
otbOGRDataSourceToLabelImageFilter.cxx
otbPolygonizationRasterizationTest.cxx
otbImageListToVectorImageFilterNew.cxx
otbImageListToVectorImageFilter.cxx
otbImageListToVectorImageFilter2.cxx
)
OTB_ADD_EXECUTABLE
(
otbCommonTests1
"
${
BasicCommon_SRCS1
}
"
"OTBIO;OTBTesting"
)
...
...
Testing/Code/Common/otbCommonTests14.cxx
View file @
d5cde7f0
...
...
@@ -35,4 +35,7 @@ void RegisterTests()
REGISTER_TEST
(
otbOGRDataSourceToLabelImageFilterNew
);
REGISTER_TEST
(
otbOGRDataSourceToLabelImageFilter
);
REGISTER_TEST
(
otbPolygonizationRasterizationTest
);
REGISTER_TEST
(
otbImageListToVectorImageFilterNew
);
REGISTER_TEST
(
otbImageListToVectorImageFilter
);
REGISTER_TEST
(
otbImageListToVectorImageFilter2
);
}
Testing/Code/
BasicFilters
/otbImageListToVectorImageFilter.cxx
→
Testing/Code/
Common
/otbImageListToVectorImageFilter.cxx
View file @
d5cde7f0
File moved
Testing/Code/
BasicFilters
/otbImageListToVectorImageFilter2.cxx
→
Testing/Code/
Common
/otbImageListToVectorImageFilter2.cxx
View file @
d5cde7f0
File moved
Testing/Code/
BasicFilters
/otbImageListToVectorImageFilterNew.cxx
→
Testing/Code/
Common
/otbImageListToVectorImageFilterNew.cxx
View file @
d5cde7f0
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment