mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-15 07:34:35 -04:00
Fix PCX issue with odd bitmap width; tests; comment GRIDMATRIX byte count
This commit is contained in:
gitlost
parent
67fac5f600
commit
129fa81c41
14 changed files with 238 additions and 109 deletions
|
|
@ -32,7 +32,9 @@
|
|||
#include "testcommon.h"
|
||||
#include <sys/stat.h>
|
||||
|
||||
//#define TEST_PRINT_GENERATE_EXPECTED 1
|
||||
//#define TEST_PRINT_GENERATE_EXPECTED 1
|
||||
//#define TEST_PRINT_OVERWRITE_EXPECTED "bmp,emf,eps,gif,pcx,png,svg,tif,txt"
|
||||
#define TEST_PRINT_OVERWRITE_EXPECTED ""
|
||||
|
||||
static void test_print(void)
|
||||
{
|
||||
|
|
@ -47,112 +49,114 @@ static void test_print(void)
|
|||
char* expected_file;
|
||||
};
|
||||
struct item data[] = {
|
||||
/* 0*/ { BARCODE_CODE128, -1, -1, "AIM", "code128_aim"},
|
||||
/* 1*/ { BARCODE_QRCODE, 2, 1, "1234567890", "qr_v1_m"},
|
||||
/* 2*/ { BARCODE_DOTCODE, -1, -1, "2741", "dotcode_aim_fig7"},
|
||||
/* 0*/ { BARCODE_CODE128, -1, -1, "AIM", "code128_aim" },
|
||||
/* 1*/ { BARCODE_QRCODE, 2, 1, "1234567890", "qr_v1_m" },
|
||||
/* 2*/ { BARCODE_DOTCODE, -1, -1, "2741", "dotcode_aim_fig7" },
|
||||
};
|
||||
int data_size = sizeof(data) / sizeof(struct item);
|
||||
|
||||
char* exts[] = { "bmp", "emf", "eps", "gif", "pcx", "png", "svg", "tif", "txt" };
|
||||
int exts_len = sizeof(exts) / sizeof(char*);
|
||||
char* exts[] = { "bmp", "emf", "eps", "gif", "pcx", "png", "svg", "tif", "txt" };
|
||||
int exts_len = sizeof(exts) / sizeof(char*);
|
||||
|
||||
char data_dir[1024];
|
||||
char expected_file[1024];
|
||||
char data_dir[1024];
|
||||
char expected_file[1024];
|
||||
|
||||
char escaped[1024];
|
||||
int escaped_size = 1024;
|
||||
|
||||
#ifdef TEST_PRINT_GENERATE_EXPECTED
|
||||
strcpy(data_dir, "../data");
|
||||
strcpy(data_dir, "../data");
|
||||
if (!testUtilExists(data_dir)) {
|
||||
ret = mkdir(data_dir, 0755);
|
||||
assert_zero(ret, "mkdir(%s) ret %d != 0\n", data_dir, ret);
|
||||
}
|
||||
strcat(data_dir, "/print");
|
||||
strcat(data_dir, "/print");
|
||||
if (!testUtilExists(data_dir)) {
|
||||
ret = mkdir(data_dir, 0755);
|
||||
assert_zero(ret, "mkdir(%s) ret %d != 0\n", data_dir, ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
for (int j = 0; j < exts_len; j++) {
|
||||
strcpy(data_dir, "../data/print/");
|
||||
strcat(data_dir, exts[j]);
|
||||
for (int j = 0; j < exts_len; j++) {
|
||||
strcpy(data_dir, "../data/print/");
|
||||
strcat(data_dir, exts[j]);
|
||||
|
||||
#ifdef TEST_PRINT_GENERATE_EXPECTED
|
||||
if (!testUtilExists(data_dir)) {
|
||||
ret = mkdir(data_dir, 0755);
|
||||
assert_zero(ret, "mkdir(%s) ret %d != 0\n", data_dir, ret);
|
||||
}
|
||||
#endif
|
||||
#ifdef TEST_PRINT_GENERATE_EXPECTED
|
||||
if (!testUtilExists(data_dir)) {
|
||||
ret = mkdir(data_dir, 0755);
|
||||
assert_zero(ret, "mkdir(%s) ret %d != 0\n", data_dir, ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
for (int i = 0; i < data_size; i++) {
|
||||
for (int i = 0; i < data_size; i++) {
|
||||
|
||||
struct zint_symbol* symbol = ZBarcode_Create();
|
||||
assert_nonnull(symbol, "Symbol not created\n");
|
||||
struct zint_symbol* symbol = ZBarcode_Create();
|
||||
assert_nonnull(symbol, "Symbol not created\n");
|
||||
|
||||
symbol->symbology = data[i].symbology;
|
||||
if (data[i].option_1 != -1) {
|
||||
symbol->option_1 = data[i].option_1;
|
||||
}
|
||||
if (data[i].option_2 != -1) {
|
||||
symbol->option_2 = data[i].option_2;
|
||||
}
|
||||
symbol->symbology = data[i].symbology;
|
||||
if (data[i].option_1 != -1) {
|
||||
symbol->option_1 = data[i].option_1;
|
||||
}
|
||||
if (data[i].option_2 != -1) {
|
||||
symbol->option_2 = data[i].option_2;
|
||||
}
|
||||
|
||||
int length = strlen(data[i].data);
|
||||
int length = strlen(data[i].data);
|
||||
|
||||
ret = ZBarcode_Encode(symbol, data[i].data, length);
|
||||
assert_zero(ret, "i:%d %s ZBarcode_Encode ret %d != 0 %s\n", i, testUtilBarcodeName(data[i].symbology), ret, symbol->errtxt);
|
||||
ret = ZBarcode_Encode(symbol, data[i].data, length);
|
||||
assert_zero(ret, "i:%d %s ZBarcode_Encode ret %d != 0 %s\n", i, testUtilBarcodeName(data[i].symbology), ret, symbol->errtxt);
|
||||
|
||||
strcpy(symbol->outfile, "out.");
|
||||
strcat(symbol->outfile, exts[j]);
|
||||
strcpy(symbol->outfile, "out.");
|
||||
strcat(symbol->outfile, exts[j]);
|
||||
|
||||
strcpy(expected_file, data_dir);
|
||||
strcat(expected_file, "/");
|
||||
strcat(expected_file, data[i].expected_file);
|
||||
strcat(expected_file, ".");
|
||||
strcat(expected_file, exts[j]);
|
||||
strcpy(expected_file, data_dir);
|
||||
strcat(expected_file, "/");
|
||||
strcat(expected_file, data[i].expected_file);
|
||||
strcat(expected_file, ".");
|
||||
strcat(expected_file, exts[j]);
|
||||
|
||||
ret = ZBarcode_Print(symbol, 0);
|
||||
assert_zero(ret, "i:%d j:%d %s %s ZBarcode_Print %s ret %d != 0\n", i, j, exts[j], testUtilBarcodeName(data[i].symbology), symbol->outfile, ret);
|
||||
ret = ZBarcode_Print(symbol, 0);
|
||||
assert_zero(ret, "i:%d j:%d %s %s ZBarcode_Print %s ret %d != 0\n", i, j, exts[j], testUtilBarcodeName(data[i].symbology), symbol->outfile, ret);
|
||||
|
||||
#ifdef TEST_PRINT_GENERATE_EXPECTED
|
||||
#ifdef TEST_PRINT_GENERATE_EXPECTED
|
||||
|
||||
if (j == 0) {
|
||||
printf(" /*%3d*/ { %s, %d, %d, \"%s\", \"%s\"},\n",
|
||||
i, testUtilBarcodeName(data[i].symbology), data[i].option_1, data[i].option_2, testUtilEscape(data[i].data, length, escaped, escaped_size), data[i].expected_file);
|
||||
}
|
||||
ret = rename(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d rename(%s, %s) ret %d != 0\n", i, symbol->outfile, expected_file, ret);
|
||||
if (j == 0) {
|
||||
printf(" /*%3d*/ { %s, %d, %d, \"%s\", \"%s\" },\n",
|
||||
i, testUtilBarcodeName(data[i].symbology), data[i].option_1, data[i].option_2, testUtilEscape(data[i].data, length, escaped, escaped_size), data[i].expected_file);
|
||||
}
|
||||
if (strstr(TEST_PRINT_OVERWRITE_EXPECTED, exts[j])) {
|
||||
ret = rename(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d rename(%s, %s) ret %d != 0\n", i, symbol->outfile, expected_file, ret);
|
||||
}
|
||||
|
||||
#else
|
||||
#else
|
||||
|
||||
assert_nonzero(testUtilExists(symbol->outfile), "i:%d j:%d %s testUtilExists(%s) == 0\n", i, j, exts[j], symbol->outfile);
|
||||
assert_nonzero(testUtilExists(symbol->outfile), "i:%d j:%d %s testUtilExists(%s) == 0\n", i, j, exts[j], symbol->outfile);
|
||||
|
||||
if (strcmp(exts[j], "eps") == 0) {
|
||||
ret = testUtilCmpEpss(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpEpss(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "png") == 0) {
|
||||
ret = testUtilCmpPngs(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpPngs(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "svg") == 0) {
|
||||
ret = testUtilCmpSvgs(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpSvgs(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "txt") == 0) {
|
||||
ret = testUtilCmpTxts(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpTxts(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else {
|
||||
ret = testUtilCmpBins(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpBins(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
}
|
||||
if (strcmp(exts[j], "eps") == 0) {
|
||||
ret = testUtilCmpEpss(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpEpss(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "png") == 0) {
|
||||
ret = testUtilCmpPngs(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpPngs(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "svg") == 0) {
|
||||
ret = testUtilCmpSvgs(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpSvgs(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else if (strcmp(exts[j], "txt") == 0) {
|
||||
ret = testUtilCmpTxts(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpTxts(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
} else {
|
||||
ret = testUtilCmpBins(symbol->outfile, expected_file);
|
||||
assert_zero(ret, "i:%d %s testUtilCmpBins(%s, %s) %d != 0\n", i, testUtilBarcodeName(data[i].symbology), symbol->outfile, expected_file, ret);
|
||||
}
|
||||
|
||||
assert_zero(remove(symbol->outfile), "i:%d remove(%s) != 0\n", i, symbol->outfile);
|
||||
assert_zero(remove(symbol->outfile), "i:%d remove(%s) != 0\n", i, symbol->outfile);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
ZBarcode_Delete(symbol);
|
||||
}
|
||||
}
|
||||
ZBarcode_Delete(symbol);
|
||||
}
|
||||
}
|
||||
|
||||
testFinish();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue