From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 28 Sep 2009 19:29:00 +0000 (-0500)
Subject: Merge branch 'png' of git://github.com/klazuka/factor
X-Git-Tag: 0.97~5443
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=bf2cfd0aa60000185730a24edcab1d3a6036fb87

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

bf2cfd0aa60000185730a24edcab1d3a6036fb87
diff --cc basis/images/png/png.factor
index 88ec97aadf,f090fe0adf..5746a9098b
--- a/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 ]