steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extra error checking in images.png

db4
Doug Coleman 2009-10-09 01:25:20 -05:00
parent 7d39e51d9a
commit 4a8be006f0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/images/png/png.factor
View File

@ -4,7 +4,7 @@ USING: accessors arrays checksums checksums.crc32 combinators
compression.inflate fry grouping images images.loader io compression.inflate fry grouping images images.loader io
io.binary io.encodings.ascii io.encodings.string kernel locals io.binary io.encodings.ascii io.encodings.string kernel locals
math math.bitwise math.ranges sequences sorting assocs math math.bitwise math.ranges sequences sorting assocs
math.functions ; math.functions math.order ;
QUALIFIED-WITH: bitstreams bs QUALIFIED-WITH: bitstreams bs
IN: images.png IN: images.png
@ -146,6 +146,8 @@ ERROR: unimplemented-interlace ;
: uncompress-bytes ( loading-png -- bitstream ) : uncompress-bytes ( loading-png -- bitstream )
[ inflate-data ] [ interlace-method>> ] bi reverse-interlace ; [ inflate-data ] [ interlace-method>> ] bi reverse-interlace ;
ERROR: bad-filter n ;
:: raw-bytes ( loading-png -- array ) :: raw-bytes ( loading-png -- array )
loading-png uncompress-bytes :> bs loading-png uncompress-bytes :> bs
loading-png width>> :> width loading-png width>> :> width
@ -162,7 +164,7 @@ ERROR: unimplemented-interlace ;
] when ] when
height [ height [
8 bs bs:read 8 bs bs:read dup 0 4 between? [ bad-filter ] unless
count [ depth bs bs:read ] replicate swap prefix count [ depth bs bs:read ] replicate swap prefix
8 bs bs:align 8 bs bs:align
] replicate ] replicate
@ -210,7 +212,7 @@ ERROR: invalid-PLTE array ;
: decode-indexed-color ( loading-image -- byte-array ) : decode-indexed-color ( loading-image -- byte-array )
[ raw-bytes ] keep "PLTE" find-chunk data>> verify-PLTE [ raw-bytes ] keep "PLTE" find-chunk data>> verify-PLTE
3 group '[ _ nth ] { } map-as B{ } concat-as ; inline 3 group '[ _ nth ] { } map-as B{ } concat-as ; inline
ERROR: invalid-color-type/bit-depth loading-png ; ERROR: invalid-color-type/bit-depth loading-png ;
: validate-bit-depth ( loading-png seq -- loading-png ) : validate-bit-depth ( loading-png seq -- loading-png )