diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-21 18:00:16 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-21 18:00:16 +0000 |
| commit | 3a2be6f9d910b862d4e5ea237d734315627dd661 (patch) | |
| tree | 0525085036572441949db4493a31afa5c8813a91 /converter/ppm | |
| parent | 3aa04aa72c6ec522395919d528dfce6a92b0de98 (diff) | |
| download | netpbm-mirror-3a2be6f9d910b862d4e5ea237d734315627dd661.tar.gz netpbm-mirror-3a2be6f9d910b862d4e5ea237d734315627dd661.tar.xz netpbm-mirror-3a2be6f9d910b862d4e5ea237d734315627dd661.zip | |
Release 10.36.0
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@65 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm')
| -rw-r--r-- | converter/ppm/ppmtobmp.c | 2 | ||||
| -rw-r--r-- | converter/ppm/ppmtompeg/Makefile | 5 | ||||
| -rw-r--r-- | converter/ppm/xvminitoppm.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c index 071f3b12..b9ac063e 100644 --- a/converter/ppm/ppmtobmp.c +++ b/converter/ppm/ppmtobmp.c @@ -647,7 +647,7 @@ choose_colortype_bpp(struct cmdline_info const cmdline, pm_error("There are too many colors in the image to " "represent in the\n" "number of bits per pixel you requested: %d.\n" - "You may use Ppmquant to reduce the number of " + "You may use Pnmquant to reduce the number of " "colors in the image.", cmdline.bpp); else diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index 5e923fee..6db72ea9 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -18,11 +18,12 @@ else JPEGLIBX = $(JPEGLIB) endif -INCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers +COMP_INCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers +EXTERN_INCLUDES = ifneq ($(JPEGHDR_DIR),NONE) ifneq ($(JPEGHDR_DIR)x,x) - INCLUDES += -I$(JPEGHDR_DIR) + EXTERN_INCLUDES += -I$(JPEGHDR_DIR) endif endif diff --git a/converter/ppm/xvminitoppm.c b/converter/ppm/xvminitoppm.c index dfc76fcf..8cea1f9d 100644 --- a/converter/ppm/xvminitoppm.c +++ b/converter/ppm/xvminitoppm.c @@ -12,6 +12,7 @@ #include <assert.h> #include <string.h> +#include <errno.h> #include "pm_c_util.h" #include "nstring.h" @@ -61,7 +62,8 @@ getline(FILE * const ifP, rc = fgets(buf, size, ifP); if (rc == NULL) { if (ferror(ifP)) - pm_perror("read error"); + pm_error("read error. fgets() failed, errno=%d (%s)", + errno, strerror(errno)); else pm_error("unexpected EOF"); } |