Mercurial > hg > dmlib

comparison tools/lib64gfx.c @ 1586:3c9e5962eca6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename DT_BITMAP to DT_BITMAP_RAM.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 14 May 2018 04:11:31 +0300
parents 72f809e6eb3c
children ca087c0cc9c4
comparison
equal deleted inserted replaced
1584:f1b279ba47a8 1586:3c9e5962eca6
506 int dmC64SanityCheckEncDecOp(const int i, const DMC64EncDecOp *op, const DMC64Image *img) 506 int dmC64SanityCheckEncDecOp(const int i, const DMC64EncDecOp *op, const DMC64Image *img)
507 { 507 {
508 switch (op->type) 508 switch (op->type)
509 { 509 {
510 case DT_COLOR_RAM: 510 case DT_COLOR_RAM:
511 case DT_BITMAP: 511 case DT_BITMAP_RAM:
512 case DT_SCREEN_RAM: 512 case DT_SCREEN_RAM:
513 case DT_CHAR_DATA: 513 case DT_CHAR_DATA:
514 if (op->bank < 0 || op->bank > img->nbanks) 514 if (op->bank < 0 || op->bank > img->nbanks)
515 { 515 {
516 return dmError(DMERR_INTERNAL, 516 return dmError(DMERR_INTERNAL,
547 case DT_SCREEN_RAM: 547 case DT_SCREEN_RAM:
548 case DT_COLOR_RAM: 548 case DT_COLOR_RAM:
549 *size = fmt->chHeight * fmt->chWidth; 549 *size = fmt->chHeight * fmt->chWidth;
550 break; 550 break;
551 551
552 case DT_BITMAP: 552 case DT_BITMAP_RAM:
553 *size = fmt->chHeight * fmt->chWidth * 8; 553 *size = fmt->chHeight * fmt->chWidth * 8;
554 break; 554 break;
555 555
556 case DT_CHAR_DATA: 556 case DT_CHAR_DATA:
557 *size = C64_MAX_CHARS * C64_CHR_SIZE; 557 *size = C64_MAX_CHARS * C64_CHR_SIZE;
628 628
629 // Perform operation 629 // Perform operation
630 switch (op->type) 630 switch (op->type)
631 { 631 {
632 case DT_COLOR_RAM: memcpy(img->color[op->bank], src, size); break; 632 case DT_COLOR_RAM: memcpy(img->color[op->bank], src, size); break;
633 case DT_BITMAP: memcpy(img->bitmap[op->bank], src, size); break; 633 case DT_BITMAP_RAM: memcpy(img->bitmap[op->bank], src, size); break;
634 case DT_SCREEN_RAM: memcpy(img->screen[op->bank], src, size); break; 634 case DT_SCREEN_RAM: memcpy(img->screen[op->bank], src, size); break;
635 case DT_CHAR_DATA: memcpy(img->charmem[op->bank], src, size); break; 635 case DT_CHAR_DATA: memcpy(img->charmem[op->bank], src, size); break;
636 case DT_EXTRA_DATA: 636 case DT_EXTRA_DATA:
637 if (img->extraData[op->bank] != NULL) 637 if (img->extraData[op->bank] != NULL)
638 { 638 {
789 // Perform operation 789 // Perform operation
790 Uint8 *dst = buf->data + op->offs; 790 Uint8 *dst = buf->data + op->offs;
791 switch (op->type) 791 switch (op->type)
792 { 792 {
793 case DT_COLOR_RAM: memcpy(dst, img->color[op->bank], size); break; 793 case DT_COLOR_RAM: memcpy(dst, img->color[op->bank], size); break;
794 case DT_BITMAP: memcpy(dst, img->bitmap[op->bank], size); break; 794 case DT_BITMAP_RAM: memcpy(dst, img->bitmap[op->bank], size); break;
795 case DT_SCREEN_RAM: memcpy(dst, img->screen[op->bank], size); break; 795 case DT_SCREEN_RAM: memcpy(dst, img->screen[op->bank], size); break;
796 case DT_CHAR_DATA: memcpy(dst, img->charmem[op->bank], size); break; 796 case DT_CHAR_DATA: memcpy(dst, img->charmem[op->bank], size); break;
797 case DT_EXTRA_DATA: 797 case DT_EXTRA_DATA:
798 if (img->extraData[op->bank] == NULL) 798 if (img->extraData[op->bank] == NULL)
799 { 799 {