diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-03-09 20:59:46 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-03-09 20:59:46 +0000 |
commit | cb53fc2ba85f23c7ed7dc7989ee320d1f4bbc050 (patch) | |
tree | 749098dab48e19b2fb3e1879cbf1d540304606b9 /lib | |
parent | 8f80e06d275b97ebd3dcc3a1dcf3b6adb190de2f (diff) | |
download | netpbm-mirror-cb53fc2ba85f23c7ed7dc7989ee320d1f4bbc050.tar.gz netpbm-mirror-cb53fc2ba85f23c7ed7dc7989ee320d1f4bbc050.tar.xz netpbm-mirror-cb53fc2ba85f23c7ed7dc7989ee320d1f4bbc050.zip |
Fix bug from a week ago
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2158 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libppm1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libppm1.c b/lib/libppm1.c index 0658529a..ff940540 100644 --- a/lib/libppm1.c +++ b/lib/libppm1.c @@ -246,7 +246,7 @@ validateRppmRow(pixel * const pixelrow, } else { unsigned int col; - for (col = 0; col < cols; ++col) { + for (col = 0, *errorP = NULL; col < cols && !*errorP; ++col) { pixval const r = PPM_GETR(pixelrow[col]); pixval const g = PPM_GETG(pixelrow[col]); pixval const b = PPM_GETB(pixelrow[col]); @@ -256,12 +256,12 @@ validateRppmRow(pixel * const pixelrow, errorP, "Red sample value %u is greater than maxval (%u)", r, maxval); - if (g > maxval) + else if (g > maxval) pm_asprintf( errorP, "Green sample value %u is greater than maxval (%u)", g, maxval); - if (b > maxval) + else if (b > maxval) pm_asprintf( errorP, "Blue sample value %u is greater than maxval (%u)", |