diff --git a/src/modules/Image/testsuite.in b/src/modules/Image/testsuite.in
index 8bfe9f6e692fdf3313ca0ef6159dfba224880416..938905060f3c99932040ae58837b9b3fe8aed7a6 100644
--- a/src/modules/Image/testsuite.in
+++ b/src/modules/Image/testsuite.in
@@ -156,6 +156,13 @@ Image.image(10,10,0,0,0)
 ->setpixel(4,4,3,2,1)
 ->max()))
 return ( "erranous (4)" );
+if (!equal( ({17,42,36}), 
+Image.image(10,10,0,0,0)
+->setpixel(2,2,17,2,3)
+->setpixel(3,3,2,42,5)
+->setpixel(4,4,3,2,36)
+->max()))
+return ( "erranous (5)" );
 return "ok";
 
 
@@ -163,7 +170,7 @@ return "ok";
 test_any([[# 1 "-"
 
 
-#127 "testsuite.in.in"
+#134 "testsuite.in.in"
 object img=Image.image(10,10,255,0,0);
 if (!equal(img->getpixel(5,5),({255,0,0}))) return ( "getpixel erranous" );
 img->setpixel(5,5,1,2,3);
@@ -174,7 +181,7 @@ return "ok";
 test_any([[# 1 "-"
 
 
-#134 "testsuite.in.in"
+#141 "testsuite.in.in"
 object img=Image.image(10,10,255,0,0);
 img->setpixel(5,5,0,255,0,127);
 if (!equal(img->getpixel(5,5),({127,128,0}))) return ( "failed" );
@@ -184,17 +191,17 @@ return "ok";
 test_any([[# 1 "-"
 
 
-#140 "testsuite.in.in"
+#147 "testsuite.in.in"
 object img=Image.image(100,100,0,0,0);
 foreach (({40,50,60}),int z)
 { 
 img->line(50-z,0,50,50,255,255,255);
 img->line(50-z,100,50,50,255,255,255);
-img->line(0,50-z,50,50,255,255,255);
+img->line(100,50+z,50,50,255,255,255);
 img->line(100,50-z,50,50,255,255,255);
 }
 object img1=Image.GIF.decode(MIME.decode_base64(
-"R0lGODlhZABkAIAAAAAAAP///ywAAAAAZABkAAAC/wxwCGaq/l6UktZ6Mdat9sdsmziOpWl6WPMp\r\nYZrCcTxLLfLdi07Tve9brFQeXjB4RIKGQ5tQqYRGccTN7TWdZlPXWNeo1Wq7zqoLLBYjyWZXUa1W\r\ns526Kzoeby5H2L37npfn5kcUEGDY1icoqEe10qL4dMbIaFXW9pcIWBkFacknOTjJWenZaHWoSSpo\r\narO50yr0uvrpeBmkmDNLe1s3FhqayquUc0osLLozjEuIs4va+8xZfJt3SO28bIKdzNjXgaxdNTcd\r\nDi4dB+6qbT4qbhu73J79rt7Mjnwubt9dn99Pip+yd48GhVvF4h5BEPYOlrIFbOEbRw6tQUTH6xpF\r\njP9N9En0ISyhN3gfj1FkRbKkSVkcqQhUiSthRWYsWpZMxQDdC5swcUaksROmtxC7ggodKovmwKMP\r\nNQKNxJTVtTs+o9KaygWq1aEzYfHcuq2iU7D4IHUlG9DcV7RP3bElqPUtO7k36X5ca9fL2byl9vKV\r\nivfvo8CCXREu7CwuYjFEFwdM6rjpz8i/FFOO+eTwX5Ga+XK+nO4kaMaiR3cSOdn0NlGd6fJrLfe1\r\namKsZ2O+aBsoIdhoufEm6zu3l93Cwzb7bTUe8qjKi9eCmFp4c+fr7i0XSi767OzXe2LqrpI7dbfQ\r\noUs3pn20L0y511c7zx488+fjFaaHz74+D/lH99cJR2+efqD890ABADs="));
+"R0lGODlhZABkAIAAAAAAAP///ywAAAAAZABkAAAC/wxwiGC7/l6UktZ6Mdatdr9toSiSZQmCjPihqPu+MdLST23Lsr7vGF7DrXw+YhEF3AiFx2NTFiwtnU5qMYpUVqvbrAT7/XG5Y3HYfD6TyWsw+vZms68qaTw3n/tazE/AvcCkpwcH95OkFkhIaGdYdwfIyDikePeIVzk5yacFdUmpOcfpIUiaiBnK5Wfp6YiaerT6SecKCrtX++o0mnnb+vrHyKvr+xgpKttbbDxLmGy77Hi86VoK28FnrfesTY3a7VwdjTc8HowJToZ9Ok6unLoemA6fOR+L3u5Fab/T8JzfaR89UPyKnYsnjFzBaP6IVWnoEGAjiKLcSXyYY6EihP8Xd2VkY8Cfxo7BKN4z2RHkCn4hI6Y8CS0LypcVW/ZbOZImCJsvSuq85hMJz5/wzrEYSrRonz85kwoFYtSpwagMqEr1xfRG06u4aGzliusrWFpjASIta1Ae2qnYrK51RjXr201u5c5FttTt3X561YqVmtVa0L2ezooxTDgM4sNVE2tZ/Njl25Ysh/zNF7SgzcsMP6qzzPkWxJEUQ4caHU4gWtQJVXM9+E7lPtOq6g38RxNhaJO0u7oeSFCn7mUc+07t1ft3zLTI23Fcfk0cZmXJg8cmTp02N5K5OEctN/3d33LVWXT3Rv0nbuM3a5XvmQv6r2+A47ME/35+zHmR8rdPj82eeM2ox45k/a1WoHwHrgWeLlYhwmCC31ni32cJWkYhYdM4yAqCEmboGDTdTBGiiPB1eNeGy1UIXHwrljjLNCxi9UYfMAZkiI034hhIAQA7"));
 if (img!=img1) return ( "differ" );
 return "ok";
 
@@ -202,7 +209,7 @@ return "ok";
 test_any([[# 1 "-"
 
 
-#154 "testsuite.in.in"
+#161 "testsuite.in.in"
 object img=Image.image(100,100,0,0,0);
 img->line(40,0,0,40);
 if (!equal( ({0,0,0}), img->max() )) return ( "differ (reset)" );
@@ -213,5 +220,174 @@ img->line(30,20,20,30);
 if (!equal( ({200,19,99}), img->max() )) return ( "differ (setcolor)" );
 return "ok";
 
+]], "ok")
+test_any([[# 1 "-"
+
+
+#172 "testsuite.in.in"
+object img=Image.image(100,100,0,0,0);
+foreach (({40,60,50}),int z)
+{ 
+img->box(z,0,50,50,255,z,255);
+img->box(z,100,50,50,255,z,0);
+img->box(100,z,50,50,0,z,255);
+img->box(0,z,50,50,0,z,0);
+}
+object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkALMAAAAAAAAyAAA8AAAoAP8oAP8yAAAo/wAy/wA8//88AP8o//8y//88/wAAAAAAAAAAACwAAAAAZABkAAME/xAAOWe1Fue8OVAKGIbhwjAniqKe17ouHMcznZEkbq7rats/IFA4nORypV6PVSw2nU4bErlb+qJRbDY7zVWtjO1WPKZ1SV9rubxmf86K9NLtpkfhcfC1XudL4XI9fX2DZoB6TISEijeHiIuLkBZ4gXuRkYSUiGGYmJmOep6efZqPo6NspaGoqGOqYK2tW69qsrJOtHO3t0O5gry8f2eVicHBHr6Wx8eToLDMzI3Dm9HRzdOm1tHJxdrB3Jzex+DizOTl38616Lfn7LLu76jx8p709ZH3+J/Yq/uY+v65CSiwDMGCs9TpYjZgQEOHDiFGjDiRIkWLFy9mJMbAgAGPH/8/hhQpkmTJkidRatS4kiVLly8HcESJkmbNmjdLxoy5kydPhzNx4hQ6dOjPn0eRUgxatGjTokqVRuXJ1KlTqyqlStWqserVq18NbN06dukmsGDRfiRLlq3Ms2nTgm3blqxXuXJr1q0r9W7evCIDBBA8eHBhw4YRJ068mDFjxwEOHJA8eXJly5YxZ868mTNnzgIEhBYtmnTp0qdRo1a9enXrAggQxJYtm3bt2rdx49a9e/du166BBw8+nLgA2L59J1eunLly48ahR48uGnnz5texY8dNnXp376itb98+njx38ODRGxdv3nz75unTxw/O3r17++fly9df/f59/77tt5/lgMf995+BtQ044H71HXggeQsumF6DDz7YnDYEEJChhhpqWEACCYAYYoghIrRIhx2i+CGJJJJoIiEppuhhiy2W+GIdMsq4Yo0u3uhGjinuyGMCPv4I5IxD2ljkGEcimeSSZTRJgJA8Qslkk1TWaOUWUmbZ4pZZdJmkkmAOIeaYZTpx5pNpmonlmES2CcSaQ8o555to2kkDnVXqGQOfWvrpAqBfCuoBoT0amgGiZCoKAKNxOjoBpJJaQGmlj+LJZqWXcqppnZh2KqmojpKqqKmGoiqoqn6yqqerdsIqp6xt0pqmrYtEAAA7"));
+if (img!=img1) return ( "differ" );
+return "ok";
+
+]], "ok")
+test_any([[# 1 "-"
+
+
+#186 "testsuite.in.in"
+object img=Image.image(100,100,0,0,0);
+img->box(40,0,0,40);
+if (!equal( ({0,0,0}), img->max() )) return ( "differ (reset)" );
+img->box(10,10,20,20,128,13,42);
+if (!equal( ({128,13,42}), img->max() )) return ( "differ (direct)" );
+img->setcolor(200,19,99);
+img->box(30,20,20,30);
+if (!equal( ({200,19,99}), img->max() )) return ( "differ (setcolor)" );
+return "ok";
+
+
+]], "ok")
+test_any([[# 1 "-"
+
+
+#200 "testsuite.in.in"
+object img=Image.image(100,100,0,0,0);
+float x=0,y=0.2;
+img->setcolor(255,254,253);
+img->polygone(({10+x,15+y,15+x,10+y,15+x,15+y}),
+({20+x,15+y,25+x,15+y,20+x,10+y}),
+({10+x,20+y,15+x,20+y,15+x,25+y}),
+({20+x,25+y,25+x,20+y,20+x,20+y}),
+
+({30+2*10+x,15+y,30+2*15+x,10+y,30+2*15+x,15+y}),
+({30+2*20+x,15+y,30+2*25+x,15+y,30+2*20+x,10+y}),
+({30+2*10+x,20+y,30+2*15+x,20+y,30+2*15+x,25+y}),
+({30+2*20+x,25+y,30+2*25+x,20+y,30+2*20+x,20+y}),
+
+({10+x,30+2*15+y,15+x,30+2*10+y,15+x,30+2*15+y}),
+({20+x,30+2*15+y,25+x,30+2*15+y,20+x,30+2*10+y}),
+({10+x,30+2*20+y,15+x,30+2*20+y,15+x,30+2*25+y}),
+({20+x,30+2*25+y,25+x,30+2*20+y,20+x,30+2*20+y}));
+
+object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkAMQAAAAAAAICAgUFBQoKChYWFigoKC0tLTAwMDIyMjMyMj8/P1lYWFFRUHJycXp5eYyLi6OioaWlpK2srLW0s8vLyszLytbV1Ojn5vTz8vn49/z7+v/+/QAAAAAAAAAAAAAAACwAAAAAZABkAAQF/yAAiONYmiaapivLuu8byzJd1zeO6/ve+z5gMDgkEo3HY1KpZDabTyhUOp1WrVZsNrvlcr3fb1gsJpfLZzRafWSw3Osd4bF7EOLtDCsDx6fmGBs7Gxh2fjgMGYIpG3yHAIAbG4s1k4SGjyaJkyyTjnGRlpQyopd3j5ucjJ59X6Glg6WmhwYICLYst7cGaAW6uro7wMAIBZmZx8jIysvLzc7O0GUOFBTVLNbWDmgKE9nZ1jvg4BMKhwISlp2TEgJrAw0XsrGiFw0DmeiqJuzuePDy1OGod8+Zvk7tMgHcR2qDPXzRAKBjkXAZwB0PI6bwZ4KjM4g1QGrUOJIkSZMnT+6mVKmSZcuWL2HClDlzZk2bNnHmzLmTJ0+fP38GFSqUaNGiR5EiVbp0aVOnTqFGjTqV6hdjKbBadRaBRdetywpoYKFBK9hDEUYB2PD1rB+xajeUdesnbVy2dOPAvTs3bxm7d/H6vapBIL9JfQdbARxYsOIpBxIkkMxi8uQDjx9n1qyZc+fOn0GDFj169CMI4LBlg2D6yAJR6yYtaE0kgAXDIyxZCECbyGuGa2X3rn377u7hvoELRx7EdtzjzIO87jQ7enMLLKBb91HdRPftO3inEA8efHnz5tGnT7+ePXv379/Hly+ffv369/HjPxQCADs="));
+if (img-img1>16) return ( "differ too much" );
+if (!equal(img->max(),({255,254,253}))) return ( "wrong maxcolor" );
+return "ok";
+
+]], "ok")
+test_any([[# 1 "-"
+
+
+#225 "testsuite.in.in"
+object img=Image.image(100,100,0,0,0);
+float x=-0.2,y=-0.2;
+img->setcolor(255,254,253);
+img->polygone(({10+x,15+y,15+x,10+y,15+x,15+y}),
+({20+x,15+y,25+x,15+y,20+x,10+y}),
+({10+x,20+y,15+x,20+y,15+x,25+y}),
+({20+x,25+y,25+x,20+y,20+x,20+y}),
+
+({30+2*10+x,15+y,30+2*15+x,10+y,30+2*15+x,15+y}),
+({30+2*20+x,15+y,30+2*25+x,15+y,30+2*20+x,10+y}),
+({30+2*10+x,20+y,30+2*15+x,20+y,30+2*15+x,25+y}),
+({30+2*20+x,25+y,30+2*25+x,20+y,30+2*20+x,20+y}),
+
+({10+x,30+2*15+y,15+x,30+2*10+y,15+x,30+2*15+y}),
+({20+x,30+2*15+y,25+x,30+2*15+y,20+x,30+2*10+y}),
+({10+x,30+2*20+y,15+x,30+2*20+y,15+x,30+2*25+y}),
+({20+x,30+2*25+y,25+x,30+2*20+y,20+x,30+2*20+y}));
+
+object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkANUAAAAAAAICAgUFBQcHBwoKChQUFBYWFh4eHiMjIyYmJS0tLTAwMDMyMigoKFFRUFlYWHp5eX9+fnJycYyLi56dnDIyMqOioaWlpMHBwMvLyszLytHQz9bV1Orp6Ojn5vTz8vz7+v/+/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAZABkAAUG/0AAQDgcFo1GZDK5ZDKdz2dUKqVWq1csVrvddr1ecDg8JpPN53NarWa32284XD6f1+12fD6/5/P9f3+BgoKEhYVqAkmKiGQEWAMBjW0FFEkMEZNYBhMYWBUcD5KaWwUbGZchmaRGnB8hqFUVISGho6xJprCpqqyutLuywLWiuEO6wUMMwKuIv8OxUrPDxLeTAhQZGRkWSQ3b2w6FAQ8Y4ODcWN/o4BYNxsbw8fHz9PT29/f5ggIMDP7vjBD49w/BuAUECf4LKGWgQoUHWEUAFg3AMlodFCBqcAEEtWRPplHzIOGRRFoVL2bUxNEjxU8jS9KbmDLESlYtUcKkRdLkvf8IKW8aa1mRyaye+pKIM4JAo74GELAkkJk0aVWrVrFmzbqVK1evX7+GFSuWbNmyZ9GiVbt2bVu3buHGjTuXLl27d+/m1auXb9++fwEDFjx4cGHDhvlYs5b43oMkCxg2jmfAkxEGFybfm5AShGTNmgx8qJkZNKsJIJd5Nh36Vc0QpVkjQp2a1mrZgkTrvAwsNu48tGvb/vxbDQFz27oZWbctavHiz6FDlz59enXr1rFnz152QIUK3yUTAA8+AfczATi85A1MwvkzD9YrA+bB5/st6XfPp+X+Ppn4wtXnHxn5vdbfgGHEV5OACIaRXk0HNujFAykxKKEXASinTIQXbiEk2QH2ddihiCOOWKKJJqKYYoorssiiiy++GKOMMtJYY4034hYEADs="));
+if (img-img1>16) return ( "differ too much" );
+if (!equal(img->max(),({255,254,253}))) return ( "wrong maxcolor" );
+return "ok";
+
+
+]], "ok")
+test_any([[# 1 "-"
+
+
+#251 "testsuite.in.in"
+object img=Image.image(100,100,0,0,0);
+int i;
+
+array a=({}),b=({});
+foreach (({0,1,2,3,4}),i)
+{
+a+=({ 50+50*sin(i*2*3.1415926535/5+0.11),
+50+50*cos(i*2*3.1415926535/5+0.11) });
+a+=({ 50+19*sin((i+0.5)*2*3.1415926535/5+0.11),
+50+19*cos((i+0.5)*2*3.1415926535/5+0.11) });
+b+=({ 50+19*sin(i*2*3.1415926535/5+0.1),
+50+19*cos(i*2*3.1415926535/5+0.1) });
+b+=({ 50+0.5*5*sin((i+0.5)*2*3.1415926535/5+0.1),
+50+0.5*5*cos((i+0.5)*2*3.1415926535/5+0.1) });
+}
+
+img->setcolor(128,0,16);
+img->polyfill(a,b);
+
+a=({}),b=({});
+foreach (({0,1,2,3,4,5,6}),i)
+{
+a+=({ 50+50*sin(i*2*3.1415926535/7+0.11),
+50+50*cos(i*2*3.1415926535/7+0.11) });
+a+=({ 50+19*sin((i+0.5)*2*3.1415926535/7+0.11),
+50+19*cos((i+0.5)*2*3.1415926535/7+0.11) });
+b+=({ 50+0.9*50*sin(i*2*3.1415926535/7+0.1),
+50+0.9*50*cos(i*2*3.1415926535/7+0.1) });
+b+=({ 50+0.5*19*sin((i+0.5)*2*3.1415926535/7+0.1),
+50+0.5*19*cos((i+0.5)*2*3.1415926535/7+0.1) });
+}
+
+img->setcolor(255,128,0);
+img->polyfill(a,b);
+
+object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkAPcAAAAAAAEAAAIAAAMAAAMBAAQAAAUAAAYAAAQCAAUCAAYDAAIBAAcAAAcDAAgEAAgAAQkAAQoAAQsAAQwAAAwAAQkDAAkEAAoFAAsFAAwGAA0AARAAAhEAAhIAAhQAAg8AARUAAhYAAhcAARcAAhgAAxoAAxsAAw0GAA4HAA8HABAIABEIABIJABMKABMJABYLABQKABgMABkMABkNABoNABsNAA4AARwAAx0AAx4AAyEABCIABB8AAyIIASAABCQABCUABCYABCcABCkABSgABSoABSsABSwABS0ABSwBBC4ABTAABi8ABTEABjIABjMABjYABjUABjgABzkABzoABzoBBjsABzwABz0ABz4ABx0PAB0OAB4PAB8PACEOACEQACIRACMRACAQACQSACUSACcMACgMASYTACgTACgUACkUACkVACoVADcABjELAjQKAy4UACwWAC0WAC0XADAYADEYADIZADMaADQaADYbADcbADkcADgcADweAD0eAD4fAEEABkUACEoACUsACFEAClYAClYACV4AC0YACGQAC2cADG4ADXMADXQMCncADnsADkIVAUEgAEUiAEgjAFIIBk4mAFMpAFUqAGwTB3AYBWQfAl4uAGQxAGk0AGs1AHI1AH0AD34AD38AD4AAD4AAEIABD4EBD4ICD4QED4MDD4cGDogHDooKDY0MDowSC5AQDZISDZYUDZcXDJgYDJgRDZocC54dDKAdC6AiCqYkC6gkCqsrCq4tCrMxCbU1Cbc2CHU6AHc9AHs/AIJCAIdAAYxHAJVDApdMAIhEAJ9NAaVJAqtXALw8B7xMBbRbALxeAcJCB8VEB8ZMBcxMBcpaAtNUBdhYBNxdA8NiAMlmANJqANlsAdpnAelqAuJyAOl2AZFJAO53AO9xAfFxAfJyAfJzAfN1APV1AfB4APB4APF5APR6APN6APV7APZ3Afd4APh5APh6APl6APh7APp7APd3Afh8APd8APl9APt9APt9APx+AP1+AO93AP5/AP+AACwAAAAAZABkAAcI/wABABA4cGBBgwYRJky4kCFDDw4dRpQokWLFihcxYtTIsFCEjRtBhgw5kiRJjI6ynJQYYOVKly9fGuxAylEBmQMRbMKJk2dPh0dIkXLSUxiwnz+R9kQkdBFONvZ2Jk06deUhoaSAvCSQ7Z8k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"));
+
+if (img-img1>16) return ( "differ too much" );
+
+
+
+return "ok";
+
+
+]], "ok")
+test_any([[# 1 "-"
+
+
+#297 "testsuite.in.in"
+int i;
+array a=({});
+foreach (({0,1,2,3,4}),i)
+{
+a+=({ 50+50*sin(i*2*3.1415926535/5+0.11),
+50+50*cos(i*2*3.1415926535/5+0.11) });
+a+=({ 50+20*sin((i+0.5)*2*3.1415926535/5+0.11),
+50+20*cos((i+0.5)*2*3.1415926535/5+0.11) });
+}
+
+object img=Image.image(100,100,0,0,0);
+img->setcolor(128,0,16);
+img->polyfill(a);
+
+object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkAOYAAAAAAAIAAAEAAAQAAAUAAAYAAAMAAAgAAQkAAQoAAQsAAQwAAQ0AAQ4AAQ8AAQcAABAAAhEAAhIAAhMAAhUAAhQAAhYAAhcAAhgAAxkAAxoAAxsAAxwAAx0AAx4AAx8AAyAABCEABCIABCMABCQABCUABCYABCcABCgABSkABSoABSsABSwABS0ABS4ABS8ABTAABjEABjIABjMABjQABjUABjYABjcABjgABzkABzoABzsABzwABz0ABz4ABz8AB0AACEMACEIACEYACEcACEgACUkACUoACUsACUwACU0ACU4ACU8ACVAAClIAClEAClMAClUAClgAC1cAClkAC1YAClsAC1wAC10AC14AC18AC2AADGEADGIADGMADGQADGUADGYADGcADGgADWkADWoADWsADWwADW0ADW4ADW8ADXAADnEADnMADnQADnUADnIADncADngAD3kAD3YADnoAD3sAD3wAD0EACH0AD38AD34AD4AAEAAAAAAAAAAAACwAAAAAZABkAAYH/4AAAIKDg4WGhoiJiYuMjI6Pj5GSkpSVlZeYmJqbm52enqChoaOkpKanp6mqqqytra+wsLKzs7W2tri5ubu8hgq+vsHClSpFxMTIxDl6NMnJz7YCRnx8HNDQ2KoEUtV6BdnZ4Z4KX9V8aOLi6pUTaud8UeukKC3zsx508Hw9954HdcKI8EdqxZ19fEoQ3ISEj54rFxZW2qEHIZ8GEitRqMhnzxMHGQcJaGiRTshKWeDdGXJAIgEqFqtlOSnpBMI4Owb4UxAmZrUhNB8JeIeQzQsB6yoQ9eki6CMdPsmQyPYhjs9zEZ0mAnhViwZiLQ5e5XMngFZGSsbqgRKBFw+OY//FnGVkAa7PO0USwBo5Fh6TuYy09K0mpweBUwWsDD6HA3AiFIurwZGBdNMCMZGrgXBsSMCazHzMnMBE4XNmPS05D9oBuhqXa4xAyGm9RrUhBHZaO6wywZALsaCl2Da0RHe1PEgU+LCbGc/wQReYg85jvFqK54O2VK9+ri12Fdy5z8E+KACb8Ma5kB/EA73uI+sBJMjtPrOM+ACY1M/8NT4G6ftZtIdO+HURYF9l4DfICgeOBYWCAAQAR4M+7QAhAD1QGNN1ECYAnIbn1MGDARA2AaJFZ4yg4H8nIqRHFSDF50WLFtXRA4nYdTAbjRahMdVwItTBo096SAGBaid8OKT/RXb8QOBZLVC3ZF9pmHDWDHtMGRkV3p3EjJaZ2QHEkwv9ACCYY6kx2kJDoFmdFRLcw5eb1d0hxGHZBOAEneitwSExBnTDp3tX9OYLAVgMut8dQeA5ywMGKhogGyrMkkBPkjaYRQWqMFBGpvXdgcYVSOigggWnQJAGqK3p0UYXT+ABwwcNVAZLBROyetUcY0hBhA0lUECmLxi8oes5eaiRhRI8sLCBXv5wYFWmaUARhAwhQGDWSSHMwaqVZ5lAX6Z6IHDWClJyZ8caX1ChhBA2nFGdGWfFkGVfetSRhhdTIAFEDSl4IMEDkrxQ3RJa3QCXHnKgwUUVR/wwAwocROCo1ioBmNZaDE5F0IMMJmzgwLDJ1GAcpxfOMoAbrZmUsi2sgUbFy7YUMG1kPNBsCx6gfaCzpUIulgfJP4dCRGRfFD0LA0r6RITSs6Q1WKVQtyLBvVfpwUDVsEDRlxpcwxLdWE6EDQtMV9VgdisdnFkNBmu3ol1Mc9gadygj+ITF3a2AERMQfKuSQkwqBn6KGQjtQbDhpBi8zxiMnxLAUtUgEfkpJsPT1OWhrAzPkZyHEjMfbYROis3VVGE6KTzzkcPqoSAgJGywb0KEHTjWjgkDM+nuCQVzBQIAOw=="));
+
+if (img-img1>16) return ( "differ too much" );
+if (!equal(img->max(),({128,0,16}))) 
+return ( "wrong maxcolor ("+img->max()[0]+","+img->max()[1]+","+img->max()[2]+")" );
+return "ok";
 
 ]], "ok")
diff --git a/src/modules/Image/testsuite.in.in b/src/modules/Image/testsuite.in.in
index 4f437b2518f86cc026ccebc52ffce54da2e37f64..c8cea50a58e4df9542a6431c15e30e3cca690916 100644
--- a/src/modules/Image/testsuite.in.in
+++ b/src/modules/Image/testsuite.in.in
@@ -149,11 +149,11 @@
    { 
       img->line(50-z,0,50,50,255,255,255);
       img->line(50-z,100,50,50,255,255,255);
-      img->line(0,50-z,50,50,255,255,255);
+      img->line(100,50+z,50,50,255,255,255);
       img->line(100,50-z,50,50,255,255,255);
    }
    object img1=Image.GIF.decode(MIME.decode_base64(
-      "R0lGODlhZABkAIAAAAAAAP///ywAAAAAZABkAAAC/wxwCGaq/l6UktZ6Mdat9sdsmziOpWl6WPMpYZrCcTxLLfLdi07Tve9brFQeXjB4RIKGQ5tQqYRGccTN7TWdZlPXWNeo1Wq7zqoLLBYjyWZXUa1Ws526Kzoeby5H2L37npfn5kcUEGDY1icoqEe10qL4dMbIaFXW9pcIWBkFacknOTjJWenZaHWoSSpoarO50yr0uvrpeBmkmDNLe1s3FhqayquUc0osLLozjEuIs4va+8xZfJt3SO28bIKdzNjXgaxdNTcdDi4dB+6qbT4qbhu73J79rt7Mjnwubt9dn99Pip+yd48GhVvF4h5BEPYOlrIFbOEbRw6tQUTH6xpFjP9N9En0ISyhN3gfj1FkRbKkSVkcqQhUiSthRWYsWpZMxQDdC5swcUaksROmtxC7ggodKovmwKMPNQKNxJTVtTs+o9KaygWq1aEzYfHcuq2iU7D4IHUlG9DcV7RP3bElqPUtO7k36X5ca9fL2byl9vKVivfvo8CCXREu7CwuYjFEFwdM6rjpz8i/FFOO+eTwX5Ga+XK+nO4kaMaiR3cSOdn0NlGd6fJrLfe1amKsZ2O+aBsoIdhoufEm6zu3l93Cwzb7bTUe8qjKi9eCmFp4c+fr7i0XSi767OzXe2LqrpI7dbfQoUs3pn20L0y511c7zx488+fjFaaHz74+D/lH99cJR2+efqD890ABADs="));
+      "R0lGODlhZABkAIAAAAAAAP///ywAAAAAZABkAAAC/wxwiGC7/l6UktZ6Mdatdr9toSiSZQmCjPihqPu+MdLST23Lsr7vGF7DrXw+YhEF3AiFx2NTFiwtnU5qMYpUVqvbrAT7/XG5Y3HYfD6TyWsw+vZms68qaTw3n/tazE/AvcCkpwcH95OkFkhIaGdYdwfIyDikePeIVzk5yacFdUmpOcfpIUiaiBnK5Wfp6YiaerT6SecKCrtX++o0mnnb+vrHyKvr+xgpKttbbDxLmGy77Hi86VoK28FnrfesTY3a7VwdjTc8HowJToZ9Ok6unLoemA6fOR+L3u5Fab/T8JzfaR89UPyKnYsnjFzBaP6IVWnoEGAjiKLcSXyYY6EihP8Xd2VkY8Cfxo7BKN4z2RHkCn4hI6Y8CS0LypcVW/ZbOZImCJsvSuq85hMJz5/wzrEYSrRonz85kwoFYtSpwagMqEr1xfRG06u4aGzliusrWFpjASIta1Ae2qnYrK51RjXr201u5c5FttTt3X561YqVmtVa0L2ezooxTDgM4sNVE2tZ/Njl25Ysh/zNF7SgzcsMP6qzzPkWxJEUQ4caHU4gWtQJVXM9+E7lPtOq6g38RxNhaJO0u7oeSFCn7mUc+07t1ft3zLTI23Fcfk0cZmXJg8cmTp02N5K5OEctN/3d33LVWXT3Rv0nbuM3a5XvmQv6r2+A47ME/35+zHmR8rdPj82eeM2ox45k/a1WoHwHrgWeLlYhwmCC31ni32cJWkYhYdM4yAqCEmboGDTdTBGiiPB1eNeGy1UIXHwrljjLNCxi9UYfMAZkiI034hhIAQA7"));
    if (img!=img1) fail("differ");
    ok();
 
@@ -168,6 +168,34 @@
    if (!equal( ({200,19,99}), img->max() )) fail("differ (setcolor)");
    ok();
 
+#test Image.image->box structure
+   object img=Image.image(100,100,0,0,0);
+   foreach (({40,60,50}),int z)
+   { 
+      img->box(z,0,50,50,255,z,255);
+      img->box(z,100,50,50,255,z,0);
+      img->box(100,z,50,50,0,z,255);
+      img->box(0,z,50,50,0,z,0);
+   }
+   object img1=Image.GIF.decode(MIME.decode_base64(
+      "R0lGODlhZABkALMAAAAAAAAyAAA8AAAoAP8oAP8yAAAo/wAy/wA8//88AP8o//8y//88/wAAAAAAAAAAACwAAAAAZABkAAME/xAAOWe1Fue8OVAKGIbhwjAniqKe17ouHMcznZEkbq7rats/IFA4nORypV6PVSw2nU4bErlb+qJRbDY7zVWtjO1WPKZ1SV9rubxmf86K9NLtpkfhcfC1XudL4XI9fX2DZoB6TISEijeHiIuLkBZ4gXuRkYSUiGGYmJmOep6efZqPo6NspaGoqGOqYK2tW69qsrJOtHO3t0O5gry8f2eVicHBHr6Wx8eToLDMzI3Dm9HRzdOm1tHJxdrB3Jzex+DizOTl38616Lfn7LLu76jx8p709ZH3+J/Yq/uY+v65CSiwDMGCs9TpYjZgQEOHDiFGjDiRIkWLFy9mJMbAgAGPH/8/hhQpkmTJkidRatS4kiVLly8HcESJkmbNmjdLxoy5kydPhzNx4hQ6dOjPn0eRUgxatGjTokqVRuXJ1KlTqyqlStWqserVq18NbN06dukmsGDRfiRLlq3Ms2nTgm3blqxXuXJr1q0r9W7evCIDBBA8eHBhw4YRJ068mDFjxwEOHJA8eXJly5YxZ868mTNnzgIEhBYtmnTp0qdRo1a9enXrAggQxJYtm3bt2rdx49a9e/du166BBw8+nLgA2L59J1eunLly48ahR48uGnnz5texY8dNnXp376itb98+njx38ODRGxdv3nz75unTxw/O3r17++fly9df/f59/77tt5/lgMf995+BtQ044H71HXggeQsumF6DDz7YnDYEEJChhhpqWEACCYAYYoghIrRIhx2i+CGJJJJoIiEppuhhiy2W+GIdMsq4Yo0u3uhGjinuyGMCPv4I5IxD2ljkGEcimeSSZTRJgJA8Qslkk1TWaOUWUmbZ4pZZdJmkkmAOIeaYZTpx5pNpmonlmES2CcSaQ8o555to2kkDnVXqGQOfWvrpAqBfCuoBoT0amgGiZCoKAKNxOjoBpJJaQGmlj+LJZqWXcqppnZh2KqmojpKqqKmGoiqoqn6yqqerdsIqp6xt0pqmrYtEAAA7"));
+   if (img!=img1) fail("differ");
+   ok();
+
+#test Image.image->box color 
+   object img=Image.image(100,100,0,0,0);
+   img->box(40,0,0,40);
+   if (!equal( ({0,0,0}), img->max() )) fail("differ (reset)");
+   img->box(10,10,20,20,128,13,42);
+   if (!equal( ({128,13,42}), img->max() )) fail("differ (direct)");
+   img->setcolor(200,19,99);
+   img->box(30,20,20,30);
+   if (!equal( ({200,19,99}), img->max() )) fail("differ (setcolor)");
+   ok();
+
+//-----------------------------------------------------
+#chapter advanced drawing
+
 #test Image.image->polyfill 1 (right triangle 0.0, 0.2)
    object img=Image.image(100,100,0,0,0);
    float x=0,y=0.2;
@@ -219,7 +247,7 @@
    ok();
 
    
-#test Image.image->polyfill 2 (hollow stars)
+#test Image.image->polyfill 3 (hollow stars)
    object img=Image.image(100,100,0,0,0);
    int i;
 
@@ -259,6 +287,31 @@
       "R0lGODlhZABkAPcAAAAAAAEAAAIAAAMAAAMBAAQAAAUAAAYAAAQCAAUCAAYDAAIBAAcAAAcDAAgEAAgAAQkAAQoAAQsAAQwAAAwAAQkDAAkEAAoFAAsFAAwGAA0AARAAAhEAAhIAAhQAAg8AARUAAhYAAhcAARcAAhgAAxoAAxsAAw0GAA4HAA8HABAIABEIABIJABMKABMJABYLABQKABgMABkMABkNABoNABsNAA4AARwAAx0AAx4AAyEABCIABB8AAyIIASAABCQABCUABCYABCcABCkABSgABSoABSsABSwABS0ABSwBBC4ABTAABi8ABTEABjIABjMABjYABjUABjgABzkABzoABzoBBjsABzwABz0ABz4ABx0PAB0OAB4PAB8PACEOACEQACIRACMRACAQACQSACUSACcMACgMASYTACgTACgUACkUACkVACoVADcABjELAjQKAy4UACwWAC0WAC0XADAYADEYADIZADMaADQaADYbADcbADkcADgcADweAD0eAD4fAEEABkUACEoACUsACFEAClYAClYACV4AC0YACGQAC2cADG4ADXMADXQMCncADnsADkIVAUEgAEUiAEgjAFIIBk4mAFMpAFUqAGwTB3AYBWQfAl4uAGQxAGk0AGs1AHI1AH0AD34AD38AD4AAD4AAEIABD4EBD4ICD4QED4MDD4cGDogHDooKDY0MDowSC5AQDZISDZYUDZcXDJgYDJgRDZocC54dDKAdC6AiCqYkC6gkCqsrCq4tCrMxCbU1Cbc2CHU6AHc9AHs/AIJCAIdAAYxHAJVDApdMAIhEAJ9NAaVJAqtXALw8B7xMBbRbALxeAcJCB8VEB8ZMBcxMBcpaAtNUBdhYBNxdA8NiAMlmANJqANlsAdpnAelqAuJyAOl2AZFJAO53AO9xAfFxAfJyAfJzAfN1APV1AfB4APB4APF5APR6APN6APV7APZ3Afd4APh5APh6APl6APh7APp7APd3Afh8APd8APl9APt9APt9APx+AP1+AO93AP5/AP+AACwAAAAAZABkAAcI/wABABA4cGBBgwYRJky4kCFDDw4dRpQokWLFihcxYtTIsFCEjRtBhgw5kiRJjI6ynJQYYOVKly9fGuxAylEBmQMRbMKJk2dPh0dIkXLSUxiwnz+R9kQkdBFONvZ2Jk06deUhoaSAvCSQ7Z8k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"));
    
    if (img-img1>16) fail("differ too much");
-   if (!equal(img->max(),({255,128,16}))) fail("wrong maxcolor");
+//    known failure
+//    if (!equal(img->max(),({255,128,16}))) 
+//       fail("wrong maxcolor ("+img->max()[0]+","+img->max()[1]+","+img->max()[2]+")");
    ok();
 
+
+#test Image.image->polyfill 4 (star)
+   int i;
+   array a=({});
+   foreach (({0,1,2,3,4}),i)
+   {
+      a+=({ 50+50*sin(i*2*3.1415926535/5+0.11),
+	    50+50*cos(i*2*3.1415926535/5+0.11) });
+      a+=({ 50+20*sin((i+0.5)*2*3.1415926535/5+0.11),
+	    50+20*cos((i+0.5)*2*3.1415926535/5+0.11) });
+   }
+
+   object img=Image.image(100,100,0,0,0);
+   img->setcolor(128,0,16);
+   img->polyfill(a);
+
+   object img1=Image.GIF.decode(MIME.decode_base64(
+"R0lGODlhZABkAOYAAAAAAAIAAAEAAAQAAAUAAAYAAAMAAAgAAQkAAQoAAQsAAQwAAQ0AAQ4AAQ8AAQcAABAAAhEAAhIAAhMAAhUAAhQAAhYAAhcAAhgAAxkAAxoAAxsAAxwAAx0AAx4AAx8AAyAABCEABCIABCMABCQABCUABCYABCcABCgABSkABSoABSsABSwABS0ABS4ABS8ABTAABjEABjIABjMABjQABjUABjYABjcABjgABzkABzoABzsABzwABz0ABz4ABz8AB0AACEMACEIACEYACEcACEgACUkACUoACUsACUwACU0ACU4ACU8ACVAAClIAClEAClMAClUAClgAC1cAClkAC1YAClsAC1wAC10AC14AC18AC2AADGEADGIADGMADGQADGUADGYADGcADGgADWkADWoADWsADWwADW0ADW4ADW8ADXAADnEADnMADnQADnUADnIADncADngAD3kAD3YADnoAD3sAD3wAD0EACH0AD38AD34AD4AAEAAAAAAAAAAAACwAAAAAZABkAAYH/4AAAIKDg4WGhoiJiYuMjI6Pj5GSkpSVlZeYmJqbm52enqChoaOkpKanp6mqqqytra+wsLKzs7W2tri5ubu8hgq+vsHClSpFxMTIxDl6NMnJz7YCRnx8HNDQ2KoEUtV6BdnZ4Z4KX9V8aOLi6pUTaud8UeukKC3zsx508Hw9954HdcKI8EdqxZ19fEoQ3ISEj54rFxZW2qEHIZ8GEitRqMhnzxMHGQcJaGiRTshKWeDdGXJAIgEqFqtlOSnpBMI4Owb4UxAmZrUhNB8JeIeQzQsB6yoQ9eki6CMdPsmQyPYhjs9zEZ0mAnhViwZiLQ5e5XMngFZGSsbqgRKBFw+OY//FnGVkAa7PO0USwBo5Fh6TuYy09K0mpweBUwWsDD6HA3AiFIurwZGBdNMCMZGrgXBsSMCazHzMnMBE4XNmPS05D9oBuhqXa4xAyGm9RrUhBHZaO6wywZALsaCl2Da0RHe1PEgU+LCbGc/wQReYg85jvFqK54O2VK9+ri12Fdy5z8E+KACb8Ma5kB/EA73uI+sBJMjtPrOM+ACY1M/8NT4G6ftZtIdO+HURYF9l4DfICgeOBYWCAAQAR4M+7QAhAD1QGNN1ECYAnIbn1MGDARA2AaJFZ4yg4H8nIqRHFSDF50WLFtXRA4nYdTAbjRahMdVwItTBo096SAGBaid8OKT/RXb8QOBZLVC3ZF9pmHDWDHtMGRkV3p3EjJaZ2QHEkwv9ACCYY6kx2kJDoFmdFRLcw5eb1d0hxGHZBOAEneitwSExBnTDp3tX9OYLAVgMut8dQeA5ywMGKhogGyrMkkBPkjaYRQWqMFBGpvXdgcYVSOigggWnQJAGqK3p0UYXT+ABwwcNVAZLBROyetUcY0hBhA0lUECmLxi8oes5eaiRhRI8sLCBXv5wYFWmaUARhAwhQGDWSSHMwaqVZ5lAX6Z6IHDWClJyZ8caX1ChhBA2nFGdGWfFkGVfetSRhhdTIAFEDSl4IMEDkrxQ3RJa3QCXHnKgwUUVR/wwAwocROCo1ioBmNZaDE5F0IMMJmzgwLDJ1GAcpxfOMoAbrZmUsi2sgUbFy7YUMG1kPNBsCx6gfaCzpUIulgfJP4dCRGRfFD0LA0r6RITSs6Q1WKVQtyLBvVfpwUDVsEDRlxpcwxLdWE6EDQtMV9VgdisdnFkNBmu3ol1Mc9gadygj+ITF3a2AERMQfKuSQkwqBn6KGQjtQbDhpBi8zxiMnxLAUtUgEfkpJsPT1OWhrAzPkZyHEjMfbYROis3VVGE6KTzzkcPqoSAgJGywb0KEHTjWjgkDM+nuCQVzBQIAOw=="));
+
+   if (img-img1>16) fail("differ too much");
+   if (!equal(img->max(),({128,0,16}))) 
+      fail("wrong maxcolor ("+img->max()[0]+","+img->max()[1]+","+img->max()[2]+")");
+   ok();