[project @ 2004-06-09 20:05:14 by jmb]

Remove magic numbers. Now uses sensible tinct_FOO style flag names

svn path=/import/netsurf/; revision=941
This commit is contained in:
John Mark Bell 2004-06-09 20:05:14 +00:00
parent d0aadf90ca
commit 9b1cbd7622
5 changed files with 14 additions and 14 deletions

View File

@ -103,8 +103,8 @@ void nsgif_redraw(struct content *c, long x, long y,
drawing a thumbnail unless something has gone very wrong somewhere else.
*/
if (ro_gui_current_redraw_gui) {
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?(1<<1):0) |
(ro_gui_current_redraw_gui->option_dither_sprites?(1<<2):0);
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(ro_gui_current_redraw_gui->option_dither_sprites?tinct_DITHER:0);
if (ro_gui_current_redraw_gui->option_animate_images) {
current_frame = c->data.gif.current_frame;
} else {
@ -116,8 +116,8 @@ void nsgif_redraw(struct content *c, long x, long y,
} else {
current_frame = c->data.gif.gif->frame_count - 1;
}
tinct_options = (option_filter_sprites?(1<<1):0) |
(option_dither_sprites?(1<<2):0);
tinct_options = (option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(option_dither_sprites?tinct_DITHER:0);
}
/* Decode from the last frame to the current frame

View File

@ -409,7 +409,7 @@ void ro_gui_history_redraw_tree(struct history_entry *he,
(char *)(header),
x0 + he->x * FULL_WIDTH + MARGIN,
y0 - he->y * FULL_HEIGHT - FULL_HEIGHT + MARGIN,
(option_filter_sprites?(1<<1):0) | (option_dither_sprites?(1<<2):0));
(option_filter_sprites?tinct_BILINEAR_FILTER:0) | (option_dither_sprites?tinct_DITHER:0));
} else {
unsigned int size;
os_factors factors;

View File

@ -240,11 +240,11 @@ void nsjpeg_redraw(struct content *c, long x, long y,
settings as we are drawing a thumbnail.
*/
if (ro_gui_current_redraw_gui) {
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?(1<<1):0) |
(ro_gui_current_redraw_gui->option_dither_sprites?(1<<2):0);
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(ro_gui_current_redraw_gui->option_dither_sprites?tinct_DITHER:0);
} else {
tinct_options = (option_filter_sprites?(1<<1):0) |
(option_dither_sprites?(1<<2):0);
tinct_options = (option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(option_dither_sprites?tinct_DITHER:0);
}
/* Tinct currently only handles 32bpp sprites that have an embedded alpha mask. Any

View File

@ -256,11 +256,11 @@ void nspng_redraw(struct content *c, long x, long y,
settings as we are drawing a thumbnail.
*/
if (ro_gui_current_redraw_gui) {
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?(1<<1):0) |
(ro_gui_current_redraw_gui->option_dither_sprites?(1<<2):0);
tinct_options = (ro_gui_current_redraw_gui->option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(ro_gui_current_redraw_gui->option_dither_sprites?tinct_DITHER:0);
} else {
tinct_options = (option_filter_sprites?(1<<1):0) |
(option_dither_sprites?(1<<2):0);
tinct_options = (option_filter_sprites?tinct_BILINEAR_FILTER:0) |
(option_dither_sprites?tinct_DITHER:0);
}
/* Tinct currently only handles 32bpp sprites that have an embedded alpha mask. Any

View File

@ -125,7 +125,7 @@ void thumbnail_create(struct content *content, osspriteop_area *area,
*/
_swix(Tinct_PlotScaled, _IN(2) | _IN(3) | _IN(4) | _IN(5) | _IN(6) | _IN(7),
(char *)(oversampled_area + 1), 0, 0, width * 2, height * 2,
(1<<1) | (1<<2));
tinct_BILINEAR_FILTER | tinct_DITHER);
/* Restore output
*/