Correct lossless issue on linux x86

Update uclouvain#571
mayeut · Sep 9, 2015 · 5f02757 · 5f02757
1 parent 4f5ec07
commit 5f02757
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
@@ -268,7 +268,7 @@ void opj_tcd_makelayer( opj_tcd_t *tcd,
  n = passno + 1;
  continue;
  }
- if (dd / dr >= thresh)
+ if (dd / dr > thresh)
  n = passno + 1;
  }
 
@@ -565,7 +565,7 @@ OPJ_BOOL opj_tcd_rateallocate( opj_tcd_t *tcd,
  opj_t2_destroy(t2);
  } else {
  success = OPJ_TRUE;
- goodthresh = min;
+ goodthresh = min - DBL_MAX; /* do not rely on float equality for lossless transform */
  }
 
  if (!success) {

diff --git a/tests/compare_images.c b/tests/compare_images.c
@@ -85,7 +85,7 @@ static void compare_images_help_display(void)
  fprintf(stdout,"\n");
  fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline PGX/TIF/PNM image \n");
  fprintf(stdout," -t \t REQUIRED \t filename to the test PGX/TIF/PNM image\n");
- fprintf(stdout," -n \t REQUIRED \t number of component of the image (used to generate correct filename)\n");
+ fprintf(stdout," -n \t REQUIRED \t number of component of the image (used to generate correct filename, not used when both input files are TIF)\n");
  fprintf(stdout," -m \t OPTIONAL \t list of MSE tolerances, separated by : (size must correspond to the number of component) of \n");
  fprintf(stdout," -p \t OPTIONAL \t list of PEAK tolerances, separated by : (size must correspond to the number of component) \n");
  fprintf(stdout," -s \t OPTIONAL \t 1 or 2 filename separator to take into account PGX/PNM image with different components, "

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
@@ -353,6 +353,26 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
  ) 
  endif()
  endif(JPYLYZER_EXECUTABLE)
+
+ # If lossless compression (simple test is 4 arguments), decompress & compare
+ list(LENGTH CMD_ARG_LIST_2 ARG_COUNT)
+ if (ARG_COUNT EQUAL 4)
+ # can we compare with the input image ?
+ if (${INPUT_FILENAME_NAME} MATCHES "\\.tif$")
+ add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
+ COMMAND opj_decompress -i ${OUTPUT_FILENAME} -o ${OUTPUT_FILENAME}.lossless.tif
+ )
+ set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES 
+ DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
+ )
+ add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare
+ COMMAND compare_images -b ${INPUT_FILENAME} -t ${OUTPUT_FILENAME}.lossless.tif -n 1 -d
+ )
+ set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES 
+ DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
+ ) 
+ endif()
+ endif()
  endif()
 
  # DECODER TEST SUITE