diff options
| -rw-r--r-- | doc/HISTORY | 3 | ||||
| -rw-r--r-- | generator/pbmtext.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 0134940a..48c7eb50 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -28,6 +28,9 @@ not yet BJH Release 10.87.00 pnmcrop: fix bug: -bgcolor doesn't work. Always present (-bgcolor was introduced in Netpbm 10.86 (March 2019)). + pbmtext: fix bug: don't ignore -builtin when specified with + -font. Fail with syntax error instead. + pbmtozinc: fix wrong output on big-endian machines. Broken in Netpbm 10.71 (June 2015). diff --git a/generator/pbmtext.c b/generator/pbmtext.c index e6f27865..a840d1df 100644 --- a/generator/pbmtext.c +++ b/generator/pbmtext.c @@ -153,6 +153,9 @@ parseCommandLine(int argc, const char ** argv, else if (cmdlineP->lspace < -pbm_maxfontheight()) pm_error("negative -lspace value too large"); + if (cmdlineP->font != NULL && cmdlineP->builtin != NULL) + pm_error("You cannot specify both -font and -builtin"); + if (cmdlineP->textdump) { if (cmdlineP->dryrun) pm_error("You cannot specify both -dry-run and -text-dump"); @@ -170,9 +173,8 @@ parseCommandLine(int argc, const char ** argv, pm_error("-wchar is not valid when text is from command line"); cmdlineP->text = textFmCmdLine(argc, argv); - - } + free(option_def); } |