diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 9271c0a3..714fed0d 100644
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -114,7 +114,7 @@ static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color,
 /**
  * Destroy list of ASOC entities
  */
-static void opj_jp2_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num );
+static void opj_jp2_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num);
 
 /**
  * Writes the Channel Definition box.
@@ -177,10 +177,10 @@ static OPJ_BOOL opj_jp2_read_ftyp(opj_jp2_t *jp2,
  *
  * @return true if the ASOC box is valid.
  */
-static OPJ_BOOL opj_jp2_read_asoc(	opj_jp2_t *jp2,
-                                    OPJ_BYTE * p_header_data,
-                                    OPJ_UINT32 p_header_size,
-                                    opj_event_mgr_t * p_manager);
+static OPJ_BOOL opj_jp2_read_asoc(opj_jp2_t *jp2,
+                                  OPJ_BYTE * p_header_data,
+                                  OPJ_UINT32 p_header_size,
+                                  opj_event_mgr_t * p_manager);
 
 static OPJ_BOOL opj_jp2_skip_jp2c(opj_jp2_t *jp2,
                                   opj_stream_private_t *stream,
@@ -2660,10 +2660,10 @@ static OPJ_BOOL opj_jp2_read_ftyp(opj_jp2_t *jp2,
     return OPJ_TRUE;
 }
 
-static OPJ_BOOL opj_jp2_read_asoc(	opj_jp2_t *jp2,
-                                    OPJ_BYTE * p_header_data,
-                                    OPJ_UINT32 p_header_size,
-                                    opj_event_mgr_t * p_manager)
+static OPJ_BOOL opj_jp2_read_asoc(opj_jp2_t *jp2,
+                                  OPJ_BYTE * p_header_data,
+                                  OPJ_UINT32 p_header_size,
+                                  opj_event_mgr_t * p_manager)
 {
     OPJ_UINT32 label_tag;
     OPJ_UINT32 asoc_tag;
@@ -2676,31 +2676,34 @@ static OPJ_BOOL opj_jp2_read_asoc(	opj_jp2_t *jp2,
     assert(p_manager != 00);
 
     if (p_header_size < 8) {
-        opj_event_msg(p_manager, EVT_ERROR, "Cannot handle ASOC box of less than 8 bytes\n");
+        opj_event_msg(p_manager, EVT_ERROR,
+                      "Cannot handle ASOC box of less than 8 bytes\n");
         return OPJ_FALSE;
     }
 
-    opj_read_bytes(p_header_data,&asoc_size,4);
+    opj_read_bytes(p_header_data, &asoc_size, 4);
     p_header_data += 4;
     p_header_size -= 4;
 
     if (p_header_size < asoc_size) {
-        opj_event_msg(p_manager, EVT_ERROR, "ASOC super box is smaller than containing sub box\n");
+        opj_event_msg(p_manager, EVT_ERROR,
+                      "ASOC super box is smaller than containing sub box\n");
         return OPJ_FALSE;
     }
 
-    opj_read_bytes(p_header_data,&label_tag,4);
+    opj_read_bytes(p_header_data, &label_tag, 4);
     p_header_data += 4;
     p_header_size -= 4;
     asoc_size -= 4;
 
     if (label_tag != JP2_LBL) {
         /* TODO: Verify that ASOC must have a following label ? */
-        opj_event_msg(p_manager, EVT_WARNING, "ASOC data does not have a label (LBL)\n");
+        opj_event_msg(p_manager, EVT_WARNING,
+                      "ASOC data does not have a label (LBL)\n");
         return OPJ_TRUE; // No error if we could not parse
     }
 
-    if ( jp2->numasoc == 0 ) {
+    if (jp2->numasoc == 0) {
         /* Create a first asoc */
         jp2->numasoc = 1;
         jp2->asoc = opj_malloc(sizeof(opj_jp2_asoc_t));
@@ -2710,12 +2713,14 @@ static OPJ_BOOL opj_jp2_read_asoc(	opj_jp2_t *jp2,
         jp2->asoc = opj_realloc(jp2->asoc, jp2->numasoc * sizeof(opj_jp2_asoc_t));
     }
 
-    asoc = &(jp2->asoc[jp2->numasoc-1]);
-    asoc->level = jp2->numasoc-1; /* TODO: This is not correct if a parent asoc contains multiple child asocs! */
-    asoc->label_length = asoc_size+1;
+    asoc = &(jp2->asoc[jp2->numasoc - 1]);
+
+    /* TODO: This is not correct if a parent asoc contains multiple child asocs! */
+    asoc->level = jp2->numasoc - 1; 
+    asoc->label_length = asoc_size + 1;
     asoc->label = opj_malloc(asoc->label_length);
     memcpy(asoc->label, p_header_data, asoc_size);
-    asoc->label[asoc->label_length-1] = '\0'; /* NULL terminated label string */
+    asoc->label[asoc->label_length - 1] = '\0'; /* NULL terminated label string */
     asoc->xml_buf = 00;
     asoc->xml_len = 0;
 
@@ -2723,55 +2728,56 @@ static OPJ_BOOL opj_jp2_read_asoc(	opj_jp2_t *jp2,
     p_header_size -= asoc_size;
 
     if (p_header_size < 4) {
-        opj_event_msg(p_manager, EVT_ERROR, "Cannot handle ASOC sub box of less than 4 bytes\n");
+        opj_event_msg(p_manager, EVT_ERROR,
+                      "Cannot handle ASOC sub box of less than 4 bytes\n");
         return OPJ_FALSE;
     }
 
-    opj_read_bytes(p_header_data,&asoc_tag,4);
+    opj_read_bytes(p_header_data, &asoc_tag, 4);
     p_header_data += 4;
     p_header_size -= 4;
 
     switch (asoc_tag) {
     case JP2_ASOC: {
         /* Start of nested ASOC tags. Parse this level. */
-        if (!opj_jp2_read_asoc( jp2, p_header_data, p_header_size, p_manager )) {
+        if (!opj_jp2_read_asoc(jp2, p_header_data, p_header_size, p_manager)) {
             return OPJ_FALSE;
         }
     }
     break;
 
     case JP2_XML: {
-        asoc->xml_len = p_header_size+1;
+        asoc->xml_len = p_header_size + 1;
         asoc->xml_buf  = opj_malloc(asoc->xml_len);
-        memcpy( asoc->xml_buf, p_header_data, p_header_size );
-        asoc->xml_buf[asoc->xml_len-1] = '\0';
+        memcpy(asoc->xml_buf, p_header_data, p_header_size);
+        asoc->xml_buf[asoc->xml_len - 1] = '\0';
     }
     break;
 
     default: {
         /* Copy the unknown data for external handling.
         NOTE: This is not tested, but does the same as if an XML tag was found.*/
-        asoc->xml_len = p_header_size+1;
+        asoc->xml_len = p_header_size + 1;
         asoc->xml_buf  = opj_malloc(asoc->xml_len);
-        memcpy( asoc->xml_buf, p_header_data, p_header_size );
-        asoc->xml_buf[asoc->xml_len-1] = '\0';
+        memcpy(asoc->xml_buf, p_header_data, p_header_size);
+        asoc->xml_buf[asoc->xml_len - 1] = '\0';
     }
     }
 
     return OPJ_TRUE;
 }
 
-static void opj_jp2_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num )
+static void opj_jp2_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num)
 {
     OPJ_UINT32 i;
     opj_jp2_asoc_t *asoc;
-    for (i=0; i<num; i++) {
+    for (i = 0; i < num; i++) {
         asoc = &(p_asoc[i]);
-        opj_free( asoc->label );
+        opj_free(asoc->label);
         asoc->label = 00;
         asoc->label_length = 0;
 
-        opj_free( asoc->xml_buf );
+        opj_free(asoc->xml_buf);
         asoc->xml_buf = 00;
         asoc->xml_len = 0;
     }
@@ -3209,8 +3215,8 @@ void opj_jp2_destroy(opj_jp2_t *jp2)
             jp2->m_procedure_list = 00;
         }
 
-        if ( jp2->numasoc ) {
-            opj_jp2_asoc_destroy( jp2->asoc, jp2->numasoc );
+        if (jp2->numasoc) {
+            opj_jp2_asoc_destroy(jp2->asoc, jp2->numasoc);
             jp2->asoc = 00;
             jp2->numasoc = 0;
         }
@@ -3381,7 +3387,7 @@ opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_t* p_jp2)
     return p_info;
 }
 
-opj_jp2_metadata_t* jp2_get_metadata(opj_jp2_t* p_jp2)
+OPJ_BOOL jp2_copy_asoc_data(opj_jp2_t* p_jp2, opj_codestream_info_v2_t* p_info)
 {
   opj_jp2_metadata_t* p_metadata = opj_malloc(sizeof(opj_jp2_metadata_t));
   jp2_copy_asoc_data( p_jp2, p_metadata );
@@ -3392,6 +3398,7 @@ OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadat
 {
     OPJ_UINT32 i;
     opj_jp2_asoc_t *asoc, *to_asoc;
+
     p_jp2_metadata->nbasoc = p_jp2->numasoc;
     p_jp2_metadata->asoc_info = opj_malloc(p_jp2_metadata->nbasoc * sizeof(opj_jp2_asoc_t));
     for (i=0; i<p_jp2_metadata->nbasoc; i++) {
@@ -3401,7 +3408,7 @@ OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadat
         to_asoc->label_length = asoc->label_length;
         to_asoc->xml_len = asoc->xml_len;
         if (asoc->label_length && asoc->label) {
-            to_asoc->label = opj_malloc( to_asoc->label_length );
+            to_asoc->label = opj_malloc(to_asoc->label_length);
             memcpy(to_asoc->label, asoc->label, to_asoc->label_length);
         } else {
             to_asoc->label = 00;
diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h
index e56ae660..d7c9fe17 100644
--- a/src/lib/openjp2/jp2.h
+++ b/src/lib/openjp2/jp2.h
@@ -498,7 +498,7 @@ opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_t* p_jp2);
 /**
  * Copy associated data
  */
-OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadata );
+OPJ_BOOL jp2_copy_asoc_data(opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadata);
 
 /**
  * Get the codestream index from a JPEG2000 codec.
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index c57aceea..28cf7f76 100644
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -37,7 +37,7 @@
 
 #include "opj_includes.h"
 
-static void opj_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num );
+static void opj_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num);
 
 /* ---------------------------------------------------------------------- */
 /* Functions to set the message handlers */
@@ -961,12 +961,12 @@ void OPJ_CALLCONV opj_dump_codec(opj_codec_t *p_codec,
 
 void OPJ_CALLCONV opj_dump_associated_data(
     opj_jp2_metadata_t* jp2_info,
-    FILE* output_stream )
+    FILE* output_stream)
 {
     OPJ_UINT32 i;
-    if ( jp2_info && jp2_info->asoc_info ) {
+    if (jp2_info && jp2_info->asoc_info) {
         fprintf(output_stream, "\n\nAssociated data: {\n");
-        for (i=0; i<jp2_info->nbasoc; i++) {
+        for (i = 0; i < jp2_info->nbasoc; i++) {
             fprintf(output_stream, "\tlabel=%s, xml/data=", (char*) jp2_info->asoc_info[i].label);
             if (jp2_info->asoc_info[i].xml_buf) {
                 fprintf(output_stream, "%s\n", (char*) jp2_info->asoc_info[i].xml_buf);
@@ -989,17 +989,17 @@ opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
     return NULL;
 }
 
-void opj_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num )
+void opj_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num)
 {
     OPJ_UINT32 i;
     opj_jp2_asoc_t *asoc;
-    for (i=0; i<num; i++) {
+    for (i = 0; i < num; i++) {
         asoc = &(p_asoc[i]);
-        opj_free( asoc->label );
+        opj_free(asoc->label);
         asoc->label = 00;
         asoc->label_length = 0;
 
-        opj_free( asoc->xml_buf );
+        opj_free(asoc->xml_buf);
         asoc->xml_buf = 00;
         asoc->xml_len = 0;
     }
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index 383e6bf5..85e82400 100644
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -1641,7 +1641,7 @@ OPJ_API opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(
  */
 OPJ_API void OPJ_CALLCONV opj_dump_associated_data(
     opj_jp2_metadata_t* cstr_info,
-    FILE* output_stream );
+    FILE* output_stream);
 
 /**
  * Get the codestream index from the codec