diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-14 04:01:27 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-14 04:01:27 +0000 |
| commit | 3ba9c81c29daf07cf339060bde7efc670e93cb8e (patch) | |
| tree | bc19648e287afa1e6b08038c1a67b4d6fdd82553 /lib/libpam.c | |
| parent | 7f5a12073d3a2b4b649f9ad6f7ef26998b9e8034 (diff) | |
| download | netpbm-mirror-3ba9c81c29daf07cf339060bde7efc670e93cb8e.tar.gz netpbm-mirror-3ba9c81c29daf07cf339060bde7efc670e93cb8e.tar.xz netpbm-mirror-3ba9c81c29daf07cf339060bde7efc670e93cb8e.zip | |
Fix wrong string comparison: looks at only first 4 bytes of tuple type, making GRAYSCALE_ALPHA look like GRAYSCALE
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1810 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib/libpam.c')
| -rw-r--r-- | lib/libpam.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libpam.c b/lib/libpam.c index 545b928f..b4aaeb95 100644 --- a/lib/libpam.c +++ b/lib/libpam.c @@ -805,7 +805,7 @@ interpretTupleType(struct pam * const pamP) { switch (PAM_FORMAT_TYPE(pamP->format)) { case PAM_TYPE: { - if (STRSEQ(tupleType, "BLACKANDWHITE")) { + if (streq(tupleType, "BLACKANDWHITE")) { visual = true; colorDepth = 1; haveOpacity = false; @@ -813,22 +813,22 @@ interpretTupleType(struct pam * const pamP) { pm_error("maxval %u is not consistent with tuple type " "BLACKANDWHITE (should be 1)", (unsigned)pamP->maxval); - } else if (STRSEQ(tupleType, "GRAYSCALE")) { + } else if (streq(tupleType, "GRAYSCALE")) { visual = true; colorDepth = 1; haveOpacity = false; - } else if (STRSEQ(tupleType, "GRAYSCALE_ALPHA")) { + } else if (streq(tupleType, "GRAYSCALE_ALPHA")) { visual = true; colorDepth = 1; haveOpacity = true; opacityPlane = PAM_GRAY_TRN_PLANE; validateMinDepth(pamP, 2); - } else if (STRSEQ(tupleType, "RGB")) { + } else if (streq(tupleType, "RGB")) { visual = true; colorDepth = 3; haveOpacity = false; validateMinDepth(pamP, 3); - } else if (STRSEQ(tupleType, "RGB_ALPHA")) { + } else if (streq(tupleType, "RGB_ALPHA")) { visual = true; colorDepth = 3; haveOpacity = true; @@ -1294,7 +1294,7 @@ pnm_getopacity(const struct pam * const pamP, bool * const haveOpacityP, unsigned int * const opacityPlaneP) { - /* Usage note: this is obsolete since we added 'haveOpacity', etc. + /* Usage note: this is obsolete since we added 'have_opacity', etc. to struct pam. */ if (streq(pamP->tuple_type, "RGB_ALPHA")) { |