diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-07-21 15:23:31 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-07-21 15:23:31 +0000 |
| commit | a19c8a4ea38866c1654f26f8389e4a4e7d9b092e (patch) | |
| tree | bdd190720637e1abcab95717bf039a42a56ac0a0 /applications/codec | |
| parent | f8de2fc8eb78d52480bcf7755acdcd961ef3aa39 (diff) | |
add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests.
Diffstat (limited to 'applications/codec')
| -rw-r--r-- | applications/codec/CMakeLists.txt | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index e39f41f3..f56ee0b5 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -101,38 +101,38 @@ IF(BUILD_JPWL) ) ENDIF(BUILD_JPWL) -if(BUILD_TESTING) -# Do testing here, once we know the examples are being built: -FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" - ) +#if(BUILD_TESTING) +## Do testing here, once we know the examples are being built: +#FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" +# ) -foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) - get_filename_component(filename_temp ${filename} NAME) - get_filename_component(filename_ext ${filename} EXT) - execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} - OUTPUT_VARIABLE dump_success - OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump - ERROR_QUIET - ) - if(dump_success) - file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) - string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" - numcomps "${numcomp_file}") - #message( "found:${output_variable} for ${filename_temp}" ) - endif() - ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) - foreach(codec_type ppm pgx bmp tif raw tga png) - ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) - endforeach(codec_type) - foreach(codec_type ppm bmp tif tga png) - ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) - SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type}) - #if(UNIX) - # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) - #endif(UNIX) - endforeach(codec_type) -endforeach(filename) -endif(BUILD_TESTING) +#foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) +# get_filename_component(filename_temp ${filename} NAME) +# get_filename_component(filename_ext ${filename} EXT) +# execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} +# OUTPUT_VARIABLE dump_success +# OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump +# ERROR_QUIET +# ) +# if(dump_success) +# file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) +# string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" +# numcomps "${numcomp_file}") +# #message( "found:${output_variable} for ${filename_temp}" ) +# endif() +# ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) +# foreach(codec_type ppm pgx bmp tif raw tga png) +# ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) +# endforeach(codec_type) +# foreach(codec_type ppm bmp tif tga png) +# ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) +# SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type}) +# #if(UNIX) +# # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) +# #endif(UNIX) +# endforeach(codec_type) +#endforeach(filename) +#endif(BUILD_TESTING) |