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

use names

Browse source
This commit is contained in:
Ryan Oldenburg 2022-06-14 17:44:49 -05:00
parent f64d97c463
commit 104cfb03d6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pixie/fileformats/gif.nim
View file

@ -171,7 +171,7 @@ proc decodeGif*(data: string): Gif {.raises: [PixieError].} =
colorIndexes: seq[int] colorIndexes: seq[int]
codeSize = minCodeSize + 1 codeSize = minCodeSize + 1
table = newSeq[(int, int)](endCode + 1) table = newSeq[(int, int)](endCode + 1)
prev: (int, int) prev: tuple[offset, len: int]
while true: while true:
let code = b.readBits(codeSize).int let code = b.readBits(codeSize).int
@ -194,14 +194,14 @@ proc decodeGif*(data: string): Gif {.raises: [PixieError].} =
if code < table.len: # If we have seen the code before if code < table.len: # If we have seen the code before
if code < clearCode: if code < clearCode:
colorIndexes.add(code) colorIndexes.add(code)
if prev[1] > 0: if prev.len > 0:
table.add((prev[0], prev[1] + 1)) table.add((prev.offset, prev.len + 1))
prev = (start, 1) prev = (start, 1)
else: else:
let (offset, len) = table[code] let (offset, len) = table[code]
for i in 0 ..< len: for i in 0 ..< len:
colorIndexes.add(colorIndexes[offset + i]) colorIndexes.add(colorIndexes[offset + i])
table.add((prev[0], prev[1] + 1)) table.add((prev.offset, prev.len + 1))
prev = (start, len) prev = (start, len)
else: else:
if prev[1] == 0: if prev[1] == 0:
@ -209,8 +209,8 @@ proc decodeGif*(data: string): Gif {.raises: [PixieError].} =
for i in 0 ..< prev[1]: for i in 0 ..< prev[1]:
colorIndexes.add(colorIndexes[prev[0] + i]) colorIndexes.add(colorIndexes[prev[0] + i])
colorIndexes.add(colorIndexes[prev[0]]) colorIndexes.add(colorIndexes[prev[0]])
table.add((start, prev[1] + 1)) table.add((start, prev.len + 1))
prev = (start, prev[1] + 1) prev = (start, prev.len + 1)
if colorIndexes.len != imageWidth * imageHeight: if colorIndexes.len != imageWidth * imageHeight:
failInvalid() failInvalid()
@ -243,6 +243,8 @@ proc decodeGif*(data: string): Gif {.raises: [PixieError].} =
image.data[i] = globalColorTable[colorIndex] image.data[i] = globalColorTable[colorIndex]
if interlaced: if interlaced:
# Just copyMem the rows into the right place. I've only ever seen
# interlaced for the first frame so this is unlikely to be a hot path.
let deinterlaced = newImage(image.width, image.height) let deinterlaced = newImage(image.width, image.height)
var var
y: int y: int