diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-06-24 16:45:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 19:45:05 -0400 |
| commit | 397e481f9a3eedf2123cc2fc149468a96b473e88 (patch) | |
| tree | 13e01be757b8c9bad3412e2fb5c63557e1e207c2 /src/code/jpegdecoder.c | |
| parent | fe7afb9b0708a46107f32f0de89d52dbca176049 (diff) | |
Fix misc 15 (#1298)
* Use `SCENE_` enum more
* Decimal for pos in `D_8011F9B8`
* `__osEventStateTab`: length `OS_NUM_EVENTS + 1` -> `OS_NUM_EVENTS`
* thone -> throne
* `s` on local data
* minor sfxId cleanup
* Run formatter
* Fixup 0x19 + 1 = 0x1A, not 0x20 lol
* Tlut -> TLUT
* DemoKankyo params usage cleanup
* Some proofreading (up to z_actor.c)
* Revert 0 -> sfxId, add todo comment (sfxId=0 is weird apparently)
* `sZdWaterBox` -> `sZorasDomainWaterBox`
* `msgMode == MSGMODE_`, not `GAMEMODE_` (my bad Sadge)
Diffstat (limited to 'src/code/jpegdecoder.c')
| -rw-r--r-- | src/code/jpegdecoder.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c index 5261264c7..3301817d0 100644 --- a/src/code/jpegdecoder.c +++ b/src/code/jpegdecoder.c @@ -164,11 +164,9 @@ s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* out u16 JpegDecoder_ReadBits(u8 len) { u8 byteCount; u8 data; - s32 ret; + s32 ret = 0; u32 temp; - ret = 0; // this is required for some reason - for (byteCount = sJpegBitStreamBitIdx >> 3; byteCount > 0; byteCount--) { data = sJpegBitStreamPtr[sJpegBitStreamByteIdx++]; if (sJpegBitStreamDontSkip) { @@ -184,7 +182,7 @@ u16 JpegDecoder_ReadBits(u8 len) { sJpegBitStreamBitIdx -= 8; } - ret = (sJpegBitStreamCurWord << (sJpegBitStreamBitIdx)); + ret = sJpegBitStreamCurWord << sJpegBitStreamBitIdx; temp = ret; ret = temp >> -len; sJpegBitStreamBitIdx += len; |