i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GIFTranslator: use ENTRY_COUNT define instead of 4096

Browse Source
This commit is contained in:
John Scipione
2014-03-04 01:22:52 -05:00
parent 5b53a45a94
commit 4ac43a1be4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/gif/GIFLoad.cpp
+4 -4
View File
@@ -331,7 +331,7 @@ GIFLoad::ReadGIFImageHeader()
bool bool
GIFLoad::ReadGIFImageData() GIFLoad::ReadGIFImageData()
{ {
unsigned char newEntry[4096]; unsigned char newEntry[ENTRY_COUNT];
unsigned char cs; unsigned char cs;
fInput->Read(&cs, 1); fInput->Read(&cs, 1);
@@ -489,7 +489,7 @@ GIFLoad::ResetTable()
fMaxCode = (1 << fBits) - 1; fMaxCode = (1 << fBits) - 1;
MemblockDeleteAll(); MemblockDeleteAll();
for (int x = 0; x < 4096; x++) { for (int x = 0; x < ENTRY_COUNT; x++) {
fTable[x] = NULL; fTable[x] = NULL;
if (x < (1 << fCodeSize)) { if (x < (1 << fCodeSize)) {
fTable[x] = MemblockAllocate(1); fTable[x] = MemblockAllocate(1);
@@ -553,8 +553,8 @@ GIFLoad::MemblockAllocate(int size)
Memblock* block = fHeadMemblock; Memblock* block = fHeadMemblock;
Memblock* last = NULL; Memblock* last = NULL;
while (block != NULL) { while (block != NULL) {
if (4096 - block->offset > size) { if (ENTRY_COUNT - block->offset > size) {
uchar* value = block->data + block->offset; unsigned char* value = block->data + block->offset;
block->offset += size; block->offset += size;
return value; return value;
src/add-ons/translators/gif/GIFLoad.h
+6 -4
View File
@@ -26,9 +26,11 @@
#define GIF_INTERLACED 0x40 #define GIF_INTERLACED 0x40
#define GIF_LOCALCOLORMAP 0x80 #define GIF_LOCALCOLORMAP 0x80
#define ENTRY_COUNT 4096
typedef struct Memblock { typedef struct Memblock {
unsigned char data[4096]; unsigned char data[ENTRY_COUNT];
int offset; int offset;
Memblock* next; Memblock* next;
} Memblock; } Memblock;
@@ -76,7 +78,7 @@ private:
int fWidth; int fWidth;
int fHeight; int fHeight;
unsigned char fOldCode[4096]; unsigned char fOldCode[ENTRY_COUNT];
unsigned int fOldCodeLength; unsigned int fOldCodeLength;
short fNewCode; short fNewCode;
@@ -88,8 +90,8 @@ private:
short fEndCode; short fEndCode;
short fNextCode; short fNextCode;
unsigned char* fTable[4096]; unsigned char* fTable[ENTRY_COUNT];
short fEntrySize[4096]; short fEntrySize[ENTRY_COUNT];
Memblock* fHeadMemblock; Memblock* fHeadMemblock;
int fBitCount; int fBitCount;