fix index in pyimage and grunt build

amrdraz · amrdraz · commit 5adbb99b977e · 2015-12-14T02:52:05.000+02:00
diff --git a/client/scripts/image/pyimage.js b/client/scripts/image/pyimage.js
@@ -177,7 +177,7 @@
         imageData.setPixelData = function setPixelData (data) {
             var pixelData = imgData.pixelData = []
             for (var i = 0; i < imgData.data.length;i+=4){
-                pixel = Pixel(imgData.data, i);
+                pixel = Pixel(imgData.data, i/4);
                 pixelData.push(pixel);
             }
         }
diff --git a/grunt/tasks/build.js b/grunt/tasks/build.js
@@ -12,7 +12,7 @@ var taskConfig = function(grunt) {
     'copy:dist',
     'concurrent',
     'useminPrepare',
-    'concat:generated',
+    'concat',
     'cssmin',
     'autoprefixer:dist',
     'usemin',
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "grunt-contrib-copy": "~0.7.0",
     "grunt-contrib-cssmin": "~0.10.0",
     "grunt-contrib-htmlmin": "~0.3.0",
-    "grunt-contrib-imagemin": "~0.9.1",
+    "grunt-contrib-imagemin": "~1.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-uglify": "~0.6.0",
     "grunt-contrib-watch": "~0.6.1",

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@`
`177`	`177`	`imageData.setPixelData = function setPixelData (data) {`
`178`	`178`	`var pixelData = imgData.pixelData = []`
`179`	`179`	`for (var i = 0; i < imgData.data.length;i+=4){`
`180`		`- pixel = Pixel(imgData.data, i);`
	`180`	`+ pixel = Pixel(imgData.data, i/4);`
`181`	`181`	`pixelData.push(pixel);`
`182`	`182`	`}`
`183`	`183`	`}`