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

get -> read

Browse source
This commit is contained in:
Ryan Oldenburg 2022-05-25 22:23:37 -05:00
parent 8caaca13c0
commit 0c075e6774
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pixie/fileformats/jpeg.nim
View file

@ -525,7 +525,7 @@ template lrot(value: uint32, shift: int): uint32 =
## Left rotate ## Left rotate
(value shl shift) or (value shr (32 - shift)) (value shl shift) or (value shr (32 - shift))
proc getBit(state: var DecoderState): int = proc readBit(state: var DecoderState): int =
## Get a single bit. ## Get a single bit.
if state.bitsBuffered < 1: if state.bitsBuffered < 1:
state.fillBitBuffer() state.fillBitBuffer()
@ -533,7 +533,7 @@ proc getBit(state: var DecoderState): int =
state.bitBuffer = state.bitBuffer shl 1 state.bitBuffer = state.bitBuffer shl 1
dec state.bitsBuffered dec state.bitsBuffered
proc getBits(state: var DecoderState, n: int): int = proc readBits(state: var DecoderState, n: int): int =
## Get n number of bits as a unsigned integer. ## Get n number of bits as a unsigned integer.
if n notin 0 .. 16: if n notin 0 .. 16:
failInvalid() failInvalid()
@ -614,7 +614,7 @@ proc decodeProgressiveBlock(
state.components[component].dcPred = dc state.components[component].dcPred = dc
data[0] = cast[int16](dc * (1 shl state.successiveApproxLow)) data[0] = cast[int16](dc * (1 shl state.successiveApproxLow))
else: else:
if state.getBit() != 0: if state.readBit() != 0:
data[0] = cast[int16](data[0] + (1 shl state.successiveApproxLow)) data[0] = cast[int16](data[0] + (1 shl state.successiveApproxLow))
proc decodeProgressiveContinuationBlock( proc decodeProgressiveContinuationBlock(
@ -641,7 +641,7 @@ proc decodeProgressiveContinuationBlock(
if r < 15: if r < 15:
state.eobRun = 1 shl r state.eobRun = 1 shl r
if r != 0: if r != 0:
state.eobRun += state.getBits(r) state.eobRun += state.readBits(r)
dec state.eobRun dec state.eobRun
break break
k += 16 k += 16
@ -663,7 +663,7 @@ proc decodeProgressiveContinuationBlock(
for k in state.spectralStart ..< state.spectralEnd: for k in state.spectralStart ..< state.spectralEnd:
let zig = deZigZag[k] let zig = deZigZag[k]
if data[zig] != 0: if data[zig] != 0:
if state.getBit() != 0: if state.readBit() != 0:
if (data[zig] and bit) == 0: if (data[zig] and bit) == 0:
if data[zig] > 0: if data[zig] > 0:
data[zig] = cast[int16](data[zig] + bit) data[zig] = cast[int16](data[zig] + bit)
@ -680,14 +680,14 @@ proc decodeProgressiveContinuationBlock(
if r < 15: if r < 15:
state.eobRun = (1 shl r) - 1 state.eobRun = (1 shl r) - 1
if r != 0: if r != 0:
state.eobRun += state.getBits(r) state.eobRun += state.readBits(r)
r = 64 # force end of block r = 64 # force end of block
else: else:
discard discard
else: else:
if s != 1: if s != 1:
failInvalid("bad huffman code") failInvalid("bad huffman code")
if state.getBit() != 0: if state.readBit() != 0:
s = bit.int s = bit.int
else: else:
s = -bit.int s = -bit.int
@ -696,7 +696,7 @@ proc decodeProgressiveContinuationBlock(
let zig = deZigZag[k] let zig = deZigZag[k]
inc k inc k
if data[zig] != 0: if data[zig] != 0:
if state.getBit() != 0: if state.readBit() != 0:
if (data[zig] and bit) == 0: if (data[zig] and bit) == 0:
if data[zig] > 0: if data[zig] > 0:
data[zig] = cast[int16](data[zig] + bit) data[zig] = cast[int16](data[zig] + bit)