diff --git a/app/core/gimpbrush-transform.c b/app/core/gimpbrush-transform.c index 064dcec93f..93051460e9 100644 --- a/app/core/gimpbrush-transform.c +++ b/app/core/gimpbrush-transform.c @@ -67,7 +67,6 @@ gimp_brush_real_transform_size (GimpBrush *brush, scale, scale / aspect_ratio, angle, &matrix); gimp_brush_transform_bounding_box (brush, &matrix, &x, &y, width, height); - } /* @@ -638,7 +637,7 @@ gimp_brush_transform_bounding_box (GimpBrush *brush, *width = (gint) (ceil (MAX (MAX (x1, x2), MAX (x3, x4))) - *x); *height = (gint) (ceil (MAX (MAX (y1, y2), MAX (y3, y4))) - *y); - /*Transform size can not be less than 1 px*/ + /* Transform size can not be less than 1 px */ *width = MAX(1, *width); *height = MAX(1, *height); } diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 14f1674df0..90fa78d966 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -479,7 +479,6 @@ gimp_brush_transform_size (GimpBrush *brush, } GIMP_BRUSH_GET_CLASS (brush)->transform_size (brush, scale, aspect_ratio, angle, width, height); - } TempBuf * diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c index 17f31e80fc..e18b09682e 100644 --- a/app/core/gimpbrushgenerated.c +++ b/app/core/gimpbrushgenerated.c @@ -322,7 +322,6 @@ gimp_brush_generated_transform_size (GimpBrush *gbrush, *width = half_width * 2 + 1; *height = half_height * 2 + 1; - } static TempBuf * @@ -351,7 +350,6 @@ gimp_brush_generated_transform_mask (GimpBrush *gbrush, brush->aspect_ratio * aspect_ratio, (brush->angle + 360 * angle), NULL, NULL); - } diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 82650aae60..6cdedc0299 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -317,13 +317,11 @@ plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc, plug_in_menus_add_proc (manager, "/colormap-popup", plug_in_proc, menu_path); } - else if (! strcmp (manager->name, "")) { plug_in_menus_add_proc (manager, "/brushes-popup", plug_in_proc, menu_path); - } - + } else if (! strcmp (manager->name, "")) { plug_in_menus_add_proc (manager, "/dynamics-popup", diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c index 4af254653f..42ae32ef92 100644 --- a/app/paint/gimpbrushcore.c +++ b/app/paint/gimpbrushcore.c @@ -43,7 +43,6 @@ #include "gimpbrushcore-kernels.h" #include "gimppaintoptions.h" - #include "gimp-intl.h" diff --git a/app/paint/gimpbrushcore.h b/app/paint/gimpbrushcore.h index 3453ff8f4a..23f09f91a1 100644 --- a/app/paint/gimpbrushcore.h +++ b/app/paint/gimpbrushcore.h @@ -95,14 +95,12 @@ struct _GimpBrushCoreClass gboolean handles_changing_brush; /* Set for tools that don't mind if the brush scales while painting */ - gboolean handles_transforming_brush; void (* set_brush) (GimpBrushCore *core, GimpBrush *brush); - void (* set_dynamics) (GimpBrushCore *core, - GimpDynamics *brush); - + void (* set_dynamics) (GimpBrushCore *core, + GimpDynamics *brush); };