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

faster on arc, arc string []= issue 18339

Browse source
This commit is contained in:
Ryan Oldenburg 2022-06-15 14:03:28 -05:00
parent ff45edf131
commit 5afa5720db
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ proc decodePalette(data: pointer, len: int): seq[ColorRGB] =
proc unfilter( proc unfilter(
uncompressed: string, height, rowBytes, bpp: int uncompressed: string, height, rowBytes, bpp: int
): string = ): seq[uint8] =
result.setLen(uncompressed.len - height) result.setLen(uncompressed.len - height)
template uncompressedIdx(x, y: int): int = template uncompressedIdx(x, y: int): int =
@ -121,7 +121,7 @@ proc unfilter(
var value = uncompressed.readUint8(uncompressedStartIdx + x) var value = uncompressed.readUint8(uncompressedStartIdx + x)
if x - bpp >= 0: if x - bpp >= 0:
value += result.readUint8(unfilteredStartIx + x - bpp) value += result.readUint8(unfilteredStartIx + x - bpp)
result[unfilteredStartIx + x] = value.char result[unfilteredStartIx + x] = value
of 2: # Up of 2: # Up
let let
uncompressedStartIdx = uncompressedIdx(1, y) uncompressedStartIdx = uncompressedIdx(1, y)
@ -129,8 +129,8 @@ proc unfilter(
for x in 0 ..< rowBytes: for x in 0 ..< rowBytes:
var value = uncompressed.readUint8(uncompressedStartIdx + x) var value = uncompressed.readUint8(uncompressedStartIdx + x)
if y - 1 >= 0: if y - 1 >= 0:
value += result.readUint8(unfiteredIdx(x, y - 1)) value += result.readUint8(unfilteredStartIx + x - rowBytes)
result[unfilteredStartIx + x] = value.char result[unfilteredStartIx + x] = value
of 3: # Average of 3: # Average
let let
uncompressedStartIdx = uncompressedIdx(1, y) uncompressedStartIdx = uncompressedIdx(1, y)
@ -144,7 +144,7 @@ proc unfilter(
if y - 1 >= 0: if y - 1 >= 0:
up = result[unfilteredStartIx + x - rowBytes].int up = result[unfilteredStartIx + x - rowBytes].int
value += ((left + up) div 2).uint8 value += ((left + up) div 2).uint8
result[unfilteredStartIx + x] = value.char result[unfilteredStartIx + x] = value
of 4: # Paeth of 4: # Paeth
let let
uncompressedStartIdx = uncompressedIdx(1, y) uncompressedStartIdx = uncompressedIdx(1, y)
@ -172,7 +172,7 @@ proc unfilter(
else: else:
c c
value += paethPredictor(up, left, upLeft).uint8 value += paethPredictor(up, left, upLeft).uint8
result[unfilteredStartIx + x] = value.char result[unfilteredStartIx + x] = value
else: else:
discard # Not possible, parseHeader validates discard # Not possible, parseHeader validates