diff options
author | 2022-07-05 16:30:43 +1000 | |
---|---|---|
committer | 2022-07-05 16:30:43 +1000 | |
commit | 2a27d420c067220804a81ce65c961a4ace2b9533 (patch) | |
tree | 27e1005a49969b79f05af8f06910c7a644f64183 /src/devices/bus | |
parent | 93d60e7c6a00e1dbe0d8e78197532c66f0259dcd (diff) |
-Made parent/clone terminology consistent in Chinese translations. [YuiFAN]
-bus/nubus: Made Macintosh Display Card round away from zero in 1:2:1
convolution mode. [Vas Crabb]
Diffstat (limited to 'src/devices/bus')
-rw-r--r-- | src/devices/bus/nubus/nubus_48gc.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 2c28388faaf..60a28c513e6 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -694,9 +694,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0x4 == Mode) // 2bpp @@ -708,9 +708,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p, 2)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0x8 == Mode) // 4bpp @@ -722,9 +722,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p, 4)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0xc == Mode) // 8bpp @@ -734,9 +734,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(pixbelow); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } } |