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

packbits optimization #1

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

12
src/fileformats.c
View File

@ -2247,7 +2247,17 @@ void Load_IFF(T_IO_Context * context)
second_last_color=IFF_color_list[IFF_list_size-2]; second_last_color=IFF_color_list[IFF_list_size-2];
if (last_color==color) // On a une répétition de couleur if (last_color==color) // On a une répétition de couleur
{ {
if ( (IFF_repetition_mode) || (second_last_color!=color) ) if ( !IFF_repetition_mode && IFF_list_size >= 127)
{
// mode <> avec 126 octets <> puis 2 identiques
IFF_list_size--;
Transfer_colors(file);
IFF_color_list[0]=color;
IFF_color_list[1]=color;
IFF_list_size=2;
IFF_repetition_mode=1;
}
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_color_list[IFF_list_size]=color;

7
src/tests/tests.c
View File

@ -158,9 +158,14 @@ int Test_Packbits(void)
"AABBCCDDDDDDD12345@@@54321", // best : -1(ff) 'A' -1(ff) 'B' -1(ff) 'C' -6(fa) 'D' 12(0c) "12345@@@54321" => 22 bytes "AABBCCDDDDDDD12345@@@54321", // best : -1(ff) 'A' -1(ff) 'B' -1(ff) 'C' -6(fa) 'D' 12(0c) "12345@@@54321" => 22 bytes
// or 04 "12345" -2(fe) '@' 04 "54321" // or 04 "12345" -2(fe) '@' 04 "54321"
"123AA123BBB123CCCC123DDDDD", // best : 07 "123AA123" -2 'B' 02 "123" -3(fd) 'C' 02 "123" -4(fc) 'D' => 23 bytes "123AA123BBB123CCCC123DDDDD", // best : 07 "123AA123" -2 'B' 02 "123" -3(fd) 'C' 02 "123" -4(fc) 'D' => 23 bytes
"12345678123456781234567812345678" // 32
"12345678123456781234567812345678" // 64
"12345678123456781234567812345678" // 96
"123456781234567812345678123456@@" // 128
"@@12345678", // best : 125(7d) "123..." -3 '@' 08 "12345678" => 138
NULL NULL
}; };
const long best_packed = 7 + 22 + 23; const long best_packed = 7 + 22 + 23 + (138/*+2*/);
byte buffer[1024]; byte buffer[1024];
snprintf(tempfilename, sizeof(tempfilename), "/tmp/gfx2test-packbits-%lx", random()); snprintf(tempfilename, sizeof(tempfilename), "/tmp/gfx2test-packbits-%lx", random());