FIX: FOREACH works bad on image!

fixes: Oldes/Rebol-issues#1479
Oldes · Feb 16, 2020 · 9f65341 · 9f65341
1 parent d6626a8
commit 9f65341
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/core/n-loop.c b/src/core/n-loop.c
@@ -414,7 +414,7 @@
 							SET_INTEGER(vars, (REBI64)(BIN_HEAD(series)[index]));
 						}
 						else if (IS_IMAGE(value)) {
-							Set_Tuple_Pixel(BIN_SKIP(series, index), vars);
+							Set_Tuple_Pixel(BIN_SKIP(series, index<<2), vars);
 						}
 						else {
 							VAL_SET(vars, REB_CHAR);

diff --git a/src/tests/units/image-test.r3 b/src/tests/units/image-test.r3
@@ -22,6 +22,18 @@ Rebol [
 		--assert image? to image! make gob! []
 ===end-group===
 
+===start-group=== "FOREACH"
+	--test-- "issue-1479"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/1479
+	pix: copy []
+	img: make image! [1x2 #{010203040506} #{0102}]
+	foreach p img[ append pix p ]
+	--assert img/1 = pix/1
+	--assert img/2 = pix/2
+	--assert img/1 = 1.2.3.1
+	--assert img/2 = 4.5.6.2
+===end-group===
+
 ===start-group=== "image range"
 	img: make image! 2x2
 	--test-- "image range (integer index)"