[gimp] app: Fix tabs to spaces for dynamics
- From: Alexia Death <alexiade src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] app: Fix tabs to spaces for dynamics
- Date: Sat, 19 Dec 2009 15:36:36 +0000 (UTC)
commit 355f1bfd569436bcafb5b1dbe9a49446793d4c45
Author: Alexia Death <alexiadeath gmail com>
Date: Sat Dec 19 17:29:42 2009 +0200
app: Fix tabs to spaces for dynamics
app/core/gimpdynamicsoutput.c | 30 +++++++++++++++---------------
app/core/gimpdynamicsoutput.h | 7 ++++---
app/paint/gimpairbrush.c | 4 ++--
app/paint/gimpbrushcore.c | 16 ++++++++--------
app/paint/gimpclone.c | 2 +-
app/paint/gimpconvolve.c | 4 ++--
app/paint/gimpdodgeburn.c | 4 ++--
app/paint/gimperaser.c | 4 ++--
app/paint/gimpheal.c | 2 +-
app/paint/gimppaintbrush.c | 6 +++---
app/paint/gimpsmudge.c | 6 +++---
app/paint/gimpsourcecore.c | 2 +-
12 files changed, 44 insertions(+), 43 deletions(-)
---
diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c
index 4c179d3..a87a611 100644
--- a/app/core/gimpdynamicsoutput.c
+++ b/app/core/gimpdynamicsoutput.c
@@ -285,13 +285,13 @@ gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
- GimpFadeOptions *fade_options = options->fade_options;
+ GimpFadeOptions *fade_options = options->fade_options;
- if (fade_options->use_fade)
- {
+ if (fade_options->use_fade)
+ {
total += fade_point;
factors++;
- }
+ }
}
if (factors > 0)
@@ -308,7 +308,7 @@ gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
gdouble
gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
- GimpPaintOptions *options,
+ GimpPaintOptions *options,
gdouble fade_point)
{
gdouble total = 0.0;
@@ -380,13 +380,13 @@ gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
- GimpFadeOptions *fade_options = options->fade_options;
+ GimpFadeOptions *fade_options = options->fade_options;
- if (fade_options->use_fade)
- {
+ if (fade_options->use_fade)
+ {
total += fade_point;
factors++;
- }
+ }
}
if (factors > 0)
@@ -403,7 +403,7 @@ gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
gdouble
gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
- GimpPaintOptions *options,
+ GimpPaintOptions *options,
gdouble fade_point)
{
gdouble total = 0.0;
@@ -456,13 +456,13 @@ gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
- GimpFadeOptions *fade_options = options->fade_options;
+ GimpFadeOptions *fade_options = options->fade_options;
- if (fade_options->use_fade)
- {
- total += fade_point;
+ if (fade_options->use_fade)
+ {
+ total += fade_point;
factors++;
- }
+ }
}
if (factors > 0)
diff --git a/app/core/gimpdynamicsoutput.h b/app/core/gimpdynamicsoutput.h
index 07df88e..3116fd1 100644
--- a/app/core/gimpdynamicsoutput.h
+++ b/app/core/gimpdynamicsoutput.h
@@ -65,15 +65,16 @@ gboolean gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
gdouble gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
- GimpPaintOptions *options,
+ GimpPaintOptions *options,
gdouble fade_point);
+
gdouble gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
- GimpPaintOptions *options,
+ GimpPaintOptions *options,
gdouble fade_point);
gdouble gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
- GimpPaintOptions *options,
+ GimpPaintOptions *options,
gdouble fade_point);
diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c
index 8cdbcf9..1b1fc94 100644
--- a/app/paint/gimpairbrush.c
+++ b/app/paint/gimpairbrush.c
@@ -156,7 +156,7 @@ gimp_airbrush_paint (GimpPaintCore *paint_core,
dynamic_rate =
gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
- paint_options,
+ paint_options,
fade_point);
timeout = 10000 / (options->rate * dynamic_rate);
@@ -199,7 +199,7 @@ gimp_airbrush_motion (GimpPaintCore *paint_core,
opacity = options->pressure / 100.0;
opacity *= gimp_dynamics_output_get_linear_value(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index 82b2c73..81e6376 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -425,17 +425,17 @@ gimp_brush_core_start (GimpPaintCore *paint_core,
core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_output,
coords,
- paint_options,
+ paint_options,
fade_point);
core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_output,
coords,
- paint_options,
+ paint_options,
fade_point);
core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_output,
coords,
- paint_options,
+ paint_options,
fade_point);
}
}
@@ -522,7 +522,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core,
{
dyn_spacing = gimp_dynamics_output_get_linear_value (core->dynamics->spacing_output,
¤t_coords,
- paint_options,
+ paint_options,
fade_point);
/* Dynamic spacing assumes that the value set in core is the min value
* and the max is full 200% spacing. This approach differs ofrom the usual
@@ -751,7 +751,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core,
dyn_jitter = core->jitter * gimp_dynamics_output_get_linear_value (core->dynamics->jitter_output,
¤t_coords,
- paint_options,
+ paint_options,
fade_point);
jitter_dist = g_rand_double_range (core->rand, 0, dyn_jitter);
@@ -819,17 +819,17 @@ gimp_brush_core_get_paint_area (GimpPaintCore *paint_core,
core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_output,
coords,
- paint_options,
+ paint_options,
fade_point);
core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_output,
coords,
- paint_options,
+ paint_options,
fade_point);
core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_output,
coords,
- paint_options,
+ paint_options,
fade_point);
}
}
diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c
index 8f1486c..4990e2b 100644
--- a/app/paint/gimpclone.c
+++ b/app/paint/gimpclone.c
@@ -245,7 +245,7 @@ gimp_clone_motion (GimpSourceCore *source_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
index d4934c7..23f123c 100644
--- a/app/paint/gimpconvolve.c
+++ b/app/paint/gimpconvolve.c
@@ -151,7 +151,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
@@ -165,7 +165,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
rate *= gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
- paint_options,
+ paint_options,
fade_point);
gimp_convolve_calculate_matrix (convolve, options->type,
diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c
index 1546fc2..a3286a4 100644
--- a/app/paint/gimpdodgeburn.c
+++ b/app/paint/gimpdodgeburn.c
@@ -190,7 +190,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
@@ -257,7 +257,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
/* Replace the newly dodgedburned area (canvas_buf) to the image */
diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c
index 53d605a..79c648e 100644
--- a/app/paint/gimperaser.c
+++ b/app/paint/gimperaser.c
@@ -125,7 +125,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
@@ -147,7 +147,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
index a5a6bac..15a0108 100644
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@@ -450,7 +450,7 @@ gimp_heal_motion (GimpSourceCore *source_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
mask_buf = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (source_core),
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
index d2bc7b0..b842729 100644
--- a/app/paint/gimppaintbrush.c
+++ b/app/paint/gimppaintbrush.c
@@ -128,7 +128,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
opacity *= gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
@@ -142,7 +142,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
grad_point = gimp_dynamics_output_get_linear_value (dynamics->color_output,
coords,
- paint_options,
+ paint_options,
fade_point);
/* optionally take the color from the current gradient */
@@ -190,7 +190,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
/* finally, let the brush core paste the colored area on the canvas */
diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c
index 6f77710..27be04c 100644
--- a/app/paint/gimpsmudge.c
+++ b/app/paint/gimpsmudge.c
@@ -262,7 +262,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
@@ -282,7 +282,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
/* Enable dynamic rate */
dynamic_rate = gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
- paint_options,
+ paint_options,
fade_point);
rate = (options->rate / 100.0) * dynamic_rate;
@@ -326,7 +326,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
- paint_options,
+ paint_options,
fade_point);
gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c
index 9218d7e..2495dd9 100644
--- a/app/paint/gimpsourcecore.c
+++ b/app/paint/gimpsourcecore.c
@@ -366,7 +366,7 @@ gimp_source_core_motion (GimpSourceCore *source_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
- paint_options,
+ paint_options,
fade_point);
if (opacity == 0.0)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
