version 0.7

gabrielarchanjo · Dec 12, 2017 · 35da1f2 · 35da1f2
1 parent 51f33ca
commit 35da1f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/marvinj/release/marvinjs-x.y.js → marvinj/release/marvinj-0.7.js b/marvinj/release/marvinjs-x.y.js → marvinj/release/marvinj-0.7.js
@@ -271,12 +271,12 @@ MarvinImage.copyColorArray = function(imgSource, imgDestine){
 	if(imgSource.getColorModel() == imgDestine.getColorModel()){
 		switch(imgSource.getColorModel()){
 			case MarvinImage.COLOR_MODEL_RGB:
-				for(var i in imgSource.imageData.data){
+				for(var i=0; i<imgSource.imageData.data.length; i++){
 					imgDestine.imageData.data[i] = imgSource.imageData.data[i];
 				}
 				break;
 			case MarvinImage.COLOR_MODEL_BINARY:
-				for(var i in imgSource.arrBinaryColor){
+				for(var i=0; i<imgSource.arrBinaryColor.length; i++){
 					imgDestine.arrBinaryColor[i] = imgSource.arrBinaryColor[i];
 				}
 				break;

diff --git a/marvinj/src/image/MarvinImage.js b/marvinj/src/image/MarvinImage.js
@@ -150,10 +150,14 @@ MarvinImage.copyColorArray = function(imgSource, imgDestine){
 	if(imgSource.getColorModel() == imgDestine.getColorModel()){
 		switch(imgSource.getColorModel()){
 			case MarvinImage.COLOR_MODEL_RGB:
-				imgDestine.imageData.data = imgSource.imageData.data.slice(0);
+				for(var i=0; i<imgSource.imageData.data.length; i++){
+					imgDestine.imageData.data[i] = imgSource.imageData.data[i];
+				}
 				break;
 			case MarvinImage.COLOR_MODEL_BINARY:
-				imgDestine.arrBinaryColor = imgSource.arrBinaryColor.slice(0);
+				for(var i=0; i<imgSource.arrBinaryColor.length; i++){
+					imgDestine.arrBinaryColor[i] = imgSource.arrBinaryColor[i];
+				}
 				break;
 		}
 	}