Merged trunk into branches/mode5 (=update mode5 branch to latest)

git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1785 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-04-25 15:17:18 +00:00
parent 55422d160e 37d30ae114
commit 1f10338f60
98 changed files with 4545 additions and 2979 deletions
--- a/src/brush.c
+++ b/src/brush.c
@@ -949,7 +949,7 @@ void Remap_brush(void)
        Brush_colormap[color]=color;
      else
        // Usual method: closest by r g b
-        Brush_colormap[color]=Best_color_perceptual(r,g,b);
+        Brush_colormap[color]=Best_color_perceptual_except(r,g,b,Back_color);
    }

  //   Il reste une couleur non calculée dans la table qu'il faut mettre à