Merge branch 'master' of https://github.com/binoculars/KineticJS into binoculars-master

Conflicts:
	Gruntfile.js
	test/runner.html

Gruntfile.js

@@ -49,8 +49,8 @@ module.exports = function(grunt) {
     'src/filters/Noise.js',
     'src/filters/Pixelate.js',
     'src/filters/Polar.js',
-    'src/filters/Threshold.js'
-
+    'src/filters/Threshold.js',
+    'src/filters/Sepia.js'
   ];
 
   // Project configuration.

src/filters/Sepia.js

@@ -0,0 +1,49 @@
+(function() {
+    /**
+     * Sepia Filter
+	 * Based on: Pixastic Lib - Sepia filter - v0.1.0
+	 * Copyright (c) 2008 Jacob Seidelin, jseidelin@nihilogic.dk, http://blog.nihilogic.dk/
+     * @function
+     * @memberof Kinetic.Filters
+     * @param {Object} imageData
+     * @author Jacob Seidelin <jseidelin@nihilogic.dk>
+     * @license MPL v1.1 [http://www.pixastic.com/lib/license.txt]
+     */
+     
+    Kinetic.Filters.Sepia = function(imageData) {
+        var data = imageData.data,
+			w = imageData.width,
+			y = imageData.height,
+			w4 = w*4,
+			offsetY,
+			x,
+			offset,
+			or,
+			og,
+			ob,
+			r,
+			g,
+			b;
+		
+		do {
+			offsetY = (y-1)*w4;
+			x = w;
+			do {
+				offset = offsetY + (x-1)*4;
+				
+				or = data[offset];
+				og = data[offset+1];
+				ob = data[offset+2];
+
+				r = or * 0.393 + og * 0.769 + ob * 0.189;
+				g = or * 0.349 + og * 0.686 + ob * 0.168;
+				b = or * 0.272 + og * 0.534 + ob * 0.131;
+
+				data[offset] = r > 255 ? 255 : r;
+				data[offset+1] = g > 255 ? 255 : g;
+				data[offset+2] = b > 255 ? 255 : b;
+			} while (--x);
+		} while (--y);
+    };
+})();
+

test/runner.html

@@ -43,7 +43,7 @@
     <script src="unit/Global-test.js"></script>
     <script src="unit/Util-test.js"></script>
     <script src="unit/Canvas-test.js"></script>
-    <script src="unit/Node-test.js"></script>
+    <script src="unit/Node-test.js"></script> 
     <script src="unit/Container-test.js"></script>
     <script src="unit/Stage-test.js"></script>
     <script src="unit/Layer-test.js"></script>
@@ -90,6 +90,7 @@
     <script src="unit/filters/Levels-test.js"></script>
     <script src="unit/filters/Flip-test.js"></script>
     <script src="unit/filters/Mirror-test.js"></script>
+    <script src="unit/filters/Sepia-test.js"></script>
 
     <!--=============== functional tests ================-->
 
@@ -106,4 +107,4 @@
       else { mocha.run(); }
     </script>
   </body>
-</html>
+</html>

test/unit/filters/Sepia-test.js

@@ -0,0 +1,28 @@
+suite('Sepia', function() {
+    // ======================================================
+    test('basic', function(done) {
+        var stage = addStage();
+
+        var imageObj = new Image();
+        imageObj.onload = function() {
+            
+            var layer = new Kinetic.Layer();
+            darth = new Kinetic.Image({
+                x: 10,
+                y: 10,
+                image: imageObj,
+                draggable: true
+            });
+
+            layer.add(darth);
+            stage.add(layer);
+
+            darth.setFilter(Kinetic.Filters.Sepia);
+            layer.draw();
+
+            done();
+        };
+        imageObj.src = 'assets/darth-vader.jpg';
+
+    });
+});