mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-28 05:54:19 -04:00
- raster/BMP/GIF/PCX/TIF: fix dealing with very large data (use
`size_t` as appropriate) - BMP: lessen heap memory usage by only `malloc()`ing a row, not whole file - GIF: lessen heap memory usage by paging (also simplifies some function returns); use standard colour char map - raster: add `raster_malloc()` to fail > 1GB (avoids very large output files that most systems can't handle; also lessens to some degree chances of being victim of OOM killer on Linux) - GUI: printing scale dialog: set maxima on X-dim and resolution to keep scale <= 200
This commit is contained in:
gitlost
parent
6ff485e6fa
commit
070162214b
27 changed files with 354 additions and 370 deletions
111
backend/bmp.c
111
backend/bmp.c
|
|
@ -43,13 +43,10 @@
|
|||
|
||||
INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pixelbuf) {
|
||||
int i, row, column;
|
||||
int row_size;
|
||||
int bits_per_pixel;
|
||||
int colour_count;
|
||||
int resolution;
|
||||
unsigned int data_offset, data_size, file_size;
|
||||
unsigned char *bitmap_file_start, *bmp_posn;
|
||||
unsigned char *bitmap;
|
||||
size_t row_size, data_offset, file_size;
|
||||
FILE *bmp_file;
|
||||
bitmap_file_header_t file_header;
|
||||
bitmap_info_header_t info_header;
|
||||
|
|
@ -59,6 +56,7 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
|
|||
int ultra_fg_index = 9;
|
||||
unsigned char map[128];
|
||||
const int output_to_stdout = symbol->output_options & BARCODE_STDOUT; /* Suppress gcc -fanalyzer warning */
|
||||
unsigned char *rowbuf;
|
||||
|
||||
(void) out_colour_get_rgb(symbol->fgcolour, &fg.red, &fg.green, &fg.blue, NULL /*alpha*/);
|
||||
fg.reserved = 0x00;
|
||||
|
|
@ -86,42 +84,26 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
|
|||
map['0'] = 0;
|
||||
map['1'] = 0x80;
|
||||
}
|
||||
row_size = 4 * ((bits_per_pixel * symbol->bitmap_width + 31) / 32);
|
||||
data_size = symbol->bitmap_height * row_size;
|
||||
row_size = 4 * (((size_t) symbol->bitmap_width * bits_per_pixel + 31) / 32);
|
||||
data_offset = sizeof(bitmap_file_header_t) + sizeof(bitmap_info_header_t);
|
||||
data_offset += colour_count * sizeof(color_ref_t);
|
||||
file_size = data_offset + data_size;
|
||||
data_offset += sizeof(color_ref_t) * colour_count;
|
||||
file_size = data_offset + row_size * symbol->bitmap_height;
|
||||
|
||||
bitmap_file_start = (unsigned char *) malloc(file_size);
|
||||
if (bitmap_file_start == NULL) {
|
||||
strcpy(symbol->errtxt, "602: Insufficient memory for BMP file buffer");
|
||||
/* Must fit in `uint32_t` field in header */
|
||||
if (file_size != (uint32_t) file_size) {
|
||||
strcpy(symbol->errtxt, "606: Output file size too large for BMP header");
|
||||
return ZINT_ERROR_MEMORY;
|
||||
}
|
||||
memset(bitmap_file_start, 0, file_size); /* Not required but keeps padding bytes consistent */
|
||||
|
||||
bitmap = bitmap_file_start + data_offset;
|
||||
|
||||
/* Pixel Plotting */
|
||||
if (bits_per_pixel == 4) {
|
||||
for (row = 0; row < symbol->bitmap_height; row++) {
|
||||
const unsigned char *pb = pixelbuf + (symbol->bitmap_width * (symbol->bitmap_height - row - 1));
|
||||
for (column = 0; column < symbol->bitmap_width; column++) {
|
||||
bitmap[(column >> 1) + (row * row_size)] |= map[pb[column]] << (!(column & 1) << 2);
|
||||
}
|
||||
}
|
||||
} else { /* bits_per_pixel == 1 */
|
||||
for (row = 0; row < symbol->bitmap_height; row++) {
|
||||
const unsigned char *pb = pixelbuf + (symbol->bitmap_width * (symbol->bitmap_height - row - 1));
|
||||
for (column = 0; column < symbol->bitmap_width; column++) {
|
||||
bitmap[(column >> 3) + (row * row_size)] |= map[pb[column]] >> (column & 7);
|
||||
}
|
||||
}
|
||||
if (!(rowbuf = (unsigned char *) malloc(row_size))) {
|
||||
strcpy(symbol->errtxt, "602: Insufficient memory for BMP row buffer");
|
||||
return ZINT_ERROR_MEMORY;
|
||||
}
|
||||
|
||||
file_header.header_field = 0x4d42; /* "BM" */
|
||||
file_header.file_size = file_size;
|
||||
file_header.file_size = (uint32_t) file_size;
|
||||
file_header.reserved = 0;
|
||||
file_header.data_offset = data_offset;
|
||||
file_header.data_offset = (uint32_t) data_offset;
|
||||
|
||||
info_header.header_size = sizeof(bitmap_info_header_t);
|
||||
info_header.width = symbol->bitmap_width;
|
||||
|
|
@ -136,34 +118,12 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
|
|||
info_header.colours = colour_count;
|
||||
info_header.important_colours = colour_count;
|
||||
|
||||
bmp_posn = bitmap_file_start;
|
||||
memcpy(bitmap_file_start, &file_header, sizeof(bitmap_file_header_t));
|
||||
bmp_posn += sizeof(bitmap_file_header_t);
|
||||
memcpy(bmp_posn, &info_header, sizeof(bitmap_info_header_t));
|
||||
bmp_posn += sizeof(bitmap_info_header_t);
|
||||
|
||||
memcpy(bmp_posn, &bg, sizeof(color_ref_t));
|
||||
bmp_posn += sizeof(color_ref_t);
|
||||
if (bits_per_pixel == 4) {
|
||||
for (i = 0; i < 8; i++) {
|
||||
memcpy(bmp_posn, &palette[i], sizeof(color_ref_t));
|
||||
bmp_posn += sizeof(color_ref_t);
|
||||
}
|
||||
if (ultra_fg_index == 9) {
|
||||
memcpy(bmp_posn, &fg, sizeof(color_ref_t));
|
||||
/* bmp_posn += sizeof(color_ref_t); */ /* Not needed as long as last */
|
||||
}
|
||||
} else {
|
||||
memcpy(bmp_posn, &fg, sizeof(color_ref_t));
|
||||
/* bmp_posn += sizeof(color_ref_t); */ /* Not needed as long as last */
|
||||
}
|
||||
|
||||
/* Open output file in binary mode */
|
||||
if (output_to_stdout) {
|
||||
#ifdef _MSC_VER
|
||||
if (-1 == _setmode(_fileno(stdout), _O_BINARY)) {
|
||||
sprintf(symbol->errtxt, "600: Could not set stdout to binary (%d: %.30s)", errno, strerror(errno));
|
||||
free(bitmap_file_start);
|
||||
free(rowbuf);
|
||||
return ZINT_ERROR_FILE_ACCESS;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -171,16 +131,50 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
|
|||
} else {
|
||||
if (!(bmp_file = out_fopen(symbol->outfile, "wb"))) {
|
||||
sprintf(symbol->errtxt, "601: Could not open output file (%d: %.30s)", errno, strerror(errno));
|
||||
free(bitmap_file_start);
|
||||
free(rowbuf);
|
||||
return ZINT_ERROR_FILE_ACCESS;
|
||||
}
|
||||
}
|
||||
|
||||
fwrite(bitmap_file_start, file_header.file_size, 1, bmp_file);
|
||||
fwrite(&file_header, sizeof(bitmap_file_header_t), 1, bmp_file);
|
||||
fwrite(&info_header, sizeof(bitmap_info_header_t), 1, bmp_file);
|
||||
|
||||
fwrite(&bg, sizeof(color_ref_t), 1, bmp_file);
|
||||
if (bits_per_pixel == 4) {
|
||||
for (i = 0; i < 8; i++) {
|
||||
fwrite(&palette[i], sizeof(color_ref_t), 1, bmp_file);
|
||||
}
|
||||
if (ultra_fg_index == 9) {
|
||||
fwrite(&fg, sizeof(color_ref_t), 1, bmp_file);
|
||||
}
|
||||
} else {
|
||||
fwrite(&fg, sizeof(color_ref_t), 1, bmp_file);
|
||||
}
|
||||
|
||||
/* Pixel Plotting */
|
||||
if (bits_per_pixel == 4) {
|
||||
for (row = 0; row < symbol->bitmap_height; row++) {
|
||||
const unsigned char *pb = pixelbuf + ((size_t) symbol->bitmap_width * (symbol->bitmap_height - row - 1));
|
||||
memset(rowbuf, 0, row_size);
|
||||
for (column = 0; column < symbol->bitmap_width; column++) {
|
||||
rowbuf[column >> 1] |= map[pb[column]] << (!(column & 1) << 2);
|
||||
}
|
||||
fwrite(rowbuf, 1, row_size, bmp_file);
|
||||
}
|
||||
} else { /* bits_per_pixel == 1 */
|
||||
for (row = 0; row < symbol->bitmap_height; row++) {
|
||||
const unsigned char *pb = pixelbuf + ((size_t) symbol->bitmap_width * (symbol->bitmap_height - row - 1));
|
||||
memset(rowbuf, 0, row_size);
|
||||
for (column = 0; column < symbol->bitmap_width; column++) {
|
||||
rowbuf[column >> 3] |= map[pb[column]] >> (column & 7);
|
||||
}
|
||||
fwrite(rowbuf, 1, row_size, bmp_file);
|
||||
}
|
||||
}
|
||||
free(rowbuf);
|
||||
|
||||
if (ferror(bmp_file)) {
|
||||
sprintf(symbol->errtxt, "603: Incomplete write to output (%d: %.30s)", errno, strerror(errno));
|
||||
free(bitmap_file_start);
|
||||
if (!output_to_stdout) {
|
||||
(void) fclose(bmp_file);
|
||||
}
|
||||
|
|
@ -190,18 +184,15 @@ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, const unsigned char *pix
|
|||
if (output_to_stdout) {
|
||||
if (fflush(bmp_file) != 0) {
|
||||
sprintf(symbol->errtxt, "604: Incomplete flush to output (%d: %.30s)", errno, strerror(errno));
|
||||
free(bitmap_file_start);
|
||||
return ZINT_ERROR_FILE_WRITE;
|
||||
}
|
||||
} else {
|
||||
if (fclose(bmp_file) != 0) {
|
||||
sprintf(symbol->errtxt, "605: Failure on closing output file (%d: %.30s)", errno, strerror(errno));
|
||||
free(bitmap_file_start);
|
||||
return ZINT_ERROR_FILE_WRITE;
|
||||
}
|
||||
}
|
||||
|
||||
free(bitmap_file_start);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue