Merge branch 'SoSocio-master'

Readme.md

@@ -1,9 +1,10 @@
 # vintageJS
-> Add a retro/vintage effect to images using the HTML5 canvas element.
 
+> Add a retro/vintage effect to images using the HTML5 canvas element.
 
 [![npm](https://img.shields.io/npm/v/vintagejs.svg?style=flat-square)]()
 [![npm](https://img.shields.io/npm/l/vintagejs.svg?style=flat-square)]()
+[![Greenkeeper badge](https://badges.greenkeeper.io/rendro/vintageJS.svg)](https://greenkeeper.io/)
 
 ![](header.jpg)
 
@@ -13,7 +14,6 @@
 $ npm install vintagejs
 ```
 
-
 ## How to use
 
 `vintagejs` is a function that takes a source (URL, ImageElement or CanvasElement) and an effect (object with all the options) and returns a Promise that resolves to a result object.

dist/vintage.js

@@ -31,6 +31,7 @@ var defaultEffect = {
   lighten: 0,
   viewfinder: false,
   sepia: false,
+  gray: false,
   brightness: 0,
   contrast: 0
 };
@@ -120,7 +121,8 @@ var applyEffect = function applyEffect(effect) {
       var data = ctx.getImageData(0, 0, width, height);
       var id = data.data.slice(0);
       var sepia = effect.sepia,
-          saturation = effect.saturation;
+          saturation = effect.saturation,
+          gray = effect.gray;
 
 
       for (var i = id.length / 4; i >= 0; --i) {
@@ -139,6 +141,13 @@ var applyEffect = function applyEffect(effect) {
           b = _ref3[2];
         }
 
+        if (gray) {
+          var _ref4 = [r * 0.21 + g * 0.72 + b * 0.07, r * 0.21 + g * 0.72 + b * 0.07, r * 0.21 + g * 0.72 + b * 0.07];
+          r = _ref4[0];
+          g = _ref4[1];
+          b = _ref4[2];
+        }
+
         if (saturation < 1) {
           var avg = (r + g + b) / 3;
           r += (avg - r) * (1 - saturation);
@@ -280,6 +289,7 @@ var loadImage = exports.loadImage = function loadImage(src) {
     img.onload = function () {
       return resolve(img);
     };
+    img.crossOrigin = 'anonymous';
     img.onerror = function (err) {
       return reject(err);
     };