diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-12-25 21:15:26 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-12-25 21:15:26 +0000 |
commit | 4ce684c4978610d1ea42be1b00f7332f3f5f337a (patch) | |
tree | f9e343be94161a4837f0f1c1d072a35538ae0f63 /converter/other | |
parent | 63fe73995bd1d496f1465a4446c0adc833d204dc (diff) | |
download | netpbm-mirror-4ce684c4978610d1ea42be1b00f7332f3f5f337a.tar.gz netpbm-mirror-4ce684c4978610d1ea42be1b00f7332f3f5f337a.tar.xz netpbm-mirror-4ce684c4978610d1ea42be1b00f7332f3f5f337a.zip |
Release 10.47.59
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2666 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rwxr-xr-x | converter/other/anytopnm | 37 | ||||
-rw-r--r-- | converter/other/pnmtops.c | 2 |
2 files changed, 30 insertions, 9 deletions
diff --git a/converter/other/anytopnm b/converter/other/anytopnm index 82f57b3b..06f48b4f 100755 --- a/converter/other/anytopnm +++ b/converter/other/anytopnm @@ -47,18 +47,39 @@ putInputIntoTempfile() { setMimeType() { +#------------------------------------------------------------------------------ +# Set variable 'mimeType' to the mime type string (e.g. "application/binary") +# +# If we can't tell, set it to "unknown". +#------------------------------------------------------------------------------ # $1 is the file name - # Christos Zoulas's current 'file' (see Freshmeat) has the --mime option. + # Old versions of 'file' cannot tell us the mime type; they lack any option + # to do so. + # + # Newer ones have a --mime option for that. + # + # Still newer ones (ca 2008) have a --mime option, but it does something + # different - it prints the mime type plus the mime encoding. And they + # have --mime-type to print just the mime type. - file --mime /dev/null >/dev/null 2>/dev/null + file --mime-type /dev/null >/dev/null 2>/dev/null if [ $? -eq 0 ]; then - # Now that we know the --mime option exists, use it. - mimeType=`file --mime "$1" | cut -d: -f2- | cut -c2-` + # Now that we know the --mime-type option exists, use it. + mimeType=`file --mime-type "$1" | cut -d: -f2- | cut -c2-` else - # file --mime failed; we don't know why, but we assume it's because it - # is a traditional 'file' program that doesn't have a --mime option. - mimeType="unknown" + # file --mime-type failed; we don't know why, but we assume it's + # because it is an older 'file' program that doesn't have a --mime-type + # option. + file --mime /dev/null >/dev/null 2>/dev/null + if [ $? -eq 0 ]; then + # Now that we know the --mime option exists, use it. + mimeType=`file --mime "$1" | cut -d: -f2- | cut -c2-` + else + # file --mime failed; we don't know why, but we assume it's because + # it is an older 'file' program that doesn't have a --mime option. + mimeType="unknown" + fi fi } @@ -109,7 +130,7 @@ computeTypeFromTypeDescription () { case "$1" in - *PBM* | *PGM* | *PPM* ) + *PBM* | *PGM* | *PPM* | *Netpbm*PAM*) filetype=pnm ;; diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c index 8fc8ba6b..20395952 100644 --- a/converter/other/pnmtops.c +++ b/converter/other/pnmtops.c @@ -1168,7 +1168,7 @@ convertPage(FILE * const ifP, bool const dict, bool const vmreclaim, bool const levelIsGiven, - bool const levelGiven) { + unsigned int const levelGiven) { struct pam inpam; tuple* tuplerow; |