diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-20 17:07:17 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-20 17:07:17 +0000 |
| commit | 79e5c046891c7dbe74fb28af94dc0166bb76df31 (patch) | |
| tree | aeb41d29522a03ab265d1c4f87b366aa4565336c /converter/ppm | |
| parent | b288a1ad383a71f61df18432d0a260e7ca03a650 (diff) | |
| download | netpbm-mirror-79e5c046891c7dbe74fb28af94dc0166bb76df31.tar.gz netpbm-mirror-79e5c046891c7dbe74fb28af94dc0166bb76df31.tar.xz netpbm-mirror-79e5c046891c7dbe74fb28af94dc0166bb76df31.zip | |
Respect -bpp with PBM input
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3460 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm')
| -rw-r--r-- | converter/ppm/ppmtobmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c index cefaab01..f89cec8d 100644 --- a/converter/ppm/ppmtobmp.c +++ b/converter/ppm/ppmtobmp.c @@ -967,7 +967,8 @@ main(int argc, ppm_readppminit(ifP, &cols, &rows, &maxval, &ppmFormat); - if (PPM_FORMAT_TYPE(ppmFormat) == PBM_TYPE) + if ((PPM_FORMAT_TYPE(ppmFormat) == PBM_TYPE) && + (!cmdline.bppSpec || cmdline.bpp == 1)) doPbm(ifP, cols, rows, ppmFormat, cmdline.class, stdout); else doPgmPpm(ifP, cols, rows, maxval, ppmFormat, |