--- a/TaskManager/Test/test_render/viewer.cpp	Mon Jun 01 11:40:04 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.cpp	Thu Jun 04 00:01:11 2009 +0900
@@ -336,7 +336,9 @@
 		//break;
 		// Draw Background (現在は塗りつぶし)
 		task_draw = manager->create_task(TASK_DRAW_BACK);
+<<<<<<< local
 		task_draw->add_param(0xffffffff);
+<<<<<<< local
 
 		for (int k = 0; k < rangey; k++) {
 		    task_draw->add_outData(
@@ -350,6 +352,23 @@
 		//0xFFFFFFFF, (this->width)*sizeof(int)*rangey/sizeof(wchar_t));
 		break;
 #endif
+=======
+=======
+<<<<<<< local
+		task_draw->add_param(0xffffff);
+=======
+		//task_draw->add_param(0x00ffcc55);
+		task_draw->add_param(0);
+//task_draw->add_param(st_rgb);
+>>>>>>> other
+>>>>>>> other
+	    }
+	    
+	    for (int k = 0; k < rangey; k++) {
+		task_draw->add_outData(
+		    &pixels[(startx-1)+this->width*(k+starty-1)],
+		    (endx - startx + 1)*sizeof(int));
+>>>>>>> other
 	    }
 
 	    task_draw->add_param(startx);