[libpng16] Imported from libpng-1.6.0beta19.tar
diff --git a/pngset.c b/pngset.c
index bde866f..c8df0dc 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1335,10 +1335,12 @@
     */
 
    if (allowed)
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
+      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |
+         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;
 
    else
-      png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
+      png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |
+         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);
 }
 #endif /* PNG_BENIGN_ERRORS_SUPPORTED */