Index: trunk/Ohana/src/kii/picture/Remap8.c
===================================================================
--- trunk/Ohana/src/kii/picture/Remap8.c	(revision 5386)
+++ trunk/Ohana/src/kii/picture/Remap8.c	(revision 5852)
@@ -68,6 +68,6 @@
   if ((i_end - i_start) % expand_out == 0) dropback = 0;
 
-  out_pix = layout[0].picture.data;
-  in_pix  = (unsigned char *) (matrix[0].buffer) + DX*(int)MAX(Y,0) + (int)MAX(X,0);
+  out_pix = (unsigned char *) layout[0].picture.data;
+  in_pix  = (unsigned char *) matrix[0].buffer + DX*(int)MAX(Y,0) + (int)MAX(X,0);
 
   /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/