summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/j2k.c
diff options
context:
space:
mode:
authorMatthieu Darbois <mayeut@users.noreply.github.com>2016-09-14 00:12:43 +0200
committerGitHub <noreply@github.com>2016-09-14 00:12:43 +0200
commit0954bc11e3ab6a39d86e5ed51286da4b8989743d (patch)
tree1ae2667a37e4133925c4ee7352080b7da7d15cf2 /src/lib/openjp2/j2k.c
parent1e69940955f6d5b05369ebeeafe70e698cc2b870 (diff)
Fix some warnings (#838)
Fix warnings introduced by uclouvain/openjpeg#786
Diffstat (limited to 'src/lib/openjp2/j2k.c')
-rw-r--r--src/lib/openjp2/j2k.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index bdacbe91..66802bb9 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -5953,8 +5953,11 @@ OPJ_BOOL opj_j2k_set_threads(opj_j2k_t *j2k, OPJ_UINT32 num_threads)
if( opj_has_thread_support() )
{
opj_thread_pool_destroy(j2k->m_tp);
- j2k->m_tp = opj_thread_pool_create((int)num_threads);
- if( j2k->m_tp == 0 )
+ j2k->m_tp = NULL;
+ if (num_threads <= (OPJ_UINT32)INT_MAX ) {
+ j2k->m_tp = opj_thread_pool_create((int)num_threads);
+ }
+ if( j2k->m_tp == NULL )
{
j2k->m_tp = opj_thread_pool_create(0);
return OPJ_FALSE;