diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-02 02:54:04 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-02 02:54:04 +0000 |
| commit | c1b07e2a356b9c3beca9d31365b93166ed3ac525 (patch) | |
| tree | 9448d5bdd73fd9b73d464752266b622c790301fd | |
| parent | c09c564c9a35558115bcc72663e2f6e3ef3f0734 (diff) | |
| download | netpbm-mirror-c1b07e2a356b9c3beca9d31365b93166ed3ac525.tar.gz netpbm-mirror-c1b07e2a356b9c3beca9d31365b93166ed3ac525.tar.xz netpbm-mirror-c1b07e2a356b9c3beca9d31365b93166ed3ac525.zip | |
Identify compressed color-mapped format in error message saying format is can't be interpreted
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3412 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/tgatoppm.c | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/converter/ppm/tgatoppm.c b/converter/ppm/tgatoppm.c index 9f3db277..662f741b 100644 --- a/converter/ppm/tgatoppm.c +++ b/converter/ppm/tgatoppm.c @@ -374,6 +374,11 @@ main(int argc, char * argv[]) { case TGA_RLERGB: case TGA_RLEMono: break; + case TGA_CompMap: + case TGA_CompMap4: + pm_error("Targa image type %d (compressed color-mapped data). " + "Cannot handle this format.", tga_head.ImgType); + break; default: pm_error("unknown Targa image type %d", tga_head.ImgType); } diff --git a/doc/HISTORY b/doc/HISTORY index be561575..f27ea8ac 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -13,6 +13,9 @@ not yet BJH Release 10.85.00 picttoppm: accept rectangle specifications in input that have the corners in any order, not just upper left, then lower right. + pamtotga: identify compressed colormapped format in error + message saying the program doesn't know how to interpret it. + libnetpbm: Fix invalid memory reference in color name processing when trivial memory allocation fails. |