mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-27 21:44:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix PCX issue with odd bitmap width; tests; comment GRIDMATRIX byte count

Browse source
This commit is contained in:
gitlost 2020-04-06 21:26:13 +01:00
parent 67fac5f600
commit 129fa81c41
14 changed files with 238 additions and 109 deletions
backend
pcx.c

40
backend/pcx.c
View file

@ -1,8 +1,9 @@
/* pcx.c - Handles output to ZSoft PCX file */
/* ZSoft PCX File Format Technical Reference Manual http://bespin.org/~qz/pc-gpe/pcx.txt */
/*
libzint - the open source barcode library
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009 - 2020 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -32,7 +33,6 @@
/* vim: set ts=4 sw=4 et : */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "common.h"
#include "pcx.h" /* PCX header structure */
@ -43,24 +43,26 @@
#include <malloc.h>
#endif
#define SSET "0123456789ABCDEF"
INTERNAL int pcx_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
int fgred, fggrn, fgblu, bgred, bggrn, bgblu;
int row, column, i, colour;
int run_count;
FILE *pcx_file;
pcx_header_t header;
int bytes_per_line = symbol->bitmap_width + (symbol->bitmap_width & 1); // Must be even
unsigned char previous;
#ifdef _MSC_VER
unsigned char* rle_row;
#endif
#ifndef _MSC_VER
unsigned char rle_row[symbol->bitmap_width];
unsigned char rle_row[bytes_per_line];
#else
rle_row = (unsigned char *) _alloca((symbol->bitmap_width * 6) * sizeof (unsigned char));
rle_row = (unsigned char *) _alloca(bytes_per_line);
#endif /* _MSC_VER */
rle_row[bytes_per_line - 1] = 0; // Will remain zero if bitmap_width odd
fgred = (16 * ctoi(symbol->fgcolour[0])) + ctoi(symbol->fgcolour[1]);
fggrn = (16 * ctoi(symbol->fgcolour[2])) + ctoi(symbol->fgcolour[3]);
fgblu = (16 * ctoi(symbol->fgcolour[4])) + ctoi(symbol->fgcolour[5]);
@ -87,11 +89,7 @@ INTERNAL int pcx_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
header.reserved = 0;
header.number_of_planes = 3;
if (symbol->bitmap_width % 2) {
header.bytes_per_line = symbol->bitmap_width + 1;
} else {
header.bytes_per_line = symbol->bitmap_width;
}
header.bytes_per_line = bytes_per_line;
header.palette_info = 1; // Colour
header.horiz_screen_size = 0;
@ -192,23 +190,29 @@ INTERNAL int pcx_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
}
}
/* Based on ImageMagick/coders/pcx.c PCXWritePixels()
* Copyright 1999-2020 ImageMagick Studio LLC */
previous = rle_row[0];
run_count = 1;
for (column = 1; column < symbol->bitmap_width; column++) {
if ((rle_row[column - 1] == rle_row[column]) && (run_count < 63)) {
for (column = 1; column < bytes_per_line; column++) { // Note going up to bytes_per_line
if ((previous == rle_row[column]) && (run_count < 63)) {
run_count++;
} else {
run_count += 0xc0;
fputc(run_count, pcx_file);
fputc(rle_row[column - 1], pcx_file);
if (run_count > 1 || (previous & 0xc0) == 0xc0) {
run_count += 0xc0;
fputc(run_count, pcx_file);
}
fputc(previous, pcx_file);
previous = rle_row[column];
run_count = 1;
}
}
if (run_count > 1) {
if (run_count > 1 || (previous & 0xc0) == 0xc0) {
run_count += 0xc0;
fputc(run_count, pcx_file);
fputc(rle_row[column - 1], pcx_file);
}
fputc(previous, pcx_file);
}
}