... |
... |
@@ -129,15 +129,15 @@ gblender_clear( GBlender blender ) |
129
|
129
|
for ( nn = 0; nn < GBLENDER_KEY_COUNT; nn++ )
|
130
|
130
|
chan_keys[nn].index = -1;
|
131
|
131
|
|
132
|
|
- blender->cache_r_back = ~0U;
|
|
132
|
+ blender->cache_r_back = 0;
|
133
|
133
|
blender->cache_r_fore = ~0U;
|
134
|
134
|
blender->cache_r_cells = NULL;
|
135
|
135
|
|
136
|
|
- blender->cache_g_back = ~0U;
|
|
136
|
+ blender->cache_g_back = 0;
|
137
|
137
|
blender->cache_g_fore = ~0U;
|
138
|
138
|
blender->cache_g_cells = NULL;
|
139
|
139
|
|
140
|
|
- blender->cache_b_back = ~0U;
|
|
140
|
+ blender->cache_b_back = 0;
|
141
|
141
|
blender->cache_b_fore = ~0U;
|
142
|
142
|
blender->cache_b_cells = NULL;
|
143
|
143
|
}
|
... |
... |
@@ -146,7 +146,7 @@ gblender_clear( GBlender blender ) |
146
|
146
|
for ( nn = 0; nn < GBLENDER_KEY_COUNT; nn++ )
|
147
|
147
|
keys[nn].cells = NULL;
|
148
|
148
|
|
149
|
|
- blender->cache_back = ~0U;
|
|
149
|
+ blender->cache_back = 0;
|
150
|
150
|
blender->cache_fore = ~0U;
|
151
|
151
|
blender->cache_cells = NULL;
|
152
|
152
|
}
|
... |
... |
@@ -274,7 +274,7 @@ gblender_lookup( GBlender blender, |
274
|
274
|
blender->stat_lookups++;
|
275
|
275
|
#endif
|
276
|
276
|
|
277
|
|
- idx = ( background ^ foreground * 7 ) % (GBLENDER_KEY_COUNT-1);
|
|
277
|
+ idx = ( background ^ foreground ^ 0x55555555 ) % (GBLENDER_KEY_COUNT-1);
|
278
|
278
|
|
279
|
279
|
key = blender->keys + idx;
|
280
|
280
|
|
... |
... |
@@ -352,7 +352,8 @@ gblender_lookup_channel( GBlender blender, |
352
|
352
|
blender->stat_lookups++;
|
353
|
353
|
#endif
|
354
|
354
|
|
355
|
|
- idx = ( background ^ foreground * 7 ) % (GBLENDER_KEY_COUNT-1);
|
|
355
|
+ idx = ( background ^ foreground * 7 ) %
|
|
356
|
+ ( GBLENDER_KEY_COUNT*GBLENDER_CELL_SIZE*sizeof(GBlenderCell) - 1);
|
356
|
357
|
|
357
|
358
|
key = (GBlenderChanKey)blender->keys + idx;
|
358
|
359
|
|