app, libgimp*, modules: More type <> casting fixes
This commit is contained in:
parent
3668ee5562
commit
7ce3ed457e
6 changed files with 7 additions and 7 deletions
|
|
@ -2005,7 +2005,7 @@ gimp_display_shell_rotate_gesture_maybe_get_state (GtkGestureRotate *gesture,
|
|||
* last_event happens to not have it. Thus we store the last valid state
|
||||
* and only update it if we get a valid state from last_event.
|
||||
*/
|
||||
guint state = 0;
|
||||
GdkModifierType state = 0;
|
||||
const GdkEvent *last_event;
|
||||
|
||||
last_event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence);
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ gimp_container_tree_view_drop_status (GimpContainerTreeView *tree_view,
|
|||
target_list = gtk_drag_dest_get_target_list (GTK_WIDGET (tree_view->view));
|
||||
target_atom = gtk_drag_dest_find_target (GTK_WIDGET (tree_view->view),
|
||||
context, target_list);
|
||||
if (! gtk_target_list_find (target_list, target_atom, &src_type))
|
||||
if (! gtk_target_list_find (target_list, target_atom, (guint *) &src_type))
|
||||
goto drop_impossible;
|
||||
|
||||
switch (src_type)
|
||||
|
|
|
|||
|
|
@ -1865,7 +1865,7 @@ xcf_save_prop (XcfInfo *info,
|
|||
g_return_val_if_reached (FALSE);
|
||||
xcf_write_int32_check_error (info, &item_type, 1, va_end (args));
|
||||
|
||||
if (! gimp_item_list_is_pattern (set, &method))
|
||||
if (! gimp_item_list_is_pattern (set, (GimpSelectMethod *) &method))
|
||||
method = G_MAXUINT32;
|
||||
xcf_write_int32_check_error (info, &method, 1, va_end (args));
|
||||
|
||||
|
|
|
|||
|
|
@ -1805,8 +1805,8 @@ gimp_value_to_gp_param (const GValue *value,
|
|||
param->data.d_curve.n_points = gimp_curve_get_n_points (curve);
|
||||
param->data.d_curve.points = g_new0 (gdouble,
|
||||
2 * param->data.d_curve.n_points);
|
||||
param->data.d_curve.point_types = g_new0 (GimpCurvePointType,
|
||||
param->data.d_curve.n_points);
|
||||
param->data.d_curve.point_types = (guint32 *) g_new0 (GimpCurvePointType,
|
||||
param->data.d_curve.n_points);
|
||||
|
||||
for (gint j = 0; j < param->data.d_curve.n_points; j++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ gimp_config_writer_new_from_fd (gint fd)
|
|||
writer->ref_count = 1;
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
writer->output = g_win32_output_stream_new ((gpointer) fd, FALSE);
|
||||
writer->output = g_win32_output_stream_new ((gpointer) (intptr_t) fd, FALSE);
|
||||
#else
|
||||
writer->output = g_unix_output_stream_new (fd, FALSE);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1042,7 +1042,7 @@ dx_dinput_setup_events (ControllerDXDInput *controller,
|
|||
|
||||
controller->pollfd = g_new (GPollFD, 1);
|
||||
|
||||
controller->pollfd->fd = (int) controller->event;
|
||||
controller->pollfd->fd = (int) (intptr_t) controller->event;
|
||||
controller->pollfd->events = G_IO_IN;
|
||||
|
||||
g_source_add_poll (&source->source, controller->pollfd);
|
||||
|
|
|
|||
Loading…
Reference in a new issue