added Brighten filter

Thorfile

@@ -4,7 +4,7 @@ require 'uglifier'
 class Build < Thor  
   # This is the list of files to concatenate. The first file will appear at the top of the final file. All files are relative to the lib directory.
   FILES = [
-    "src/Global.js", "src/filters/Grayscale.js", "src/util/Type.js", "src/util/Canvas.js", "src/util/Tween.js", "src/util/Transform.js", "src/util/Collection.js",
+    "src/Global.js", "src/filters/Grayscale.js", "src/filters/Brighten.js", "src/util/Type.js", "src/util/Canvas.js", "src/util/Tween.js", "src/util/Transform.js", "src/util/Collection.js",
     "src/Animation.js", "src/Node.js", "src/DragAndDrop.js", "src/Transition.js", "src/Container.js", "src/Stage.js", "src/Layer.js", "src/Group.js", "src/Shape.js",
     "src/shapes/Rect.js", "src/shapes/Circle.js", "src/shapes/Ellipse.js", "src/shapes/Image.js", "src/shapes/Polygon.js", "src/shapes/Text.js", "src/shapes/Line.js", "src/shapes/Sprite.js", "src/shapes/Star.js", "src/shapes/RegularPolygon.js", "src/shapes/Path.js", "src/shapes/TextPath.js"       
   ]

src/filters/Brighten.js

@@ -0,0 +1,16 @@
+/**
+ * Brighten Filter
+ * @function Brighten
+ * @methodOf Kinetic.Filters
+ * @param {Object} config
+ * @param {Integer} config.val brightness number from -255 to 255.  Positive values increase the brightness and negative values decrease the brightness, making the image darker
+ */
+ Kinetic.Filters.Brighten = function(imageData, config) {
+	var brightness = config.val || 0;
+    var data = imageData.data;
+    for(var i = 0; i < data.length; i += 4) {
+        data[i] += brightness;
+        data[i + 1] += brightness;
+        data[i + 2] += brightness;
+    }
+};

src/filters/Grayscale.js

@@ -1,4 +1,9 @@
-Kinetic.Filters.Grayscale = function(imageData) {
+/**
+ * Grayscale Filter
+ * @function Grayscale
+ * @methodOf Kinetic.Filters
+ */
+Kinetic.Filters.Grayscale = function(imageData, config) {
     var data = imageData.data;
     for(var i = 0; i < data.length; i += 4) {
         var brightness = 0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2];

src/shapes/Image.js

@@ -69,7 +69,7 @@ Kinetic.Image.prototype = {
         context.drawImage(this.attrs.image, 0, 0);
         try {
             var imageData = context.getImageData(0, 0, canvas.getWidth(), canvas.getHeight());
-            config.filter(imageData, config);
+            config.filter(imageData, config.config);
             var that = this;
             Kinetic.Type._getImage(imageData, function(imageObj) {
                 that.setImage(imageObj);
@@ -79,7 +79,7 @@ Kinetic.Image.prototype = {
                 }
             });
         } catch(e) {
-            Kinetic.Global.warn('Unable to apply filter.');
+            Kinetic.Global.warn('Unable to apply filter. ' + e.message);
         }
     },
     /**

tests/js/unitTests.js

@@ -1580,8 +1580,7 @@ Test.prototype.tests = {
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'SHAPE - filter image': function(containerId) {
+    'Filters - grayscale image': function(containerId) {
-        var urls = dataUrls['SHAPE - filter image'];
         var imageObj = new Image();
         imageObj.onload = function() {
             var stage = new Kinetic.Stage({
@@ -1609,7 +1608,48 @@ Test.prototype.tests = {
                 filter: Kinetic.Filters.Grayscale,
                 callback: function() {
                     layer.draw();
-                    warn(layer.toDataURL() === urls[0], 'data url is incorrect');
+                    var dataUrl = layer.toDataURL();
+                    //console.log(dataUrl);
+                    warn(dataUrl === dataUrls['Filters - grayscale image'], 'problem with Grayscale filter.');
+                }
+            });
+        };
+        imageObj.src = '../assets/darth-vader.jpg';
+    },
+    'Filters - adjust image brightness': function(containerId) {
+        var imageObj = new Image();
+        imageObj.onload = function() {
+            var stage = new Kinetic.Stage({
+                container: containerId,
+                width: 578,
+                height: 200
+            });
+            var layer = new Kinetic.Layer({
+                throttle: 999
+            });
+            darth = new Kinetic.Image({
+                x: 10,
+                y: 10,
+                image: imageObj,
+                draggable: true
+            });
+
+            layer.add(darth);
+            stage.add(layer);
+
+            test(darth.getWidth() === 438, 'image width should be 438');
+            test(darth.getHeight() === 300, 'image height should be 300');
+
+            darth.applyFilter({
+                filter: Kinetic.Filters.Brighten,
+                config: {
+                	val: 100
+                },
+                callback: function() {
+                    layer.draw();
+                    var dataUrl = layer.toDataURL();
+                    //console.log(dataUrl);
+                    warn(dataUrl === dataUrls['Filters - adjust image brightness'], 'problem with Brighten filter.');
                 }
             });
         };