Merge pull request #13 from jshor/create-file

Create file
jshor · Oct 30, 2018 · 0db8692 · 0db8692
2 parents a1a862f + 17e796a
commit 0db8692
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,6 @@
     "node-pre-gyp"
   ],
   "scripts": {
-    "start": "node ./foo.js",
     "install": "node-pre-gyp install --fallback-to-build",
     "test": "./node_modules/istanbul/lib/cli.js cover _mocha -- -R spec ./src/**/*.test.js",
     "prepublish": "npm ls",

diff --git a/src/__tests__/index.test.js b/src/__tests__/index.test.js
@@ -22,7 +22,7 @@ function getSymbol(obj) {
     option1: obj.option1 || -1,
     option2: obj.option2 || -1,
     option3: obj.option3 || -1,
-    showHumanReadableText: obj.showHumanReadableText || 0
+    showHumanReadableText: obj.showHumanReadableText || 1
     // input_mode: BINARY_MODE,
   };
 }

diff --git a/src/index.js b/src/index.js
@@ -29,7 +29,7 @@ var defaultSymbol = {
   option1: -1,
   option2: -1,
   option3: -1,
-  showHumanReadableText: 1 // show human-readable text
+  showHumanReadableText: true // show human-readable text
   // input_mode: BINARY_MODE,
 };
 
@@ -43,8 +43,8 @@ var defaultSymbol = {
 function validateSymbol(symbologyStruct) {
   var keys = Object.keys(defaultSymbol);
 
-  for(var i=0; i<keys.length; i++) {
-    if(!symbologyStruct[keys[i]]) {
+  for (var i=0; i<keys.length; i++) {
+    if (!symbologyStruct.hasOwnProperty(keys[i])) {
       symbologyStruct[keys[i]] = defaultSymbol[keys[i]];
     }
   }
@@ -146,7 +146,10 @@ function pngRender(bitmap, width, height) {
 exp.createStream = function(symbol, barcodeData, outputType) {
   outputType = outputType || exp.Output.PNG
   symbol.fileName = 'out.' + outputType
-  symbol.outputOptions = 8; // force buffer to write to rendered_data
+
+  if (outputType !== exp.Output.PNG) {
+    symbol.outputOptions = 8; // force buffer to write to rendered_data
+  }
 
   var res = createSymbology(symbol, barcodeData, 'createStream');
 

diff --git a/src/lib/binding.cpp b/src/lib/binding.cpp
@@ -144,8 +144,8 @@ namespace symbology {
     }
 
     // colors
-    copyArgStr(*args[6], (char*)&symbol->fgcolour[0], sizeof(symbol->fgcolour));
-    copyArgStr(*args[7], (char*)&symbol->bgcolour[0], sizeof(symbol->bgcolour));
+    copyArgStr(*args[6], (char*)&symbol->bgcolour[0], sizeof(symbol->bgcolour));
+    copyArgStr(*args[7], (char*)&symbol->fgcolour[0], sizeof(symbol->fgcolour));
 
     // file name to render
     copyArgStr(*args[8], (char*)&symbol->outfile[0], sizeof(symbol->outfile));

diff --git a/src/lib/zint/png.c b/src/lib/zint/png.c
@@ -456,20 +456,18 @@ int png_to_file(struct zint_symbol *symbol, int image_height, int image_width, c
 		}
 	}
 
-  /**
-   * Commented out since we want to force a BMP pixel plot for Symbology.js
-   */
-  /*
 	if(image_type == PNG_DATA) {
 #ifndef NO_PNG
 		error_number = png_pixel_plot(symbol, scale_height, scale_width, scaled_pixelbuf, rotate_angle);
 #else
 		return ZERROR_INVALID_OPTION;
 #endif
-	} else {
-  */
-	  error_number = bmp_pixel_plot(symbol, scale_height, scale_width, scaled_pixelbuf, rotate_angle);
-	/* } */
+	}
+
+  /**
+   * force BMP pixel plot for Symbology.js
+   */
+	error_number = bmp_pixel_plot(symbol, scale_height, scale_width, scaled_pixelbuf, rotate_angle);
 
 	free(scaled_pixelbuf);