Sync coc-qcc branch with master

diff --cc src/lib/openjp2/j2k.c
index b56b8a3da88bfae4dce3ebd335efd45059163245,19a48f5648057fc9ed9955ba990450d82dd73d2c..301bdfe62b063811ce24c91e06a309e392558808
--- 1/src/lib/openjp2/j2k.c
--- 2/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@@ -10421,20 -10327,41 +10476,39 @@@ static OPJ_BOOL opj_j2k_setup_header_wr
  {
          /* preconditions */
          assert(p_j2k != 00);
+         assert(p_manager != 00);
+ 
+         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_init_info, p_manager)) {
+                 return OPJ_FALSE;
+         }
+         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_soc, p_manager)) {
+                 return OPJ_FALSE;
+         }
+         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_siz, p_manager)) {
+                 return OPJ_FALSE;
+         }
+         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_cod, p_manager)) {
+                 return OPJ_FALSE;
+         }
+         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_qcd, p_manager)) {
+                 return OPJ_FALSE;
+         }
++        if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_coc, p_manager)) {
++                return OPJ_FALSE;
++        }
++        if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_qcc, p_manager)) {
++                return OPJ_FALSE;
++        }
  
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_init_info );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_soc );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_siz );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_cod );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_qcd );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_coc );
-         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_qcc );
-       
          if (OPJ_IS_CINEMA(p_j2k->m_cp.rsiz)) {
-                 opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_tlm );
 -                /* No need for COC or QCC, QCD and COD are used
 -                if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_coc, p_manager)) {
 -                        return OPJ_FALSE;
 -                }
 -                if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_qcc, p_manager)) {
 -                        return OPJ_FALSE;
 -                }
 -                */
+                 if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_tlm, p_manager)) {
+                         return OPJ_FALSE;
+                 }
  
                  if (p_j2k->m_cp.rsiz == OPJ_PROFILE_CINEMA_4K) {
-                         opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_poc );
+                         if (! opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_poc, p_manager)) {
+                                 return OPJ_FALSE;
+                         }
                  }
          }