about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-05-10 19:12:37 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-05-10 19:12:37 +0000
commit1a47b7a701d4e4cd61fb7fbdc87584f062df4de4 (patch)
tree0bffb0cce69a4420318b647a56056aa0092dd1f1
parent9d83ca2de771e78cab93f8187743ea24ad8dc8f8 (diff)
downloadnetpbm-mirror-1a47b7a701d4e4cd61fb7fbdc87584f062df4de4.tar.gz
netpbm-mirror-1a47b7a701d4e4cd61fb7fbdc87584f062df4de4.tar.xz
netpbm-mirror-1a47b7a701d4e4cd61fb7fbdc87584f062df4de4.zip
Remove meaningless "no output" from error messages
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@623 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY2
-rw-r--r--generator/pbmtext.c11
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 947a6fa7..781a02a9 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -13,6 +13,8 @@ not yet  BJH  Release 10.43.00
 
               pbmtext: fail properly if input contains no text.
 
+              pbmtext: remove meaningless "no output" from error messages.
+
               pnmnorm: fix -colorvalue, -saturation, -keephues options.
 
               pnmnorm: fix resolution of conflicting -wpercent and -wvalue.
diff --git a/generator/pbmtext.c b/generator/pbmtext.c
index 40423db9..04736aa7 100644
--- a/generator/pbmtext.c
+++ b/generator/pbmtext.c
@@ -703,8 +703,8 @@ computeImageHeight(struct text         const formattedText,
                    unsigned int *      const rowsP) {
 
     if (interlineSpace < 0 && fontP->maxheight < -interlineSpace)
-        pm_error("-lspace value (%d) negative and exceeds font height. "
-                 "No output.", interlineSpace);     
+        pm_error("-lspace value (%d) negative and exceeds font height.",
+                 interlineSpace);     
     else {
         double const rowsD = 2 * (double) vmargin + 
             (double) formattedText.lineCount * fontP->maxheight + 
@@ -728,8 +728,8 @@ computeImageWidth(struct text         const formattedText,
                   int *               const maxleftbP) {
 
     if (intercharacterSpace < 0 && fontP->maxwidth < -intercharacterSpace)
-        pm_error("-space value (%f) negative; exceeds font width. "
-                 "No output.", intercharacterSpace);     
+        pm_error("-space value (%f) negative; exceeds font width.",
+                 intercharacterSpace);     
     else {
         /* Find the widest line, and the one that backs up the most past
            the nominal start of the line.
@@ -825,8 +825,7 @@ main(int argc, char *argv[]) {
                       &cols, &maxleftb);
 
     if (cols == 0 || rows == 0)
-        pm_error("Input is all whitespace and/or non-renderable characters.  "
-                 "No output.");
+        pm_error("Input is all whitespace and/or non-renderable characters.");
 
     bits = pbm_allocarray(cols, rows);