diff --git a/doc/Doxyfile.dox.cmake.in b/doc/Doxyfile.dox.cmake.in
index 3163f991f..439e133de 100644
--- a/doc/Doxyfile.dox.cmake.in
+++ b/doc/Doxyfile.dox.cmake.in
@@ -47,7 +47,6 @@ IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
 TYPEDEF_HIDES_STRUCT   = NO
-SYMBOL_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -79,7 +78,6 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = NO
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
 FILE_VERSION_FILTER    =
@@ -146,7 +144,6 @@ HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
 HTML_TIMESTAMP         = NO
-HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
@@ -173,7 +170,6 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
-USE_INLINE_TREES       = NO
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
@@ -217,8 +213,6 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             =
-XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
diff --git a/src/bin/jp2/convertpng.c b/src/bin/jp2/convertpng.c
index 44d985f23..375ee300d 100644
--- a/src/bin/jp2/convertpng.c
+++ b/src/bin/jp2/convertpng.c
@@ -75,10 +75,10 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
     png_uint_32  width, height = 0U;
     int color_type;
     FILE *reader = NULL;
-    OPJ_BYTE** rows = NULL;
-    OPJ_INT32* row32s = NULL;
+    OPJ_BYTE** rows;
+    OPJ_INT32* row32s;
     /* j2k: */
-    opj_image_t *image = NULL;
+    opj_image_t *image;
     opj_image_cmptparm_t cmptparm[4];
     OPJ_UINT32 nr_comp;
     OPJ_BYTE sigbuf[8];
@@ -94,20 +94,28 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
     if (fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE
             || memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0) {
         fprintf(stderr, "pngtoimage: %s is no valid PNG file\n", read_idf);
-        goto fin;
+        return NULL;
     }
 
     if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
                                       NULL, NULL, NULL)) == NULL) {
-        goto fin;
+        fclose(reader);
+        return NULL;
     }
     if ((info = png_create_info_struct(png)) == NULL) {
-        goto fin;
+        fclose(reader);
+        png_destroy_read_struct(&png, NULL, NULL);
+        return NULL;
     }
 
     if (setjmp(png_jmpbuf(png))) {
-        goto fin;
+        png_destroy_read_struct(&png, &info, NULL);
+        fclose(reader);
+        return NULL;
     }
+    rows = NULL;
+    row32s = NULL;
+    image = NULL;
 
     png_init_io(png, reader);
     png_set_sig_bytes(png, MAGIC_SIZE);