diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
commit | 8821237240c5374d83298b2da5ad88fa1e3c1ef7 (patch) | |
tree | e1bc03fa83c61165f48ffe3f528ac5496332872a /utils/ppmtolss16 | |
parent | 38dcca25c8855c95649e3f0b5b09fae862ed5c7a (diff) | |
parent | 7307d60063ee4303da4de45f9d984fdc8df92146 (diff) | |
download | syslinux-8821237240c5374d83298b2da5ad88fa1e3c1ef7.tar.gz |
Merge remote-tracking branch 'remotes/upstream/master' into baserock/morph
Diffstat (limited to 'utils/ppmtolss16')
-rwxr-xr-x | utils/ppmtolss16 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ppmtolss16 b/utils/ppmtolss16 index 5af90831..ae2d546d 100755 --- a/utils/ppmtolss16 +++ b/utils/ppmtolss16 @@ -229,7 +229,7 @@ for ( $y = 0 ; $y < $ysize ; $y++ ) { start_new_row(); for ( $x = 0 ; $x < $xsize ; $x++ ) { die "$0: Premature EOF at ($x,$y) of ($xsize,$ysize)\n" - if ( !defined(@pnmrgb = getrgb($form)) ); + if ( !scalar(@pnmrgb = getrgb($form)) ); # Convert to 6-bit representation $rgb = rgbconvert($pnmrgb[0], $pnmrgb[1], $pnmrgb[2], $maxmult); $color_count{$rgb}++; |