MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use rgb

Browse source
This commit is contained in:
Ryan Oldenburg 2020-11-27 19:38:38 -06:00
parent 6fd37e831a
commit 4c93950178
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pixie/fileformats/png.nim
View file

@ -78,14 +78,14 @@ proc decodeHeader(data: seq[uint8]): PngHeader =
if result.interlaceMethod != 0: if result.interlaceMethod != 0:
raise newException(PixieError, "Interlaced PNG not yet supported") raise newException(PixieError, "Interlaced PNG not yet supported")
proc decodePalette(data: seq[uint8]): seq[array[3, uint8]] = proc decodePalette(data: seq[uint8]): seq[ColorRGB] =
if data.len == 0 or data.len mod 3 != 0: if data.len == 0 or data.len mod 3 != 0:
failInvalid() failInvalid()
result.setLen(data.len div 3) result.setLen(data.len div 3)
for i in 0 ..< data.len div 3: for i in 0 ..< data.len div 3:
result[i] = cast[ptr array[3, uint8]](data[i * 3].unsafeAddr)[] result[i] = cast[ptr ColorRGB](data[i * 3].unsafeAddr)[]
proc unfilter( proc unfilter(
uncompressed: seq[uint8], height, rowBytes, bpp: int uncompressed: seq[uint8], height, rowBytes, bpp: int
@ -147,7 +147,7 @@ proc unfilter(
proc decodeImageData( proc decodeImageData(
header: PngHeader, header: PngHeader,
palette: seq[array[3, uint8]], palette: seq[ColorRGB],
transparency, data: seq[uint8] transparency, data: seq[uint8]
): seq[ColorRGBA] = ): seq[ColorRGBA] =
result.setLen(header.width * header.height) result.setLen(header.width * header.height)
@ -279,7 +279,7 @@ proc decodeImageData(
else: else:
255 255
result[x + y * header.width] = ColorRGBA( result[x + y * header.width] = ColorRGBA(
r: rgb[0], g: rgb[1], b: rgb[2], a: transparency r: rgb.r, g: rgb.g, b: rgb.b, a: transparency
) )
# If we move to a new row, skip to the next full byte # If we move to a new row, skip to the next full byte
@ -316,7 +316,7 @@ proc decodePng*(data: seq[uint8]): Image =
pos = 8 # After signature pos = 8 # After signature
counts = ChunkCounts() counts = ChunkCounts()
header: PngHeader header: PngHeader
palette: seq[array[3, uint8]] palette: seq[ColorRGB]
transparency, imageData: seq[uint8] transparency, imageData: seq[uint8]
prevChunkType: string prevChunkType: string