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

faster

Browse source
This commit is contained in:
Ryan Oldenburg 2022-06-15 16:02:43 -05:00
parent 03c6ee1411
commit 6d2c681a64
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,9 +93,9 @@ proc decodePalette(data: pointer, len: int): seq[ColorRGB] =
copyMem(result[0].addr, data, len) copyMem(result[0].addr, data, len)
proc unfilter( proc unfilter(
uncompressed: string, height, rowBytes, bpp: int uncompressed: pointer, len, height, rowBytes, bpp: int
): seq[uint8] = ): seq[uint8] =
result.setLen(uncompressed.len - height) result.setLen(len - height)
template uncompressedIdx(x, y: int): int = template uncompressedIdx(x, y: int): int =
x + y * (rowBytes + 1) x + y * (rowBytes + 1)
@ -103,9 +103,11 @@ proc unfilter(
template unfiteredIdx(x, y: int): int = template unfiteredIdx(x, y: int): int =
x + y * rowBytes x + y * rowBytes
let uncompressed = cast[ptr UncheckedArray[uint8]](uncompressed)
# Unfilter the image data # Unfilter the image data
for y in 0 ..< height: for y in 0 ..< height:
let filterType = uncompressed.readUint8(uncompressedIdx(0, y)) let filterType = uncompressed[uncompressedIdx(0, y)]
case filterType: case filterType:
of 0: # None of 0: # None
copyMem( copyMem(
@ -118,7 +120,7 @@ proc unfilter(
uncompressedStartIdx = uncompressedIdx(1, y) uncompressedStartIdx = uncompressedIdx(1, y)
unfilteredStartIx = unfiteredIdx(0, y) unfilteredStartIx = unfiteredIdx(0, y)
for x in 0 ..< rowBytes: for x in 0 ..< rowBytes:
var value = uncompressed.readUint8(uncompressedStartIdx + x) var value = uncompressed[uncompressedStartIdx + x]
if x - bpp >= 0: if x - bpp >= 0:
value += result[unfilteredStartIx + x - bpp] value += result[unfilteredStartIx + x - bpp]
result[unfilteredStartIx + x] = value result[unfilteredStartIx + x] = value
@ -127,7 +129,7 @@ proc unfilter(
uncompressedStartIdx = uncompressedIdx(1, y) uncompressedStartIdx = uncompressedIdx(1, y)
unfilteredStartIx = unfiteredIdx(0, y) unfilteredStartIx = unfiteredIdx(0, y)
for x in 0 ..< rowBytes: for x in 0 ..< rowBytes:
var value = uncompressed.readUint8(uncompressedStartIdx + x) var value = uncompressed[uncompressedStartIdx + x]
if y - 1 >= 0: if y - 1 >= 0:
value += result[unfilteredStartIx + x - rowBytes] value += result[unfilteredStartIx + x - rowBytes]
result[unfilteredStartIx + x] = value result[unfilteredStartIx + x] = value
@ -137,7 +139,7 @@ proc unfilter(
unfilteredStartIx = unfiteredIdx(0, y) unfilteredStartIx = unfiteredIdx(0, y)
for x in 0 ..< rowBytes: for x in 0 ..< rowBytes:
var var
value = uncompressed.readUint8(uncompressedStartIdx + x) value = uncompressed[uncompressedStartIdx + x]
left, up: uint32 left, up: uint32
if x - bpp >= 0: if x - bpp >= 0:
left = result[unfilteredStartIx + x - bpp] left = result[unfilteredStartIx + x - bpp]
@ -151,7 +153,7 @@ proc unfilter(
unfilteredStartIx = unfiteredIdx(0, y) unfilteredStartIx = unfiteredIdx(0, y)
for x in 0 ..< rowBytes: for x in 0 ..< rowBytes:
var var
value = uncompressed.readUint8(uncompressedStartIdx + x) value = uncompressed[uncompressedStartIdx + x]
left, up, upLeft: int left, up, upLeft: int
if x - bpp >= 0: if x - bpp >= 0:
left = result[unfilteredStartIx + x - bpp].int left = result[unfilteredStartIx + x - bpp].int
@ -220,7 +222,8 @@ proc decodeImageData(
failInvalid() failInvalid()
let unfiltered = unfilter( let unfiltered = unfilter(
uncompressed, uncompressed.cstring,
uncompressed.len,
header.height, header.height,
rowBytes, rowBytes,
max(valuesPerPixel div valuesPerByte, 1) max(valuesPerPixel div valuesPerByte, 1)