diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2013-05-28 16:44:46 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2013-05-28 16:44:46 +0100 |
| commit | a92e5930ffbcb178a2d2420ee2f6d4834ffa90e1 (patch) | |
| tree | b3284a8aaadc287ecb3397f989fc9e4d53dd4191 /riscos | |
| parent | fcc61ea37437fbfd163c5a96a7119bbcf69073e1 (diff) | |
| download | netsurf-a92e5930ffbcb178a2d2420ee2f6d4834ffa90e1.tar.gz netsurf-a92e5930ffbcb178a2d2420ee2f6d4834ffa90e1.tar.bz2 | |
fixup issues with new options API merge
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/buffer.c | 2 | ||||
| -rw-r--r-- | riscos/configure/con_image.c | 8 | ||||
| -rw-r--r-- | riscos/dialog.c | 2 | ||||
| -rw-r--r-- | riscos/gui.c | 2 | ||||
| -rw-r--r-- | riscos/image.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/riscos/buffer.c b/riscos/buffer.c index a1b99f493..56c245882 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -274,7 +274,7 @@ void ro_gui_buffer_close(void) _swix(Tinct_Plot, _IN(2) | _IN(3) | _IN(4) | _IN(7), (char *)(buffer + 1), clipping.x0, clipping.y0, - nsoption_int(fg_plot_style)); + nsoption_int(plot_fg_quality)); else xosspriteop_put_sprite_user_coords(osspriteop_PTR, buffer, (osspriteop_id)(buffer + 1), diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index 147f5d684..4982423a3 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -77,11 +77,11 @@ bool ro_gui_options_image_initialise(wimp_w w) /* set the current values */ for (i = 0; (i < 4); i++) { - if ((unsigned int)nsoption_int(fg_plot_style) == tinct_options[i]) + if ((unsigned int)nsoption_int(plot_fg_quality) == tinct_options[i]) ro_gui_set_icon_string(w, IMAGE_FOREGROUND_FIELD, image_quality_menu->entries[i]. data.indirected_text.text, true); - if ((unsigned int)nsoption_int(bg_plot_style) == tinct_options[i]) + if ((unsigned int)nsoption_int(plot_bg_quality) == tinct_options[i]) ro_gui_set_icon_string(w, IMAGE_BACKGROUND_FIELD, image_quality_menu->entries[i]. data.indirected_text.text, true); @@ -252,8 +252,8 @@ void ro_gui_options_update_shading(wimp_w w) bool ro_gui_options_image_ok(wimp_w w) { ro_gui_options_image_read(w, - (unsigned int *)&nsoption_int(bg_plot_style), - (unsigned int *)&nsoption_int(fg_plot_style)); + (unsigned int *)&nsoption_int(plot_bg_quality), + (unsigned int *)&nsoption_int(plot_fg_quality)); nsoption_set_int(minimum_gif_delay, ro_gui_get_icon_decimal(w, IMAGE_SPEED_FIELD, 2)); diff --git a/riscos/dialog.c b/riscos/dialog.c index b00aee687..0726cb335 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -664,7 +664,7 @@ void ro_gui_dialog_close_persistent(wimp_w parent) { void ro_gui_save_options(void) { - nsoption_write("<NetSurf$ChoicesSave>"); + nsoption_write("<NetSurf$ChoicesSave>", NULL, NULL); } bool ro_gui_dialog_zoom_apply(wimp_w w) { diff --git a/riscos/gui.c b/riscos/gui.c index f82ce742d..79b07be42 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -965,7 +965,7 @@ void ro_gui_signal(int sig) xhourglass_on(); xhourglass_colours(0x0000ffff, 0x000000ff, &old_sand, &old_glass); - nsoption_dump(stderr); + nsoption_dump(stderr, NULL); /*rufl_dump_state();*/ #ifndef __ELF__ diff --git a/riscos/image.c b/riscos/image.c index ae2534f4c..56feb2b96 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -69,8 +69,8 @@ bool image_redraw(osspriteop_area *area, int x, int y, int req_width, req_height *= 2; width *= 2; height *= 2; - tinct_options = background ? nsoption_int(bg_plot_style) : - nsoption_int(fg_plot_style); + tinct_options = background ? nsoption_int(plot_bg_quality) : + nsoption_int(plot_fg_quality); switch (type) { case IMAGE_PLOT_TINCT_ALPHA: return image_redraw_tinct(header, x, y, |