Merge branch 'png' of git://github.com/klazuka/factor

diff --cc basis/images/png/png.factor
index 88ec97aadf9d1fc90ac696f6a021902e094e4f8b,f090fe0adf173e6f0b0bdf718f25ef81985916eb..5746a9098b2070a88635f30a65ae3fa1bf93558a
--- 1/basis/images/png/png.factor
--- 2/basis/images/png/png.factor
+++ b/basis/images/png/png.factor
@@@ -123,12 -123,12 +123,12 @@@ ERROR: unimplemented-color-type image 
      ] map B{ } concat-as ;
  
  : png-image-bytes ( loading-png -- byte-array )
 -    [ inflate-data ] [ png-group-width ] bi group reverse-png-filter ;
 +    [ png-bytes-per-pixel ] [ inflate-data ] [ png-group-width ] tri group reverse-png-filter ;
  
- : decode-greyscale ( loading-png -- loading-png )
+ : decode-greyscale ( loading-png -- image )
      unimplemented-color-type ;
  
- : decode-truecolor ( loading-png -- loading-png )
+ : decode-truecolor ( loading-png -- image )
      [ <image> ] dip {
          [ png-image-bytes >>bitmap ]
          [ [ width>> ] [ height>> ] bi 2array >>dim ]