m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packbits optimization #2

Browse Source
This commit is contained in:
Thomas Bernard 2019-11-16 00:50:41 +01:00
parent de15e1036f
commit bcbedab22d
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fileformats.c
View File

@ -2208,6 +2208,10 @@ void Load_IFF(T_IO_Context * context)
if (IFF_list_size>0) if (IFF_list_size>0)
{ {
if (IFF_list_size > 128)
{
GFX2_Log(GFX2_ERROR, "Transfer_colors() IFF_list_size=%d !\n", IFF_list_size);
}
if (IFF_repetition_mode) if (IFF_repetition_mode)
{ {
Write_one_byte(file,257-IFF_list_size); Write_one_byte(file,257-IFF_list_size);
@ -2260,10 +2264,9 @@ void Load_IFF(T_IO_Context * context)
else if ( (IFF_repetition_mode) || (second_last_color!=color) ) else if ( (IFF_repetition_mode) || (second_last_color!=color) )
// On conserve le mode... // On conserve le mode...
{ {
IFF_color_list[IFF_list_size]=color;
IFF_list_size++;
if (IFF_list_size==128) if (IFF_list_size==128)
Transfer_colors(file); Transfer_colors(file);
IFF_color_list[IFF_list_size++]=color;
} }
else // On est en mode <> et on a 3 couleurs qui se suivent else // On est en mode <> et on a 3 couleurs qui se suivent
{ {
@ -2280,9 +2283,9 @@ void Load_IFF(T_IO_Context * context)
{ {
if (!IFF_repetition_mode) // On conserve le mode... if (!IFF_repetition_mode) // On conserve le mode...
{ {
IFF_color_list[IFF_list_size++]=color; if (IFF_list_size == 128)
if (IFF_list_size==128)
Transfer_colors(file); Transfer_colors(file);
IFF_color_list[IFF_list_size++]=color;
} }
else // On change de mode... else // On change de mode...
{ {

12
src/tests/tests.c
View File

@ -161,11 +161,21 @@ int Test_Packbits(void)
"12345678123456781234567812345678" // 32 "12345678123456781234567812345678" // 32
"12345678123456781234567812345678" // 64 "12345678123456781234567812345678" // 64
"12345678123456781234567812345678" // 96 "12345678123456781234567812345678" // 96
"12345678123456781234567812345678" // 128
"1", // best : 127(7f) "123..." 01 "1" => 131
"12345678123456781234567812345678" // 32
"12345678123456781234567812345678" // 64
"12345678123456781234567812345678" // 96
"123456781234567812345678123456@@" // 128 "123456781234567812345678123456@@" // 128
"@@12345678", // best : 125(7d) "123..." -3 '@' 08 "12345678" => 138 "@@12345678", // best : 125(7d) "123..." -3 '@' 08 "12345678" => 138
"12345678123456781234567812345678" // 32
"12345678123456781234567812345678" // 64
"12345678123456781234567812345678" // 96
"1234567812345678123456781234567@" // 128
"@@12345678", // best : 126(7e) "123..." -2 '@' 08 "12345678" => 139
NULL NULL
}; };
const long best_packed = 7 + 22 + 23 + (138/*+2*/); const long best_packed = 7 + 22 + 23 + 131 + (138/*+2*/) + (139/*+1*/);
byte buffer[1024]; byte buffer[1024];
snprintf(tempfilename, sizeof(tempfilename), "/tmp/gfx2test-packbits-%lx", random()); snprintf(tempfilename, sizeof(tempfilename), "/tmp/gfx2test-packbits-%lx", random());