Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 17:27:06 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #2541 from npwoods/imgtool_fix_mac_1bpp_icon_issue

Browse Source 
Imgtool:  Classic Mac:  Made the logic for B&W icon able to handled non-masked set pixels
This commit is contained in:
R. Belmont 2017-08-05 21:01:19 -04:00 committed by GitHub
commit d27a4c3b4b
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/tools/imgtool/modules/mac.cpp
View File

@ -6040,7 +6040,7 @@ static int bundle_discriminator(const void *resource, uint16_t id, uint32_t leng
static int get_pixel(const uint8_t *src, int width, int height, int bpp, static uint8_t get_pixel(const uint8_t *src, int width, int height, int bpp,
int x, int y) int x, int y)
{ {
uint8_t byte, mask; uint8_t byte, mask;
@ -6054,46 +6054,44 @@ static int get_pixel(const uint8_t *src, int width, int height, int bpp,
static int load_icon(uint32_t *dest, const void *resource_fork, uint64_t resource_fork_length, static bool load_icon(uint32_t *dest, const void *resource_fork, uint64_t resource_fork_length,
uint32_t resource_type, uint16_t resource_id, int width, int height, int bpp, uint32_t resource_type, uint16_t resource_id, int width, int height, int bpp,
const uint32_t *palette, int has_mask) const uint32_t *palette, bool has_mask)
{ {
int success = false; bool success = false;
int y, x, color, is_masked; uint32_t frame_length = width * height * bpp / 8;
uint32_t pixel; uint32_t total_length = frame_length * (has_mask ? 2 : 1);
const uint8_t *src;
uint32_t resource_length; uint32_t resource_length;
uint32_t frame_length;
uint32_t total_length;
frame_length = width * height * bpp / 8; // attempt to fetch resource
total_length = frame_length * (has_mask ? 2 : 1); const uint8_t *src = (const uint8_t*)mac_get_resource(resource_fork, resource_fork_length, resource_type,
/* attempt to fetch resource */
src = (const uint8_t*)mac_get_resource(resource_fork, resource_fork_length, resource_type,
resource_id, &resource_length); resource_id, &resource_length);
if (src && (resource_length == total_length)) if (src && (resource_length == total_length))
{ {
for (y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
for (x = 0; x < width; x ++) for (int x = 0; x < width; x ++)
{ {
/* first check mask bit */ // check the color
if (has_mask) uint8_t color = get_pixel(src, width, height, bpp, x, y);
is_masked = get_pixel(src + frame_length, width, height, bpp, x, y);
else
is_masked = dest[y * width + x] >= 0x80000000;
if (is_masked) // then check the mask
bool is_masked = has_mask
? get_pixel(src + frame_length, width, height, bpp, x, y) != 0
: dest[y * width + x] >= 0x80000000;
// is this actually masked? (note there is a special case when bpp == 1; Mac B&W icons
// had a XOR effect, and this cannot be blocked by the mask)
uint32_t pixel;
if (is_masked || (color && bpp == 1))
{ {
/* mask is ok; check the actual icon */ // mask is ok; check the actual icon
color = get_pixel(src, width, height, bpp, x, y);
pixel = palette[color] | 0xFF000000; pixel = palette[color] | 0xFF000000;
} }
else else
{ {
/* masked out; nothing */ // masked out; nothing
pixel = 0; pixel = 0x00000000;
} }
dest[y * width + x] = pixel; dest[y * width + x] = pixel;