Mercurial > hg > dmlib

comparison tools/lib64gfx.c @ 1500:3223d01ac8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some blunders in encode/decode error messages.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 May 2018 07:12:37 +0300
parents 32640e1934d5
children 9ccf973f65ac
comparison
equal deleted inserted replaced
1499:32640e1934d5 1500:3223d01ac8e8
1584 case DT_CHAR_DATA: memcpy(dst, img->charmem[op->bank], size); break; 1584 case DT_CHAR_DATA: memcpy(dst, img->charmem[op->bank], size); break;
1585 case DT_EXTRA_DATA: 1585 case DT_EXTRA_DATA:
1586 if (img->extraData[op->bank] == NULL) 1586 if (img->extraData[op->bank] == NULL)
1587 { 1587 {
1588 res = dmError(DMERR_NULLPTR, 1588 res = dmError(DMERR_NULLPTR,
1589 "DT_EXTRA_DATA block is NULL in ", 1589 "DT_EXTRA_DATA block is NULL in "
1590 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n", 1590 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1591 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len); 1591 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1592 goto err; 1592 goto err;
1593 } 1593 }
1594 if (size > img->extraDataSizes[op->bank]) 1594 if (size > img->extraDataSizes[op->bank])
1595 { 1595 {
1596 res = dmError(DMERR_INTERNAL, 1596 res = dmError(DMERR_INTERNAL,
1597 "DT_EXTRA_DATA size mismatch %d <> %d in ", 1597 "DT_EXTRA_DATA size mismatch %d <> %d in "
1598 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n", 1598 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1599 op->size, img->extraDataSizes[op->bank], i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len); 1599 op->size, img->extraDataSizes[op->bank], i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1600 goto err; 1600 goto err;
1601 } 1601 }
1602 memcpy(dst, img->extraData[op->bank], size); 1602 memcpy(dst, img->extraData[op->bank], size);
1611 case DC_D022: *dst = img->d022; break; 1611 case DC_D022: *dst = img->d022; break;
1612 case DC_D023: *dst = img->d023; break; 1612 case DC_D023: *dst = img->d023; break;
1613 case DC_D024: *dst = img->d024; break; 1613 case DC_D024: *dst = img->d024; break;
1614 default: 1614 default:
1615 res = dmError(DMERR_INTERNAL, 1615 res = dmError(DMERR_INTERNAL,
1616 "Unhandled DT_COLOR_REG mode %d in ", 1616 "Unhandled DT_COLOR_REG mode %d in "
1617 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n", 1617 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1618 op->size, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len); 1618 op->size, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1619 goto err; 1619 goto err;
1620 } 1620 }
1621 break; 1621 break;