comparison tools/lib64gfx.c @ 2414:69a5af2eb1ea

Remove useless dmMemset().
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 13 Jan 2020 23:27:01 +0200
parents c5a32812dd97
children 5c1e3744434b
comparison
equal deleted inserted replaced
2413:902cc22018a1 2414:69a5af2eb1ea
113 return DMERR_OK; 113 return DMERR_OK;
114 114
115 if ((blk->data = dmRealloc(blk->data, size)) == NULL) 115 if ((blk->data = dmRealloc(blk->data, size)) == NULL)
116 return DMERR_MALLOC; 116 return DMERR_MALLOC;
117 117
118 dmMemset(blk->data + blk->size, 0, size - blk->size); 118 memset(blk->data + blk->size, 0, size - blk->size);
119 119
120 blk->size = size; 120 blk->size = size;
121 return DMERR_OK; 121 return DMERR_OK;
122 } 122 }
123 123
162 } 162 }
163 163
164 img->fmt = fmt->format; 164 img->fmt = fmt->format;
165 img->nblocks = nblocks + 1; 165 img->nblocks = nblocks + 1;
166 166
167 dmMemset(img->extraInfo, 0, sizeof(img->extraInfo)); 167 memset(img->extraInfo, 0, sizeof(img->extraInfo));
168 img->extraInfo[D64_EI_MODE] = fmt->format->mode; 168 img->extraInfo[D64_EI_MODE] = fmt->format->mode;
169 } 169 }
170 170
171 171
172 DMC64Image *dmC64ImageAlloc(const DMC64ImageFormat *fmt) 172 DMC64Image *dmC64ImageAlloc(const DMC64ImageFormat *fmt)
215 215
216 // Extra data .. 216 // Extra data ..
217 for (int i = 0; i < D64_MAX_EXTRA_DATA; i++) 217 for (int i = 0; i < D64_MAX_EXTRA_DATA; i++)
218 dmC64MemBlockFree(&img->extraData[i]); 218 dmC64MemBlockFree(&img->extraData[i]);
219 219
220 dmMemset(img, 0, sizeof(DMC64Image)); 220 memset(img, 0, sizeof(DMC64Image));
221 dmFree(img); 221 dmFree(img);
222 } 222 }
223 } 223 }
224 224
225 225
977 case DO_COPY: 977 case DO_COPY:
978 memcpy(blk->data + ctx.op->blkoffs, src, ctx.size); 978 memcpy(blk->data + ctx.op->blkoffs, src, ctx.size);
979 break; 979 break;
980 980
981 case DO_SET_MEM: 981 case DO_SET_MEM:
982 dmMemset(blk->data + ctx.op->blkoffs, *src, ctx.size); 982 memset(blk->data + ctx.op->blkoffs, *src, ctx.size);
983 break; 983 break;
984 984
985 case DO_SET_MEM_HI: 985 case DO_SET_MEM_HI:
986 dmMemset(blk->data + ctx.op->blkoffs, (*src >> 4) & 0x0f, ctx.size); 986 memset(blk->data + ctx.op->blkoffs, (*src >> 4) & 0x0f, ctx.size);
987 break; 987 break;
988 988
989 case DO_SET_MEM_LO: 989 case DO_SET_MEM_LO:
990 dmMemset(blk->data + ctx.op->blkoffs, *src & 0x0f, ctx.size); 990 memset(blk->data + ctx.op->blkoffs, *src & 0x0f, ctx.size);
991 break; 991 break;
992 992
993 case DO_SET_OP: 993 case DO_SET_OP:
994 dmMemset(blk->data + ctx.op->blkoffs, ctx.op->offs, ctx.size); 994 memset(blk->data + ctx.op->blkoffs, ctx.op->offs, ctx.size);
995 break; 995 break;
996 996
997 default: 997 default:
998 return dmC64EncDecError(&ctx, DMERR_INTERNAL, 998 return dmC64EncDecError(&ctx, DMERR_INTERNAL,
999 "Unhandled op type '%s'", 999 "Unhandled op type '%s'",
1478 return dmError(DMERR_INVALID_DATA, 1478 return dmError(DMERR_INVALID_DATA,
1479 "Invalid bitmap image type/fmt=0x%x.\n", 1479 "Invalid bitmap image type/fmt=0x%x.\n",
1480 src->extraInfo[D64_EI_MODE]); 1480 src->extraInfo[D64_EI_MODE]);
1481 } 1481 }
1482 1482
1483 dmMemset(dst->data, 0, dst->size); 1483 memset(dst->data, 0, dst->size);
1484 dmMemset(&scan, 0, sizeof(scan)); 1484 memset(&scan, 0, sizeof(scan));
1485 1485
1486 // Perform conversion 1486 // Perform conversion
1487 for (int yc = 0; yc < dst->height; yc++) 1487 for (int yc = 0; yc < dst->height; yc++)
1488 { 1488 {
1489 scan.col = dst->data + (yc * dst->pitch); 1489 scan.col = dst->data + (yc * dst->pitch);