mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

common: set_height() workaround gcc 12.2.1 issue using temp volatiles (#269)

Browse Source 
test_library: skip test_encode_file_unreadable() if root (#268, #269)
test_args: clean up out.gif/png in test_checks/other_opts() (#268, #269)
This commit is contained in:
gitlost 2022-09-05 15:11:46 +01:00
parent c790f36815
commit ac80b33c3c
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/common.c
View File

@ -487,22 +487,32 @@ INTERNAL int set_height(struct zint_symbol *symbol, const float min_row_height,
if (row_height < 0.5f) { /* Absolute minimum */
row_height = 0.5f;
}
if (min_row_height && stripf(row_height) < stripf(min_row_height)) {
if (min_row_height) {
/* This seems necessary to get gcc 12.2.1 to work consistently for static 32-bit builds */
volatile const float row_height_strip = stripf(row_height);
volatile const float min_row_height_strip = stripf(min_row_height);
if (row_height_strip < min_row_height_strip) {
error_number = ZINT_WARN_NONCOMPLIANT;
if (!no_errtxt) {
strcpy(symbol->errtxt, "247: Height not compliant with standards");
}
}
}
symbol->height = stripf(row_height * zero_count + fixed_height);
} else {
symbol->height = stripf(fixed_height); /* Ignore any given height */
}
if (max_height && stripf(symbol->height) > stripf(max_height)) {
if (max_height) {
/* See above */
volatile const float symbol_height_strip = stripf(symbol->height);
volatile const float max_height_strip = stripf(max_height);
if (symbol_height_strip > max_height_strip) {
error_number = ZINT_WARN_NONCOMPLIANT;
if (!no_errtxt) {
strcpy(symbol->errtxt, "248: Height not compliant with standards");
}
}
}
return error_number;
}

4
backend/tests/test_library.c
View File

@ -837,6 +837,10 @@ static void test_encode_file_unreadable(void) {
#ifdef _WIN32
testSkip("Test not implemented on Windows");
#else
if (getuid() == 0) {
testSkip("Test not available as root");
return;
}
symbol = ZBarcode_Create();
assert_nonnull(symbol, "Symbol not created\n");

20
frontend/tests/test_args.c
View File

@ -803,7 +803,7 @@ static void test_checks(int index, int debug) {
char cmd[4096];
char buf[4096];
char *outfilename = "out.gif";
const char *outfilename = "out.gif";
testStart("test_checks");
@ -1064,7 +1064,7 @@ static void test_barcode_symbology(int index, int debug) {
char cmd[4096];
char buf[8192];
char *outfilename = "out.gif";
const char *outfilename = "out.gif";
testStart("test_barcode_symbology");
@ -1158,6 +1158,11 @@ static void test_other_opts(int index, int debug) {
char cmd[4096];
char buf[8192];
#ifdef NO_PNG
const char *outfilename = "out.gif";
#else
const char *outfilename = "out.png";
#endif
testStart("test_other_opts");
@ -1183,6 +1188,9 @@ static void test_other_opts(int index, int debug) {
assert_nonnull(strstr(buf, data[i].expected), "i:%d strstr buf (%s) != expected (%s) (%s)\n", i, buf, data[i].expected, cmd);
} else {
assert_zero(strcmp(buf, data[i].expected), "i:%d strcmp buf (%s) != expected (%s) (%s)\n", i, buf, data[i].expected, cmd);
if (strstr(data[i].expected, "Error") == NULL) {
assert_zero(remove(outfilename), "i:%d remove(%s) != 0 (%d: %s)\n", i, outfilename, errno, strerror(errno));
}
}
}
@ -1214,6 +1222,11 @@ static void test_exit_status(int index, int debug) {
char cmd[4096];
char buf[8192];
#ifdef NO_PNG
const char *outfilename = "out.gif";
#else
const char *outfilename = "out.png";
#endif
testStart("test_exit_status");
@ -1237,6 +1250,9 @@ static void test_exit_status(int index, int debug) {
assert_nonnull(exec(cmd, buf, sizeof(buf) - 1, debug, i, &exit_status), "i:%d exec(%s) NULL\n", i, cmd);
assert_equal(exit_status, data[i].expected, "i:%d exit_status %d != expected (%d) (%s), (cmd: %s)\n", i, exit_status, data[i].expected, buf, cmd);
if (data[i].expected < ZINT_ERROR) {
assert_zero(remove(outfilename), "i:%d remove(%s) != 0 (%d: %s)\n", i, outfilename, errno, strerror(errno));
}
}
testFinish();