diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index d0d49f13..56508c11 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -850,6 +850,7 @@ int main(int argc, char **argv)
     }
     fwrite(outbuf, 1, len, f);
     free(outbuf);
+    free(jp2_struct->comps);
     fclose(f);
   }
 
@@ -874,6 +875,13 @@ int main(int argc, char **argv)
     }
   }
 
+  /* Free memory */
+  free(cp_init.tcps);
+  if (tcp_init->numlayers > 9) free(cp.matrice);
+  for (tileno = 0; tileno < cp.tw * cp.th; tileno++)
+    free(cp.tcps[tileno].tccps);
+  free(cp.tcps);
+
   system("pause");
   return 0;
 }