image-js 0.35.2 → 0.35.3

package/lib/image/core/export.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = setExportMethods;
-
 var _blobUtil = require("blob-util");
-
 var _fastBmp = require("fast-bmp");
-
 var _fastPng = require("fast-png");
-
 var _jpegJs = require("jpeg-js");
-
 var _base = require("../../util/base64");
-
 var _environment = require("./environment");
-
 var _mediaTypes = require("./mediaTypes");
-
 function encodeJpeg(image, options = {}) {
   const data = {
     width: image.width,
@@ -27,7 +19,6 @@ function encodeJpeg(image, options = {}) {
   };
   return (0, _jpegJs.encode)(data, options.quality).data;
 }
-
 function encodePng(image, options) {
   const data = {
     width: image.width,
@@ -36,16 +27,13 @@ function encodePng(image, options) {
     depth: image.bitDepth,
     data: image.data
   };
-
   if (data.depth === 1 || data.depth === 32) {
     data.depth = 8;
     data.channels = 4;
     data.data = image.getRGBAData();
   }
-
   return (0, _fastPng.encode)(data, options);
 }
-
 const exportMethods = {
   /**
    * Save the image to disk (Node.js only)
@@ -66,23 +54,18 @@ const exportMethods = {
     let {
       format
     } = options;
-
     if (!format) {
       // try to infer format from filename
       const m = /\.(?<format>[a-zA-Z]+)$/.exec(path);
-
       if (m) {
         format = m.groups.format.toLowerCase();
       }
     }
-
     if (!format) {
       throw new Error('file format not provided');
     }
-
     return new Promise((resolve, reject) => {
       let stream, buffer;
-
       switch (format.toLowerCase()) {
         case 'png':
           {
@@ -91,10 +74,8 @@ const exportMethods = {
             } else {
               buffer = encodePng(this, encoderOptions);
             }
-
             break;
           }
-
         case 'jpg':
         case 'jpeg':
           if (useCanvas) {
@@ -102,17 +83,13 @@ const exportMethods = {
           } else {
             buffer = encodeJpeg(this, encoderOptions);
           }
-
           break;
-
         case 'bmp':
           buffer = (0, _fastBmp.encode)(this, encoderOptions);
           break;
-
         default:
           throw new RangeError(`invalid output format: ${format}`);
       }
-
       if (stream) {
         let out = (0, _environment.createWriteStream)(path);
         out.on('finish', resolve);
@@ -124,13 +101,11 @@ const exportMethods = {
             reject(err);
             return;
           }
-
           resolve();
         });
       }
     });
   },
-
   /**
    * Creates a dataURL string from the image.
    * @memberof Image
@@ -146,18 +121,15 @@ const exportMethods = {
       options = type;
       type = 'image/png';
     }
-
     const {
       useCanvas = false,
       encoder: encoderOptions = undefined
     } = options;
     type = (0, _mediaTypes.getType)(type);
-
     function dataUrl(encoder, ctx) {
       const u8 = encoder(ctx, encoderOptions);
       return (0, _base.toBase64URL)(u8, type);
     }
-
     if (type === 'image/bmp') {
       return dataUrl(_fastBmp.encode, this);
     } else if (type === 'image/png' && !useCanvas) {
@@ -168,7 +140,6 @@ const exportMethods = {
       return this.getCanvas().toDataURL(type);
     }
   },
-
   /**
    * Encodes the image and returns a buffer
    * @memberof Image
@@ -183,23 +154,18 @@ const exportMethods = {
       format = 'png',
       encoder: encoderOptions = undefined
     } = options;
-
     switch (format.toLowerCase()) {
       case 'png':
         return encodePng(this, encoderOptions);
-
       case 'jpeg':
       case 'jpg':
         return encodeJpeg(this, encoderOptions);
-
       case 'bmp':
         return (0, _fastBmp.encode)(this, encoderOptions);
-
       default:
         throw new RangeError(`invalid output format: ${format}`);
     }
   },
-
   /**
    * Creates a base64 string from the image.
    * @memberof Image
@@ -218,7 +184,6 @@ const exportMethods = {
       return dataURL.substring(dataURL.indexOf(',') + 1);
     }
   },
-
   /**
    * Creates a blob from the image and return a Promise.
    * This function is only available in the browser.
@@ -231,7 +196,6 @@ const exportMethods = {
   toBlob(type = 'image/png', quality = 0.8) {
     return (0, _blobUtil.canvasToBlob)(this.getCanvas(), type, quality);
   },
-
   /**
    * Creates a new canvas element and draw the image inside it
    * @memberof Image
@@ -247,9 +211,7 @@ const exportMethods = {
     ctx.putImageData(data, 0, 0);
     return canvas;
   }
-
 };
-
 function setExportMethods(Image) {
   for (const i in exportMethods) {
     Image.prototype[i] = exportMethods[i];

package/lib/image/core/extend.js

@@ -5,36 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extendMethod = extendMethod;
 exports.extendProperty = extendProperty;
-
 var _hasOwn = _interopRequireDefault(require("has-own"));
-
 var _Image = _interopRequireDefault(require("../Image"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 let computedPropertyDescriptor = {
   configurable: true,
   enumerable: false,
   get: undefined
 };
-
 function extendMethod(name, method, options = {}) {
   let {
     inPlace = false,
     returnThis = true,
     partialArgs = []
   } = options;
-
   if (inPlace) {
     _Image.default.prototype[name] = function (...args) {
       // remove computed properties
       this.computed = null;
       let result = method.apply(this, [...partialArgs, ...args]);
-
       if (returnThis) {
         return this;
       }
-
       return result;
     };
   } else {
@@ -42,27 +34,22 @@ function extendMethod(name, method, options = {}) {
       return method.apply(this, [...partialArgs, ...args]);
     };
   }
-
   return _Image.default;
 }
-
 function extendProperty(name, method, options = {}) {
   let {
     partialArgs = []
   } = options;
-
   computedPropertyDescriptor.get = function () {
     if (this.computed === null) {
       this.computed = {};
     } else if ((0, _hasOwn.default)(name, this.computed)) {
       return this.computed[name];
     }
-
     let result = method.apply(this, partialArgs);
     this.computed[name] = result;
     return result;
   };
-
   Object.defineProperty(_Image.default.prototype, name, computedPropertyDescriptor);
   return _Image.default;
 }

package/lib/image/core/getRGBAData.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getRGBAData;
-
 var _model = require("../model/model");
-
 /**
  * Retrieve the data of the current image as RGBA 8 bits
  * The source image may be:
@@ -29,14 +27,12 @@ function getRGBAData(options = {}) {
   });
   const arrayLength = this.width * this.height * 4;
   let newData = clamped ? new Uint8ClampedArray(arrayLength) : new Uint8Array(arrayLength);
-
   if (this.bitDepth === 1) {
     fillDataFromBinary(this, newData);
   } else if (this.bitDepth === 32) {
     this.checkProcessable('getRGBAData', {
       alpha: 0
     });
-
     if (this.components === 1) {
       fillDataFromGrey32(this, newData);
     } else if (this.components === 3) {
@@ -55,7 +51,6 @@ function getRGBAData(options = {}) {
       fillDataFromRGB(this, newData);
     }
   }
-
   if (this.alpha === 1) {
     this.checkProcessable('getRGBAData', {
       bitDepth: [8, 16]
@@ -64,10 +59,8 @@ function getRGBAData(options = {}) {
   } else {
     fillAlpha(this, newData);
   }
-
   return newData;
 }
-
 function fillDataFromBinary(image, newData) {
   for (let i = 0; i < image.size; i++) {
     const value = image.getBit(i);
@@ -76,12 +69,10 @@ function fillDataFromBinary(image, newData) {
     newData[i * 4 + 2] = value * 255;
   }
 }
-
 function fillDataFromGrey32(image, newData) {
   const min = image.min[0];
   const max = image.max[0];
   const range = max - min;
-
   for (let i = 0; i < image.size; i++) {
     const val = Math.floor(255 * (image.data[i] - min) / range);
     newData[i * 4] = val;
@@ -89,12 +80,10 @@ function fillDataFromGrey32(image, newData) {
     newData[i * 4 + 2] = val;
   }
 }
-
 function fillDataFromRGB32(image, newData) {
   const min = Math.min(...image.min);
   const max = Math.max(...image.max);
   const range = max - min;
-
   for (let i = 0; i < image.size; i++) {
     const val1 = Math.floor(255 * (image.data[i * 3] - min) / range);
     const val2 = Math.floor(255 * (image.data[i * 3 + 1] - min) / range);
@@ -104,7 +93,6 @@ function fillDataFromRGB32(image, newData) {
     newData[i * 4 + 2] = val3;
   }
 }
-
 function fillDataFromGrey(image, newData) {
   for (let i = 0; i < image.size; i++) {
     newData[i * 4] = image.data[i * image.channels] >>> image.bitDepth - 8;
@@ -112,7 +100,6 @@ function fillDataFromGrey(image, newData) {
     newData[i * 4 + 2] = image.data[i * image.channels] >>> image.bitDepth - 8;
   }
 }
-
 function fillDataFromRGB(image, newData) {
   for (let i = 0; i < image.size; i++) {
     newData[i * 4] = image.data[i * image.channels] >>> image.bitDepth - 8;
@@ -120,13 +107,11 @@ function fillDataFromRGB(image, newData) {
     newData[i * 4 + 2] = image.data[i * image.channels + 2] >>> image.bitDepth - 8;
   }
 }
-
 function copyAlpha(image, newData) {
   for (let i = 0; i < image.size; i++) {
     newData[i * 4 + 3] = image.data[i * image.channels + image.components] >> image.bitDepth - 8;
   }
 }
-
 function fillAlpha(image, newData) {
   for (let i = 0; i < image.size; i++) {
     newData[i * 4 + 3] = 255;

package/lib/image/core/kind.js

@@ -7,15 +7,10 @@ exports.createPixelArray = createPixelArray;
 exports.getKind = getKind;
 exports.getTheoreticalPixelArraySize = getTheoreticalPixelArraySize;
 exports.verifyKindDefinition = verifyKindDefinition;
-
 var ColorModel = _interopRequireWildcard(require("../model/model"));
-
 var Kind = _interopRequireWildcard(require("./kindNames"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const kinds = {};
 kinds[Kind.BINARY] = {
   components: 1,
@@ -59,19 +54,14 @@ kinds[Kind.CMYKA] = {
   bitDepth: 8,
   colorModel: ColorModel.CMYK
 };
-
 function getKind(kind) {
   const result = kinds[kind];
-
   if (!result) {
     throw new RangeError(`invalid image kind: ${kind}`);
   }
-
   return result;
 }
-
 const validBitDepth = [1, 8, 16, 32];
-
 function verifyKindDefinition(definition) {
   const {
     components,
@@ -79,66 +69,52 @@ function verifyKindDefinition(definition) {
     bitDepth,
     colorModel
   } = definition;
-
   if (!Number.isInteger(components) || components <= 0) {
     throw new RangeError(`invalid components: ${components}. Must be a positive integer`);
   }
-
   if (alpha !== 0 && alpha !== 1 && typeof alpha !== 'boolean') {
     throw new TypeError(`invalid alpha: ${alpha}: must be a boolean, 0 or 1`);
   }
-
   if (!validBitDepth.includes(bitDepth)) {
     throw new RangeError(`invalid bitDepth: ${bitDepth}. Must be one of ${validBitDepth.join(', ')}`);
-  } // eslint-disable-next-line import/namespace
-
-
+  }
+  // eslint-disable-next-line import/namespace
   if (!ColorModel[colorModel]) {
     throw new RangeError(`invalid colorModel: ${colorModel}. Must be one of ${Object.keys(ColorModel).join(', ')}`);
   }
 }
-
 function getTheoreticalPixelArraySize(size, channels, bitDepth) {
   let length = channels * size;
-
   if (bitDepth === 1) {
     length = Math.ceil(length / 8);
   }
-
   return length;
 }
-
 function createPixelArray(size, components, alpha, channels, bitDepth, maxValue) {
   const length = channels * size;
   let arr;
-
   switch (bitDepth) {
     case 1:
       arr = new Uint8Array(Math.ceil(length / 8));
       break;
-
     case 8:
       arr = new Uint8Array(length);
       break;
-
     case 16:
       arr = new Uint16Array(length);
       break;
-
     case 32:
       arr = new Float32Array(length);
       break;
-
     default:
       throw new Error(`Cannot create pixel array for bit depth ${bitDepth}`);
-  } // alpha channel is 100% by default
-
+  }
 
+  // alpha channel is 100% by default
   if (alpha) {
     for (let i = components; i < arr.length; i += channels) {
       arr[i] = maxValue;
     }
   }
-
   return arr;
 }

package/lib/image/core/kindNames.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RGBA = exports.RGB = exports.GREYA = exports.GREY = exports.CMYKA = exports.CMYK = exports.BINARY = void 0;
 // Shortcuts for common image kinds
+
 const BINARY = 'BINARY';
 exports.BINARY = BINARY;
 const GREY = 'GREY';

package/lib/image/core/load.js

@@ -4,30 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = load;
-
 var _fastJpeg = require("fast-jpeg");
-
 var _fastPng = require("fast-png");
-
 var _imageType = _interopRequireDefault(require("image-type"));
-
 var _jpegJs = require("jpeg-js");
-
 var _tiff = require("tiff");
-
 var _Stack = _interopRequireDefault(require("../../stack/Stack"));
-
 var _base = require("../../util/base64");
-
 var _Image = _interopRequireDefault(require("../Image"));
-
 var _model = require("../model/model");
-
 var _environment = require("./environment");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const isDataURL = /^data:[a-z]+\/(?:[a-z]+);base64,/;
+
 /**
  * Load an image
  * @memberof Image
@@ -42,7 +31,6 @@ const isDataURL = /^data:[a-z]+\/(?:[a-z]+);base64,/;
  * @example
  * const image = await Image.load('https://example.com/image.png');
  */
-
 function load(image, options) {
   if (typeof image === 'string') {
     return loadURL(image, options);
@@ -54,28 +42,21 @@ function load(image, options) {
     throw new Error('argument to "load" must be a string or buffer.');
   }
 }
-
 function loadBinary(image, base64Url, ignorePalette) {
   const type = (0, _imageType.default)(image);
-
   if (type) {
     switch (type.mime) {
       case 'image/png':
         return loadPNG(image);
-
       case 'image/jpeg':
         return loadJPEG(image);
-
       case 'image/tiff':
         return loadTIFF(image, ignorePalette);
-
       default:
         return loadGeneric(getBase64(type.mime));
     }
   }
-
   return loadGeneric(getBase64('application/octet-stream'));
-
   function getBase64(type) {
     if (base64Url) {
       return base64Url;
@@ -84,47 +65,39 @@ function loadBinary(image, base64Url, ignorePalette) {
     }
   }
 }
-
 function loadURL(url, options) {
   const dataURL = url.slice(0, 64).match(isDataURL);
   let binaryDataP;
-
   if (dataURL !== null) {
     binaryDataP = Promise.resolve((0, _base.decode)(url.slice(dataURL[0].length)));
   } else {
     binaryDataP = (0, _environment.fetchBinary)(url, options);
   }
-
   return binaryDataP.then(binaryData => {
     const uint8 = new Uint8Array(binaryData);
     return loadBinary(uint8, dataURL ? url : undefined, options && options.ignorePalette);
   });
 }
-
 function loadPNG(data) {
   const png = (0, _fastPng.decode)(data);
   let channels = png.channels;
   let components;
   let alpha = 0;
-
   if (channels === 2 || channels === 4) {
     components = channels - 1;
     alpha = 1;
   } else {
     components = channels;
   }
-
   if (png.palette) {
     return loadPNGFromPalette(png);
   }
-
   return new _Image.default(png.width, png.height, png.data, {
     components,
     alpha,
     bitDepth: png.depth
   });
 }
-
 function loadPNGFromPalette(png) {
   const pixels = png.width * png.height;
   const channels = png.palette[0].length;
@@ -134,40 +107,32 @@ function loadPNGFromPalette(png) {
   const mask = parseInt('1'.repeat(png.depth), 2);
   const hasAlpha = channels === 4;
   let dataIndex = 0;
-
   for (let i = 0; i < pixels; i++) {
     const index = Math.floor(i / factor);
     let value = png.data[index];
-
     if (png.depth < 8) {
       value = value >>> png.depth * (pixelsPerByte - 1 - i % pixelsPerByte) & mask;
     }
-
     const paletteValue = png.palette[value];
     data[dataIndex++] = paletteValue[0];
     data[dataIndex++] = paletteValue[1];
     data[dataIndex++] = paletteValue[2];
-
     if (hasAlpha) {
       data[dataIndex++] = paletteValue[3];
     }
   }
-
   return new _Image.default(png.width, png.height, data, {
     components: 3,
     alpha: hasAlpha,
     bitDepth: 8
   });
 }
-
 function loadJPEG(data) {
   const decodedExif = (0, _fastJpeg.decode)(data);
   let meta;
-
   if (decodedExif.exif) {
     meta = getMetadata(decodedExif.exif);
   }
-
   const jpeg = (0, _jpegJs.decode)(data, {
     useTArray: true,
     maxMemoryUsageInMB: 1024
@@ -175,10 +140,8 @@ function loadJPEG(data) {
   let image = new _Image.default(jpeg.width, jpeg.height, jpeg.data, {
     meta
   });
-
   if (meta && meta.tiff.tags.Orientation) {
     const orientation = meta.tiff.tags.Orientation;
-
     if (orientation > 2) {
       image = image.rotate({
         3: 180,
@@ -189,18 +152,14 @@ function loadJPEG(data) {
         8: 270
       }[orientation]);
     }
-
     if ([2, 4, 5, 7].includes(orientation)) {
       image = image.flipX();
     }
   }
-
   return image;
 }
-
 function loadTIFF(data, ignorePalette) {
   let result = (0, _tiff.decode)(data);
-
   if (result.length === 1) {
     return getImageFromIFD(result[0], ignorePalette);
   } else {
@@ -209,7 +168,6 @@ function loadTIFF(data, ignorePalette) {
     }));
   }
 }
-
 function getMetadata(image) {
   const metadata = {
     tiff: {
@@ -217,25 +175,20 @@ function getMetadata(image) {
       tags: image.map
     }
   };
-
   if (image.exif) {
     metadata.exif = image.exif;
   }
-
   if (image.gps) {
     metadata.gps = image.gps;
   }
-
   return metadata;
 }
-
 function getImageFromIFD(image, ignorePalette) {
   if (!ignorePalette && image.type === 3) {
     // Palette
     const data = new Uint16Array(3 * image.width * image.height);
     const palette = image.palette;
     let ptr = 0;
-
     for (let i = 0; i < image.data.length; i++) {
       const index = image.data[i];
       const color = palette[index];
@@ -243,7 +196,6 @@ function getImageFromIFD(image, ignorePalette) {
       data[ptr++] = color[1];
       data[ptr++] = color[2];
     }
-
     return new _Image.default(image.width, image.height, data, {
       components: 3,
       alpha: image.alpha,
@@ -261,12 +213,10 @@ function getImageFromIFD(image, ignorePalette) {
     });
   }
 }
-
 function loadGeneric(url, options) {
   options = options || {};
   return new Promise(function (resolve, reject) {
     let image = new _environment.DOMImage();
-
     image.onload = function () {
       let w = image.width;
       let h = image.height;
@@ -276,11 +226,9 @@ function loadGeneric(url, options) {
       let data = ctx.getImageData(0, 0, w, h).data;
       resolve(new _Image.default(w, h, data, options));
     };
-
     image.onerror = function () {
       reject(new Error(`Could not load ${url}`));
     };
-
     image.src = url;
   });
 }