From 5f8f9cc26998b1b74d9ac5c8b68000d53aae31cc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Jul 2011 08:42:12 -0700 Subject: [PATCH] * gtkutil.c: Omit integer casts. (xg_get_pixbuf_from_pixmap): Remove unnecessary cast. (xg_set_toolkit_scroll_bar_thumb): Rewrite to avoid need for cast. --- src/ChangeLog | 4 ++++ src/gtkutil.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fd1644c9b98..c986030fcf8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-07-13 Paul Eggert + * gtkutil.c: Omit integer casts. + (xg_get_pixbuf_from_pixmap): Remove unnecessary cast. + (xg_set_toolkit_scroll_bar_thumb): Rewrite to avoid need for cast. + * image.c (png_load): Don't assume height * row_bytes fits in 'int'. * bidi.c (bidi_dump_cached_states): Use pD to print ptrdiff_t. diff --git a/src/gtkutil.c b/src/gtkutil.c index 35b366222de..8826b08851a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -269,8 +269,8 @@ xg_get_pixbuf_from_pixmap (FRAME_PTR f, Pixmap pix) GDK_COLORSPACE_RGB, FALSE, xim->bitmap_unit, - (int) width, - (int) height, + width, + height, xim->bytes_per_line, NULL, NULL); @@ -3646,7 +3646,7 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, gtk_adjustment_set_page_size (adj, size); gtk_adjustment_set_step_increment (adj, new_step); /* Assume a page increment is about 95% of the page size */ - gtk_adjustment_set_page_increment (adj,(int) (0.95*size)); + gtk_adjustment_set_page_increment (adj, size - size / 20); changed = 1; } } -- 2.39.2