mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-12 22:25:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

- cmake: remove zintconfig.h.in for now as incompatible with MSVC

Browse source 
project builds (will add back in future if go fully CMake)
- NO_PNG -> ZINT_NO_PNG and new API function `Zint_NoPng()` to
  determine if no PNG support in libzint; replace use in GUI with
  backend_qt method `noPng()`
This commit is contained in:
gitlost 2022-11-24 14:18:31 +00:00
parent 536a581d9e
commit 6393813cff
31 changed files with 138 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/main.c
View file

@ -1000,7 +1000,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "Error 151: Memory failure\n");
exit(ZINT_ERROR_MEMORY);
}
no_png = strcmp(my_symbol->outfile, "out.gif") == 0;
no_png = ZBarcode_NoPng();
if (argc == 1) {
ZBarcode_Delete(my_symbol);

12
frontend/tests/test_args.c
View file

@ -1176,11 +1176,7 @@ static void test_other_opts(const testCtx *const p_ctx) {
char cmd[4096];
char buf[8192];
#ifdef NO_PNG
const char *outfilename = "out.gif";
#else
const char *outfilename = "out.png";
#endif
const char *outfilename = ZBarcode_NoPng() ? "out.gif" : "out.png";
testStart("test_other_opts");
@ -1244,11 +1240,7 @@ static void test_exit_status(const testCtx *const p_ctx) {
char cmd[4096];
char buf[8192];
#ifdef NO_PNG
const char *outfilename = "out.gif";
#else
const char *outfilename = "out.png";
#endif
const char *outfilename = ZBarcode_NoPng() ? "out.gif" : "out.png";
testStart("test_exit_status");