forked from osmocom/wireshark
Restore the casts from svn 21080 (presumably) inadvertantly removed in svn 21495.
so windows build doesn't get warnings. svn path=/trunk/; revision=21517
This commit is contained in:
parent
8093569ebe
commit
f48fd4700d
|
@ -363,8 +363,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
u_data->io->min_x=u_data->io->x1_tmp_sec*1000000.0+u_data->io->x1_tmp_usec;
|
u_data->io->min_x=((guint32)(u_data->io->x1_tmp_sec*1000000.0))+u_data->io->x1_tmp_usec;
|
||||||
u_data->io->max_x=u_data->io->x2_tmp_sec*1000000.0+u_data->io->x2_tmp_usec;
|
u_data->io->max_x=((guint32)(u_data->io->x2_tmp_sec*1000000.0))+u_data->io->x2_tmp_usec;
|
||||||
u_data->io->uoff = FALSE;
|
u_data->io->uoff = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1106,7 +1106,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
x_value = ((event->x-LEFT_BORDER-u_data->io->offset) * ((u_data->io->x2_tmp_sec+u_data->io->x2_tmp_usec/1000000.0)-(u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0)) / (u_data->io->pixmap_width-LEFT_BORDER-u_data->io->offset))+u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0;
|
x_value = ((event->x-LEFT_BORDER-u_data->io->offset) * ((u_data->io->x2_tmp_sec+u_data->io->x2_tmp_usec/1000000.0)-(u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0)) / (u_data->io->pixmap_width-LEFT_BORDER-u_data->io->offset))+u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0;
|
||||||
y_value = floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
|
y_value = (gint)floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
|
||||||
text_color = u_data->io->draw_area->style->black_gc;
|
text_color = u_data->io->draw_area->style->black_gc;
|
||||||
|
|
||||||
if (u_data->dir == 1)
|
if (u_data->dir == 1)
|
||||||
|
@ -1216,8 +1216,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
|
||||||
g_snprintf(label_string, 30, "(%.6lf, %u)", x_value, y_value);
|
g_snprintf(label_string, 30, "(%.6lf, %u)", x_value, y_value);
|
||||||
label_set = TRUE;
|
label_set = TRUE;
|
||||||
|
|
||||||
gdk_draw_line(u_data->io->pixmap,text_color, event->x-2, event->y, event->x+2, event->y);
|
gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x-2), (gint)(event->y), (gint)(event->x+2), (gint)(event->y));
|
||||||
gdk_draw_line(u_data->io->pixmap,text_color, event->x, event->y-2, event->x, event->y+2);
|
gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x), (gint)(event->y-2), (gint)(event->x), (gint)(event->y+2));
|
||||||
if (event->x+150>=u_data->io->pixmap_width)
|
if (event->x+150>=u_data->io->pixmap_width)
|
||||||
position = event->x - 150;
|
position = event->x - 150;
|
||||||
else
|
else
|
||||||
|
@ -1227,8 +1227,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
|
||||||
#if GTK_MAJOR_VERSION < 2
|
#if GTK_MAJOR_VERSION < 2
|
||||||
lwidth=gdk_string_width(font, label_string);
|
lwidth=gdk_string_width(font, label_string);
|
||||||
gdk_draw_string(u_data->io->pixmap,font,text_color,
|
gdk_draw_string(u_data->io->pixmap,font,text_color,
|
||||||
position,
|
(gint)position,
|
||||||
event->y-10,
|
(gint)(event->y-10),
|
||||||
label_string);
|
label_string);
|
||||||
#else
|
#else
|
||||||
memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
|
memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
|
||||||
|
@ -1236,8 +1236,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
|
||||||
pango_layout_get_pixel_size(layout, &lwidth, NULL);
|
pango_layout_get_pixel_size(layout, &lwidth, NULL);
|
||||||
|
|
||||||
gdk_draw_layout(u_data->io->pixmap,text_color,
|
gdk_draw_layout(u_data->io->pixmap,text_color,
|
||||||
position,
|
(gint)position,
|
||||||
event->y-10,
|
(gint)(event->y-10),
|
||||||
layout);
|
layout);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue