[gimp] app: fix implicit enum casting



commit cea42c73d8201075910ee7cfb4d7a0c84d39afb9
Author: Kristian Rietveld <kris loopnest org>
Date:   Fri Jan 9 23:47:57 2015 +0100

    app: fix implicit enum casting
    
    Silences clang.

 app/display/gimpdisplay-foreach.c          |    2 +-
 app/display/gimpdisplayshell-tool-events.c |    6 ++++--
 app/file/file-utils.c                      |    2 +-
 app/tools/gimpregionselecttool.c           |    2 +-
 app/tools/gimptexttool.c                   |    6 ++++--
 app/widgets/gimpcursor.c                   |    2 +-
 app/widgets/gimpcurveview.c                |    2 +-
 app/widgets/gimpdialogfactory.c            |    2 +-
 app/widgets/gimpthumbbox.c                 |    2 +-
 9 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/app/display/gimpdisplay-foreach.c b/app/display/gimpdisplay-foreach.c
index e9a2f09..66ef8ed 100644
--- a/app/display/gimpdisplay-foreach.c
+++ b/app/display/gimpdisplay-foreach.c
@@ -285,7 +285,7 @@ gimp_displays_set_busy (Gimp *gimp)
       GimpDisplayShell *shell =
         gimp_display_get_shell (GIMP_DISPLAY (list->data));
 
-      gimp_display_shell_set_override_cursor (shell, GDK_WATCH);
+      gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
     }
 }
 
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 484f21a..45b465c 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -1473,9 +1473,11 @@ gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
   shell->rotate_drag_angle = shell->rotate_angle;
 
   if (shell->rotating)
-    gimp_display_shell_set_override_cursor (shell, GDK_EXCHANGE);
+    gimp_display_shell_set_override_cursor (shell,
+                                            (GimpCursorType) GDK_EXCHANGE);
   else
-    gimp_display_shell_set_override_cursor (shell, GDK_FLEUR);
+    gimp_display_shell_set_override_cursor (shell,
+                                            (GimpCursorType) GDK_FLEUR);
 }
 
 static void
diff --git a/app/file/file-utils.c b/app/file/file-utils.c
index 8823cf8..a195dd2 100644
--- a/app/file/file-utils.c
+++ b/app/file/file-utils.c
@@ -256,7 +256,7 @@ file_utils_load_thumbnail (const gchar *filename)
       gimp_thumbnail_set_uri (thumbnail, uri);
 
       pixbuf = gimp_thumbnail_load_thumb (thumbnail,
-                                          GIMP_THUMBNAIL_SIZE_NORMAL,
+                                          (GimpThumbSize) GIMP_THUMBNAIL_SIZE_NORMAL,
                                           NULL);
     }
 
diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c
index 6896b8d..6a6cf50 100644
--- a/app/tools/gimpregionselecttool.c
+++ b/app/tools/gimpregionselecttool.c
@@ -360,7 +360,7 @@ gimp_region_select_tool_get_mask (GimpRegionSelectTool *region_sel,
   GimpRegionSelectOptions *options = GIMP_REGION_SELECT_TOOL_GET_OPTIONS (region_sel);
   GimpDisplayShell        *shell   = gimp_display_get_shell (display);
 
-  gimp_display_shell_set_override_cursor (shell, GDK_WATCH);
+  gimp_display_shell_set_override_cursor (shell, (GimpCursorType) GDK_WATCH);
 
   if (region_sel->segs)
     {
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index e07590e..5b86a66 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -694,7 +694,8 @@ gimp_text_tool_cursor_update (GimpTool         *tool,
                                                   coords->y) &&
           ! text_tool->moving)
         {
-          gimp_tool_control_set_cursor          (tool->control, GDK_XTERM);
+          gimp_tool_control_set_cursor          (tool->control,
+                                                 (GimpCursorType) GDK_XTERM);
           gimp_tool_control_set_cursor_modifier (tool->control,
                                                  GIMP_CURSOR_MODIFIER_NONE);
         }
@@ -705,7 +706,8 @@ gimp_text_tool_cursor_update (GimpTool         *tool,
     }
   else
     {
-      gimp_tool_control_set_cursor          (tool->control, GDK_XTERM);
+      gimp_tool_control_set_cursor          (tool->control,
+                                             (GimpCursorType) GDK_XTERM);
       gimp_tool_control_set_cursor_modifier (tool->control,
                                              GIMP_CURSOR_MODIFIER_NONE);
     }
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
index 76ea75e..cf9936f 100644
--- a/app/widgets/gimpcursor.c
+++ b/app/widgets/gimpcursor.c
@@ -245,7 +245,7 @@ gimp_cursor_new (GdkDisplay         *display,
   g_return_val_if_fail (cursor_type < GIMP_CURSOR_LAST, NULL);
 
   if (cursor_type <= (GimpCursorType) GDK_LAST_CURSOR)
-    return gdk_cursor_new_for_display (display, cursor_type);
+    return gdk_cursor_new_for_display (display, (GdkCursorType) cursor_type);
 
   g_return_val_if_fail (cursor_type >= GIMP_CURSOR_NONE, NULL);
 
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index 7b7ef47..08e9795 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -906,7 +906,7 @@ gimp_curve_view_motion_notify (GtkWidget      *widget,
   GimpCurveView  *view       = GIMP_CURVE_VIEW (widget);
   GimpCurve      *curve      = view->curve;
   GtkAllocation   allocation;
-  GimpCursorType  new_cursor = GDK_X_CURSOR;
+  GdkCursorType   new_cursor = GDK_X_CURSOR;
   gint            border;
   gint            width, height;
   gdouble         x;
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index f06304f..a18e875 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -1569,7 +1569,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
 
               cursor = gimp_cursor_new (display,
                                         GIMP_HANDEDNESS_RIGHT,
-                                        GDK_WATCH,
+                                        (GimpCursorType) GDK_WATCH,
                                         GIMP_TOOL_CURSOR_NONE,
                                         GIMP_CURSOR_MODIFIER_NONE);
             }
diff --git a/app/widgets/gimpthumbbox.c b/app/widgets/gimpthumbbox.c
index 5d3039e..48822fc 100644
--- a/app/widgets/gimpthumbbox.c
+++ b/app/widgets/gimpthumbbox.c
@@ -676,7 +676,7 @@ gimp_thumb_box_create_thumbnail (GimpThumbBox      *box,
   gimp_imagefile_set_file (box->imagefile, file);
 
   if (force ||
-      (gimp_thumbnail_peek_thumb (thumb, size) < GIMP_THUMB_STATE_FAILED &&
+      (gimp_thumbnail_peek_thumb (thumb, (GimpThumbSize) size) < GIMP_THUMB_STATE_FAILED &&
        ! gimp_thumbnail_has_failed (thumb)))
     {
       GError *error = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]