Changeset 09d1345 in buchla-68k for vlib/vtext.c

Timestamp:

07/15/2017 10:03:02 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

bf89cfb

Parents:

6a37d5b

Message:

Prefer signed integers in vlib.

File:

• vlib/vtext.c (modified) (2 diffs)

vlib/vtext.c

@@ -10 +10 @@
 #include "ram.h"
 
-static int16_t  msk[] = { 0xFF00, 0x00FF };
+static uint16_t msk[] = { 0xFF00, 0x00FF };
 
-void vtext(uint16_t *obj, uint16_t nc, uint16_t row, uint16_t col, int8_t *ip)
+void vtext(uint16_t *obj, int16_t nc, int16_t row, int16_t col, int8_t *ip)
 {
         register uint16_t *op;
@@ -20 +20 @@
                 op = obj + ((nc >> 1) * row) + (col >> 1);
 
-                *op = (*op & (uint16_t)msk[col & 1]) |
-                      ((*ip++ & 0x00FF) << ((col & 1) ? 8 : 0));
+                *op = (*op & msk[col & 1]) |
+                      ((uint16_t)(*ip++ & 0x00FF) << ((col & 1) ? 8 : 0));
 
                 col++;