imagemagick-native - npm Package Compare versions

Comparing version 1.2.2 to 1.3.0

package.json

@@ -10,3 +10,3 @@ {
   ],
-  "version": "1.2.2",
+  "version": "1.3.0",
   "repository": {
@@ -20,3 +20,3 @@ "type": "git",
   "scripts": {
-    "test": "node test/test.js",
+    "test": "tap test/test.js",
     "install": "node-gyp rebuild"
@@ -23,0 +23,0 @@ },

test/benchmark.js

@@ -9,4 +9,3 @@ var ben       = require('ben')
 
-var file  = "./test/test.jpg";
-
+var file  = process.argv[2];
 var body  = require('fs').readFileSync( file );
@@ -36,2 +35,5 @@
         format: 'JPEG',
+        filter: 'Lagrange',
+        blur: 0.8,
+        strip: true,
         debug: debug
@@ -47,6 +49,7 @@ });
     function (callback) {
-        console.log( "before resize: ", process.memoryUsage() );
+        // console.log( "before resize: ", process.memoryUsage() );
         callback();
     },
     function (callback) {
+        // callback();
         ben.async( resize, function (ms) {
@@ -58,3 +61,3 @@ console.log( "resize: " + ms + "ms per iteration" );
     function (callback) {
-        console.log( "after resize: ", process.memoryUsage() );
+        // console.log( "after resize: ", process.memoryUsage() );
         callback();
@@ -66,6 +69,7 @@ },
     function (callback) {
-        console.log( "after resize_native 1st: ", process.memoryUsage() );
+        // console.log( "after resize_native 1st: ", process.memoryUsage() );
         callback();
     },
     function (callback) {
+        // callback();
         ben.async( resize_native, function (ms) {
@@ -77,3 +81,3 @@ console.log( "resize_native: " + ms + "ms per iteration" );
     function (callback) {
-        console.log( "after resize_native: ", process.memoryUsage() );
+        // console.log( "after resize_native: ", process.memoryUsage() );
         callback();
@@ -80,0 +84,0 @@ },

test/test.js

@@ -33,3 +33,3 @@ var test        = require('tap').test
         buffer = imagemagick.convert({
-            srcData: require('fs').readFileSync( "./test/test.png" ), // 58x66
+            srcData: require('fs').readFileSync( "test.png" ), // 58x66
             width: 100,
@@ -53,3 +53,3 @@ height: 100,
         imagemagick.convert({
-            srcData: require('fs').readFileSync( "./test/test.png", 'binary' ),
+            srcData: require('fs').readFileSync( "test.png", 'binary' ),
             width: 100,
@@ -69,5 +69,69 @@ height: 100,
 
+test( 'convert filter not supported', function (t) {
+    var buffer;
+    try {
+        imagemagick.convert({
+            srcData: require('fs').readFileSync( "test.png" ),
+            width: 100,
+            height: 100,
+            quality: 80,
+            format: 'PNG',
+            filter: 'Lagrang', // typo
+            debug: debug
+        });
+    } catch (e) {
+        t.equal( e.message, "filter not supported" );
+    }
+    t.equal( buffer, undefined, 'buffer undefined' );
+    t.end();
+});
+
+test( 'convert filter Lagrange', function (t) {
+    var buffer = imagemagick.convert({
+        srcData: require('fs').readFileSync( "test.png" ), // 58x66
+        width: 100,
+        height: 100,
+        filter: 'Lagrange',
+        quality: 80,
+        format: 'PNG',
+        debug: debug
+    });
+    t.equal( Buffer.isBuffer(buffer), true, 'buffer is Buffer' );
+    saveToFileIfDebug( buffer, "out.png-lagrange.png" );
+    t.end();
+});
+
+test( 'convert blur', function (t) {
+    var buffer = imagemagick.convert({
+        srcData: require('fs').readFileSync( "test.png" ), // 58x66
+        width: 100,
+        height: 100,
+        quality: 80,
+        format: 'PNG',
+        blur: 0.8,
+        debug: debug
+    });
+    t.equal( Buffer.isBuffer(buffer), true, 'buffer is Buffer' );
+    saveToFileIfDebug( buffer, "out.png-blur.png" );
+    t.end();
+});
+
+test( 'convert strip', function (t) {
+    var buffer = imagemagick.convert({
+        srcData: require('fs').readFileSync( "test.png" ),
+        width: 100,
+        height: 100,
+        quality: 80,
+        format: 'PNG',
+        strip: true,
+        debug: debug
+    });
+    t.equal( Buffer.isBuffer(buffer), true, 'buffer is Buffer' );
+    saveToFileIfDebug( buffer, "out.png-strip.png" );
+    t.end();
+});
+
 test( 'convert png -> png aspectfill', function (t) {
     var buffer = imagemagick.convert({
-        srcData: require('fs').readFileSync( "./test/test.png" ), // 58x66
+        srcData: require('fs').readFileSync( "test.png" ), // 58x66
         width: 100,
@@ -82,3 +146,3 @@ height: 100,
     // t.equal( buffer.length, 9545, 'converted buffer size ok' );
-    saveToFileIfDebug( buffer, "./test/out.png-aspectfill.png" );
+    saveToFileIfDebug( buffer, "out.png-aspectfill.png" );
     t.end();
@@ -89,3 +153,3 @@ });
     var buffer = imagemagick.convert({
-        srcData: require('fs').readFileSync( "./test/test.png" ),
+        srcData: require('fs').readFileSync( "test.png" ),
         width: 100,
@@ -99,3 +163,3 @@ height: 100,
     // t.equal( buffer.length, 2295, 'converted buffer size ok' );
-    saveToFileIfDebug( buffer, "./test/out.png-aspectfill.jpg" );
+    saveToFileIfDebug( buffer, "out.png-aspectfill.jpg" );
     t.end();
@@ -106,3 +170,3 @@ });
     var buffer = imagemagick.convert({
-        srcData: require('fs').readFileSync( "./test/test.wide.png" ),
+        srcData: require('fs').readFileSync( "test.wide.png" ),
         width: 100,
@@ -116,3 +180,3 @@ height: 100,
     // t.equal( buffer.length, 9615, 'converted buffer size ok' );
-    saveToFileIfDebug( buffer, "./test/out.wide.png-aspectfill.png" );
+    saveToFileIfDebug( buffer, "out.wide.png-aspectfill.png" );
     t.end();
@@ -123,3 +187,3 @@ });
     var buffer = imagemagick.convert({
-        srcData: require('fs').readFileSync( "./test/test.jpg" ),
+        srcData: require('fs').readFileSync( "test.jpg" ),
         width: 100,
@@ -134,3 +198,3 @@ height: 100,
     // t.equal( buffer.length, 3184, 'converted buffer size ok' );
-    saveToFileIfDebug( buffer, "./test/out.jpg-fill.jpg" );
+    saveToFileIfDebug( buffer, "out.jpg-fill.jpg" );
     t.end();
@@ -141,3 +205,3 @@ });
     var buffer = imagemagick.convert({
-        srcData: require('fs').readFileSync( "./test/test.jpg" ),
+        srcData: require('fs').readFileSync( "test.jpg" ),
         width: 100,
@@ -152,3 +216,3 @@ height: 100,
     // t.equal( buffer.length, 3012, 'converted buffer size ok' );
-    saveToFileIfDebug( buffer, "./test/out.jpg-aspectfit.jpg" );
+    saveToFileIfDebug( buffer, "out.jpg-aspectfit.jpg" );
     t.end();
@@ -158,3 +222,3 @@ });
 test( 'convert broken png', function (t) {
-    var srcData = require('fs').readFileSync( "./test/broken.png" )
+    var srcData = require('fs').readFileSync( "broken.png" )
     , buffer;
@@ -179,33 +243,34 @@
 
-if (versions[1] > 6) {
-    test( 'convert too wide jpg', function (t) {
-        var srcData = require('fs').readFileSync( "./test/test.maxmemory.jpg" )
-        , buffer
-        , seenError = 0;
+// segmentation faults on Mac...
+// if (versions[1] > 6) {
+//     test( 'convert too wide jpg', function (t) {
+//         var srcData = require('fs').readFileSync( "test.maxmemory.jpg" )
+//         , buffer
+//         , seenError = 0;
 
-        try {
-            buffer = imagemagick.convert({
-                srcData: srcData,
-                width: 640,
-                height: 960,
-                resizeStyle: "aspectfill",
-                quality: 80,
-                format: 'JPEG',
-                maxMemory: 100 * 1000, // 100kB
-                debug: debug
-            });
-        } catch (e) {
-            seenError = 1;
-            t.similar( e.message,
-                       new RegExp("cache resources exhausted") );
-        }
-        saveToFileIfDebug( buffer, "./test/out.jpg-maxmemory.jpg" );
-        t.equal( seenError, 1 );
-        t.end();
-    });
-}
+//         try {
+//             buffer = imagemagick.convert({
+//                 srcData: srcData,
+//                 width: 640,
+//                 height: 960,
+//                 resizeStyle: "aspectfill",
+//                 quality: 80,
+//                 format: 'JPEG',
+//                 maxMemory: 100 * 1000, // 100kB
+//                 debug: debug
+//             });
+//         } catch (e) {
+//             seenError = 1;
+//             t.similar( e.message,
+//                        new RegExp("cache resources exhausted") );
+//         }
+//         saveToFileIfDebug( buffer, "out.jpg-maxmemory.jpg" );
+//         t.equal( seenError, 1 );
+//         t.end();
+//     });
+// }
 
 test( 'convert to rotate 90 degrees', function (t) {
   var buffer = imagemagick.convert({
-    srcData: require('fs').readFileSync( "./test/test.jpg" ),
+    srcData: require('fs').readFileSync( "test.jpg" ),
     rotate: 90,
@@ -217,3 +282,3 @@ debug: debug
   t.equal( info.height, 58 );
-  saveToFileIfDebug( buffer, "./test/out.jpg-rotate90.jpg" );
+  saveToFileIfDebug( buffer, "out.jpg-rotate90.jpg" );
   t.end();
@@ -224,3 +289,3 @@ });
   var buffer = imagemagick.convert({
-    srcData: require('fs').readFileSync( "./test/test.jpg" ),
+    srcData: require('fs').readFileSync( "test.jpg" ),
     rotate: -90,
@@ -232,3 +297,3 @@ debug: debug
   t.equal( info.height, 58 );
-  saveToFileIfDebug( buffer, "./test/out.jpg-rotate-90.jpg" );
+  saveToFileIfDebug( buffer, "out.jpg-rotate-90.jpg" );
   t.end();
@@ -254,3 +319,3 @@ });
         buffer = imagemagick.identify({
-            srcData: require('fs').readFileSync( "./test/test.png", 'binary' )
+            srcData: require('fs').readFileSync( "test.png", 'binary' )
         });
@@ -266,3 +331,3 @@ } catch (e) {
     var info = imagemagick.identify({
-        srcData: require('fs').readFileSync( "./test/test.png" )
+        srcData: require('fs').readFileSync( "test.png" )
     });
@@ -294,3 +359,3 @@ t.equal( info.width, 58, 'width is 58' );
         buffer = imagemagick.quantizeColors({
-            srcData: require('fs').readFileSync( "./test/test.png", 'binary' )
+            srcData: require('fs').readFileSync( "test.png", 'binary' )
         });
@@ -306,3 +371,3 @@ } catch (e) {
     var results = imagemagick.quantizeColors({
-        srcData: require('fs').readFileSync( "./test/test.quantizeColors.png" ),
+        srcData: require('fs').readFileSync( "test.quantizeColors.png" ),
         colors: 1
@@ -322,3 +387,3 @@ });
     var results = imagemagick.quantizeColors({
-        srcData: require('fs').readFileSync( "./test/test.quantizeColors.png" )
+        srcData: require('fs').readFileSync( "test.quantizeColors.png" )
     });
@@ -371,3 +436,3 @@
         buffer = imagemagick.composite({
-            srcData: require('fs').readFileSync( "./test/test.png", 'binary' )
+            srcData: require('fs').readFileSync( "test.png", 'binary' )
         });
@@ -385,4 +450,4 @@ } catch (e) {
         buffer = imagemagick.composite({
-            srcData: require('fs').readFileSync( "./test/test.quantizeColors.png" ),
-            compositeData: require('fs').readFileSync("./test/test.png","binary")
+            srcData: require('fs').readFileSync( "test.quantizeColors.png" ),
+            compositeData: require('fs').readFileSync("test.png","binary")
         });
@@ -398,4 +463,4 @@ } catch (e) {
 
-	var srcData = require('fs').readFileSync( "./test/test.quantizeColors.png" );
-	var compositeData = require('fs').readFileSync( "./test/test.png" );
+	var srcData = require('fs').readFileSync( "test.quantizeColors.png" );
+	var compositeData = require('fs').readFileSync( "test.png" );
 
@@ -413,3 +478,3 @@ var buffer = imagemagick.composite({
 test( 'get pixel colors: pixel colors from each 6x6 square', function(t) {
-    var srcData = require('fs').readFileSync("./test/test.getPixelColor.png");
+    var srcData = require('fs').readFileSync("test.getPixelColor.png");
 
@@ -416,0 +481,0 @@ var targetInfo = {

No alert changes

Improved metrics

Total package byte prevSize

2434509

increased by1629.77%

Number of package files

25

increased by25%

Lines of code

601

increased by12.34%

Number of lines in readme file

240

increased by2.56%

Worsened metrics

Number of low supply chain risk alerts

29

increased by11.54%

No dependency changes