Browse Source

ASH changed to LSH in MakeCol

Artur Efimov 7 years ago
parent
commit
1ecc90fff7
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/Graph.Mod

+ 5 - 5
src/Graph.Mod

@@ -415,18 +415,18 @@ END AddRegion;
 (* Drawing *)
 (* Drawing *)
 
 
 PROCEDURE MakeCol*(r, g, b: INTEGER): INTEGER;
 PROCEDURE MakeCol*(r, g, b: INTEGER): INTEGER;
-BEGIN (*!FIXME use MOD and ASH? *)
+BEGIN
   r := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, r) * {0..7});
   r := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, r) * {0..7});
   g := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, g) * {0..7});
   g := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, g) * {0..7});
   b := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, b) * {0..7});
   b := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, b) * {0..7});
-  RETURN SHORT(ASH(ASH(0FF00H + b, 8) + g, 8)) + r
+  RETURN SYSTEM.LSH(SYSTEM.LSH(0FF00H + b, 8) + g, 8) + r
 END MakeCol;
 END MakeCol;
 
 
 PROCEDURE ColorToRGB*(color: INTEGER; VAR r, g, b: INTEGER);
 PROCEDURE ColorToRGB*(color: INTEGER; VAR r, g, b: INTEGER);
-BEGIN (*!FIXME use MOD and ASH? *)
+BEGIN
   r := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, color) * {0..7});
   r := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, color) * {0..7});
-  g := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, ASH(color, -8)) * {0..7});
-  b := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, ASH(color, -16)) * {0..7})
+  g := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, SYSTEM.LSH(color, -8)) * {0..7});
+  b := SYSTEM.VAL(INTEGER, SYSTEM.VAL(SET32, SYSTEM.LSH(color, -16)) * {0..7})
 END ColorToRGB;
 END ColorToRGB;
 
 
 PROCEDURE BmpCol*(bmp: Bitmap; r, g, b: INTEGER): INTEGER;
 PROCEDURE BmpCol*(bmp: Bitmap; r, g, b: INTEGER): INTEGER;