Use Buffer.alloc() if available

Author: metafloor

README.md

@@ -23,7 +23,7 @@ found at the end of this document.
 
 ## Status 
 
-* Current bwip-js version is 1.7.3 (2019-04-23)
+* Current bwip-js version is 1.7.4 (2019-10-30)
 * Current BWIPP version is 2018-02-04
 * Node.js compatibility: 0.12+
 * Browser compatibility: IE10+, Edge, Firefox, Chrome

browser-bitmap.js

@@ -8,9 +8,11 @@
 // for the extended copyright notice.
 "use strict";
 
-module.exports = Bitmap;
+if (typeof module == 'object' && typeof exports == 'object') {
+	module.exports = Bitmap;
+}
 
-// bgcolor is optional, defaults to #fff
+// bgcolor is optional, defaults to transparent
 function Bitmap(cvsid, rot, bgcolor) {
 	var rgb  = [0, 0, 0];
 	var padx = 0;	// padding-x
@@ -46,24 +48,32 @@ function Bitmap(cvsid, rot, bgcolor) {
 		cvs.width  = imgwidth + 2*padx;
 		cvs.height = imgheight + 2*pady;
 
-		// Convert from cmyk?
-		if (bgcolor && bgcolor.length == 8) {
-			var c = parseInt(bgcolor.substr(0,2), 16) / 255;
-			var m = parseInt(bgcolor.substr(2,2), 16) / 255;
-			var y = parseInt(bgcolor.substr(4,2), 16) / 255;
-			var k = parseInt(bgcolor.substr(6,2), 16) / 255;
-			var r = Math.floor((1-c) * (1-k) * 255);
-			var g = Math.floor((1-m) * (1-k) * 255);
-			var b = Math.floor((1-y) * (1-k) * 255);
-			bgcolor = 'rgb(' + r + ',' + g + ',' + b + ')';
-		} else if (bgcolor) {
-			bgcolor = '#' + bgcolor;
-		}
-
 		ctx = cvs.getContext('2d');
-		ctx.fillStyle = bgcolor || '#fff';
-		ctx.fillRect(0, 0, cvs.width, cvs.height);
-		ctx.fillStyle = '#000';
+
+		// Convert from BWIPP cmyk?
+		if (typeof bgcolor == 'string') {
+			if (/^[0-9a-fA-F]{8}$/.test(bgcolor)) {
+				var c = parseInt(bgcolor.substr(0,2), 16) / 255;
+				var m = parseInt(bgcolor.substr(2,2), 16) / 255;
+				var y = parseInt(bgcolor.substr(4,2), 16) / 255;
+				var k = parseInt(bgcolor.substr(6,2), 16) / 255;
+				var r = Math.floor((1-c) * (1-k) * 255);
+				var g = Math.floor((1-m) * (1-k) * 255);
+				var b = Math.floor((1-y) * (1-k) * 255);
+				bgcolor = 'rgb(' + r + ',' + g + ',' + b + ')';
+			// Convert from BWIPP rgb?
+			} else if (/^[0-9a-fA-F]{6}$/.test(bgcolor)) {
+				bgcolor = '#' + bgcolor;
+			} else {
+				bgcolor = '';
+			}
+			if (bgcolor) {
+				var fill = ctx.fillStyle;
+				ctx.fillStyle = bgcolor;
+				ctx.fillRect(0, 0, cvs.width, cvs.height);
+				ctx.fillStyle = fill;
+			}
+		}
 
 		idata = ctx.getImageData(padx, pady, imgwidth, imgheight);
 		bytes = idata.data;
@@ -99,11 +109,11 @@ function Bitmap(cvsid, rot, bgcolor) {
 		bytes[idx+0] = (bytes[idx+0] * (1 - a) + rgb[0] * a)|0;
 		bytes[idx+1] = (bytes[idx+1] * (1 - a) + rgb[1] * a)|0;
 		bytes[idx+2] = (bytes[idx+2] * (1 - a) + rgb[2] * a)|0;
-		bytes[idx+3] = 255;
+		bytes[idx+3] = (bytes[idx+3] * (1 - a) + 255 * a)|0;
 	}
 
 	this.finalize = function(callback) {
 		ctx.putImageData(idata, padx, pady);
-		callback(null, cvsid);
+		callback && callback(null, cvsid);
 	}
 }

browser-bwipjs.js

@@ -78,7 +78,7 @@ module.exports = function toCanvas(cvs, opts, callback) {
 
 	// Override the `backgroundcolor` option.
 	if (vals.backgroundcolor) {
-		bw.bitmap(new Bitmap(cvs, rot, parseInt(''+vals.backgroundcolor, 16)));
+		bw.bitmap(new Bitmap(cvs, rot, vals.backgroundcolor));
 		delete vals.backgroundcolor;
 	} else {
 		bw.bitmap(new Bitmap(cvs, rot));

bwipjs.js

@@ -602,7 +602,7 @@ BWIPJS.prototype.render = function(callback) {
 	}
 }
 
-BWIPJS.VERSION = '1.7.3 (2019-04-23)';
+BWIPJS.VERSION = '1.7.4 (2019-10-30)';
 if (typeof module === 'object' && module.exports) {
 	module.exports = BWIPJS;
 }

demo.html

@@ -14,10 +14,10 @@
 <link rel="stylesheet" type="text/css" href="lib/jquery-ui.min.css">
 <script type="text/javascript" src="bwipp.js"></script>
 <script type="text/javascript" src="bwipjs.js"></script>
+<script type="text/javascript" src="browser-bitmap.js"></script>
 <script type="text/javascript" src="lib/jquery.js"></script>
 <script type="text/javascript" src="lib/jquery-ui.min.js"></script>
 <script type="text/javascript" src="lib/xhr-fonts.js"></script>
-<script type="text/javascript" src="lib/bitmap.js"></script>
 <script type="text/javascript" src="lib/symdesc.js"></script>
 <script type="text/javascript" src="lib/canvas-toblob.js"></script>
 <script type="text/javascript" src="lib/filesaver.js"></script>

node-bitmap.js

@@ -126,7 +126,8 @@ module.exports = function(rot, bgcolor, opts) {
 		if (ncolors <= 256) {
 			// Palette Color
 			_imgrow  = _imgw + 2*_padx + 1;
-			_imgbuf  = new Buffer(_imgrow * (_imgh + 2*_pady));
+			_imgbuf  = Buffer.alloc ? Buffer.alloc(_imgrow * (_imgh + 2*_pady))
+									: new Buffer(_imgrow * (_imgh + 2*_pady));
 			_pngtype = PNGTYPE_PALETTE;
 
 			_palette = [ bgcolor ];
@@ -137,7 +138,8 @@ module.exports = function(rot, bgcolor, opts) {
 		} else {
 			// TrueColor with Alpha
 			_imgrow  = (_imgw + 2*_padx) * 4 + 1;
-			_imgbuf  = new Buffer(_imgrow * (_imgh + 2*_pady));
+			_imgbuf  = Buffer.alloc ? Buffer.alloc(_imgrow * (_imgh + 2*_pady)) 
+									: new Buffer(_imgrow * (_imgh + 2*_pady));
 			_pngtype = PNGTYPE_TRUEALPHA;
 
 			this.set = setTrueAlpha
@@ -324,7 +326,7 @@ module.exports = function(rot, bgcolor, opts) {
 			}
 
 			// Emulate a byte-stream
-			var png = new Buffer(length);
+			var png = Buffer.alloc ? Buffer.alloc(length) : new Buffer(length);
 			var pngoff = 0;	// running offset into the png buffer
 
 			write('\x89PNG\x0d\x0a\x1a\x0a'); // PNG file header

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bwip-js",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "JavaScript barcode generator supporting over 90 types and standards.",
   "main": "node-bwipjs.js",
   "browser": "browser-bwipjs.js",