summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authormayeut <mayeut@users.noreply.github.com>2015-07-04 00:04:55 +0200
committermayeut <mayeut@users.noreply.github.com>2015-07-04 00:04:55 +0200
commitc999b6c0f0a5027cc06e4ce7513e7fa0949889b9 (patch)
tree001af091f2631039f0d37fbc4657784590adcfcf /src/lib
parent4e0de649bd87cc5c3e89ab09d954f3b0c9e6bedd (diff)
uclouvain/openjpeg#254 Add build option to disable the fix
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/CMakeLists.txt5
-rw-r--r--src/lib/openjp2/j2k.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 5727068c..0795f7c5 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -41,6 +41,11 @@ if(BUILD_JPIP)
)
endif()
+option(OPJ_DISABLE_TPSOT_FIX "Disable TPsot==TNsot fix. See https://github.com/uclouvain/openjpeg/issues/254." OFF)
+if(OPJ_DISABLE_TPSOT_FIX)
+ add_definitions(-DOPJ_DISABLE_TPSOT_FIX)
+endif()
+
# Build the library
if(WIN32)
if(BUILD_SHARED_LIBS)
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 128c3a88..67301547 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -8602,6 +8602,10 @@ opj_j2k_t* opj_j2k_create_decompress(void)
l_j2k->m_is_decoder = 1;
l_j2k->m_cp.m_is_decoder = 1;
+#ifdef OPJ_DISABLE_TPSOT_FIX
+ l_j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked = 1;
+#endif
+
l_j2k->m_specific_param.m_decoder.m_default_tcp = (opj_tcp_t*) opj_calloc(1,sizeof(opj_tcp_t));
if (!l_j2k->m_specific_param.m_decoder.m_default_tcp) {
opj_j2k_destroy(l_j2k);