Fix parsing corrupt PNG images in the addImage method (#3880)

- remove atob and btoa dependencies and use native implementations for node build, as well
- replace built-in PNG parser with the fast-png 3rd party dependency
- consistently support 16bit color spaces
- fix compression being applied with compression="NONE" in some cases

Author: HackbrettXXX

bower.json

@@ -67,7 +67,7 @@
     "rollup-plugin-license": "^2.1.0",
     "rollup-plugin-node-resolve": "4.2.3",
     "rollup-plugin-preprocess": "0.0.4",
-    "rollup-plugin-terser": "^6.1.0",
+    "@rollup/plugin-terser": "^0.4.4",
     "typescript": "^3.9.6"
   },
   "license": "MIT",

package-lock.json

@@ -24,9 +24,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.26.9",
-    "atob": "^2.1.2",
-    "btoa": "^1.2.1",
-    "fflate": "^0.8.1"
+    "fflate": "^0.8.1",
+    "fast-png": "^6.2.0"
   },
   "optionalDependencies": {
     "canvg": "^3.0.11",
@@ -40,6 +39,7 @@
     "@babel/preset-env": "^7.10.4",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-replace": "^2.3.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^8.0.0",
     "@types/jasmine": "^3.5.11",
     "@types/node": "^20.16.5",
@@ -82,7 +82,6 @@
     "rollup-plugin-license": "^2.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-preprocess": "0.0.4",
-    "rollup-plugin-terser": "^6.1.0",
     "typescript": "^5.6.2",
     "yarpm": "^0.2.1"
   },

package.json

@@ -1,4 +1,4 @@
-import { terser } from "rollup-plugin-terser";
+import terser from "@rollup/plugin-terser";
 import { babel } from "@rollup/plugin-babel";
 import RollupPluginPreprocess from "rollup-plugin-preprocess";
 import resolve from "rollup-plugin-node-resolve";
@@ -37,6 +37,19 @@ const umdExternals = matchSubmodules([
   ...Object.keys(pkg.peerDependencies || {}),
   ...Object.keys(pkg.optionalDependencies || {})
 ]);
+
+const terserOptions = {
+  ecma: 2023,
+  module: true,
+  compress: {
+    ecma: 2023,
+    passes: 2
+  },
+  mangle: {
+    safari10: true
+  }
+};
+
 const externals = matchSubmodules([
   ...Object.keys(pkg.dependencies || {}),
   ...Object.keys(pkg.peerDependencies || {}),
@@ -57,7 +70,7 @@ const umd = {
       file: "dist/jspdf.umd.min.js",
       format: "umd",
       name: "jspdf",
-      plugins: [terser({})],
+      plugins: [terser(terserOptions)],
       exports: "named",
       sourcemap: true
     }
@@ -88,7 +101,7 @@ const es = {
       format: "es",
       name: "jspdf",
       sourcemap: true,
-      plugins: [terser({})]
+      plugins: [terser(terserOptions)]
     }
   ],
   external: externals,
@@ -117,7 +130,7 @@ const node = {
       name: "jspdf",
       exports: "named",
       sourcemap: true,
-      plugins: [terser({})]
+      plugins: [terser(terserOptions)]
     }
   ],
   external: externals,
@@ -136,7 +149,7 @@ const umdPolyfills = {
       file: "dist/polyfills.umd.js",
       format: "umd",
       name: "jspdf-polyfills",
-      plugins: [terser({})]
+      plugins: [terser(terserOptions)]
     }
   ],
   external: [],
@@ -159,7 +172,7 @@ const esPolyfills = {
       file: "dist/polyfills.es.js",
       format: "es",
       name: "jspdf-polyfills",
-      plugins: [terser({})]
+      plugins: [terser(terserOptions)]
     }
   ],
   external: externals,

rollup.config.js

@@ -1,18 +1,6 @@
 import { globalObject } from "./globalObject.js";
 
-var atob, btoa;
-
-(function() {
-  // @if MODULE_FORMAT!='cjs'
-  atob = globalObject.atob.bind(globalObject);
-  btoa = globalObject.btoa.bind(globalObject);
-  return;
-  // @endif
-
-  // @if MODULE_FORMAT='cjs'
-  atob = require("atob");
-  btoa = require("btoa");
-  // @endif
-})();
+const atob = globalObject.atob.bind(globalObject);
+const btoa = globalObject.btoa.bind(globalObject);
 
 export { atob, btoa };

src/libs/AtobBtoa.js

@@ -0,0 +1 @@
+export { decode } from "fast-png";