[gimp] Prevents compiling error of double definition when linked to libgexiv2
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Prevents compiling error of double definition when linked to libgexiv2
- Date: Thu, 3 Oct 2013 12:06:42 +0000 (UTC)
commit 4a6cfd15d1016f8bbf55a57788e047ebe7ed1e30
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Thu Oct 3 13:36:59 2013 +0200
Prevents compiling error of double definition when linked to libgexiv2
plug-ins/color-rotate/color-rotate-callbacks.c | 184 ++++++++++++------------
plug-ins/color-rotate/color-rotate-dialog.c | 68 +++++-----
plug-ins/color-rotate/color-rotate-utils.c | 28 ++--
plug-ins/color-rotate/color-rotate.c | 36 +++---
plug-ins/color-rotate/color-rotate.h | 2 +-
5 files changed, 159 insertions(+), 159 deletions(-)
---
diff --git a/plug-ins/color-rotate/color-rotate-callbacks.c b/plug-ins/color-rotate/color-rotate-callbacks.c
index 5c96b75..ff948e5 100644
--- a/plug-ins/color-rotate/color-rotate-callbacks.c
+++ b/plug-ins/color-rotate/color-rotate-callbacks.c
@@ -87,7 +87,7 @@ rcm_360_degrees (GtkWidget *button,
circle->angle->beta = circle->angle->alpha-circle->angle->cw_ccw * 0.001;
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
void
@@ -115,7 +115,7 @@ rcm_a_to_b (GtkWidget *button,
SWAP (circle->angle->alpha, circle->angle->beta);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
@@ -131,14 +131,14 @@ rcm_spinbutton_to_degrees (GtkWidget *button,
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
gtk_adjustment_configure (adj,
- value * rcm_units_factor (Current.Units),
+ value * rcm_units_factor (Current_c.Units),
gtk_adjustment_get_lower (adj), 360.0,
0.01, 1.0,
gtk_adjustment_get_page_size (adj));
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 2);
- gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
+ gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current_c.Units));
}
void
@@ -147,27 +147,27 @@ rcm_switch_to_degrees (GtkWidget *button,
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- Current.Units = DEGREES;
+ Current_c.Units = DEGREES;
- rcm_spinbutton_to_degrees (Current.From->alpha_entry,
- Current.From->angle->alpha,
- Current.From->alpha_units_label);
+ rcm_spinbutton_to_degrees (Current_c.From->alpha_entry,
+ Current_c.From->angle->alpha,
+ Current_c.From->alpha_units_label);
- rcm_spinbutton_to_degrees (Current.From->beta_entry,
- Current.From->angle->beta,
- Current.From->beta_units_label);
+ rcm_spinbutton_to_degrees (Current_c.From->beta_entry,
+ Current_c.From->angle->beta,
+ Current_c.From->beta_units_label);
- rcm_spinbutton_to_degrees (Current.To->alpha_entry,
- Current.To->angle->alpha,
- Current.To->alpha_units_label);
+ rcm_spinbutton_to_degrees (Current_c.To->alpha_entry,
+ Current_c.To->angle->alpha,
+ Current_c.To->alpha_units_label);
- rcm_spinbutton_to_degrees (Current.To->beta_entry,
- Current.To->angle->beta,
- Current.To->beta_units_label);
+ rcm_spinbutton_to_degrees (Current_c.To->beta_entry,
+ Current_c.To->angle->beta,
+ Current_c.To->beta_units_label);
- rcm_spinbutton_to_degrees (Current.Gray->hue_entry,
- Current.Gray->hue,
- Current.Gray->hue_units_label);
+ rcm_spinbutton_to_degrees (Current_c.Gray->hue_entry,
+ Current_c.Gray->hue,
+ Current_c.Gray->hue_units_label);
}
}
@@ -181,14 +181,14 @@ rcm_spinbutton_to_radians (GtkWidget *button,
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
gtk_adjustment_configure (adj,
- value * rcm_units_factor (Current.Units),
+ value * rcm_units_factor (Current_c.Units),
gtk_adjustment_get_lower (adj), TP,
0.0001, 0.001,
gtk_adjustment_get_page_size (adj));
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 4);
- gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
+ gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current_c.Units));
}
void
@@ -197,27 +197,27 @@ rcm_switch_to_radians (GtkWidget *button,
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- Current.Units = RADIANS;
+ Current_c.Units = RADIANS;
- rcm_spinbutton_to_radians (Current.From->alpha_entry,
- Current.From->angle->alpha,
- Current.From->alpha_units_label);
+ rcm_spinbutton_to_radians (Current_c.From->alpha_entry,
+ Current_c.From->angle->alpha,
+ Current_c.From->alpha_units_label);
- rcm_spinbutton_to_radians (Current.From->beta_entry,
- Current.From->angle->beta,
- Current.From->beta_units_label);
+ rcm_spinbutton_to_radians (Current_c.From->beta_entry,
+ Current_c.From->angle->beta,
+ Current_c.From->beta_units_label);
- rcm_spinbutton_to_radians (Current.To->alpha_entry,
- Current.To->angle->alpha,
- Current.To->alpha_units_label);
+ rcm_spinbutton_to_radians (Current_c.To->alpha_entry,
+ Current_c.To->angle->alpha,
+ Current_c.To->alpha_units_label);
- rcm_spinbutton_to_radians (Current.To->beta_entry,
- Current.To->angle->beta,
- Current.To->beta_units_label);
+ rcm_spinbutton_to_radians (Current_c.To->beta_entry,
+ Current_c.To->angle->beta,
+ Current_c.To->beta_units_label);
- rcm_spinbutton_to_radians (Current.Gray->hue_entry,
- Current.Gray->hue,
- Current.Gray->hue_units_label);
+ rcm_spinbutton_to_radians (Current_c.Gray->hue_entry,
+ Current_c.Gray->hue,
+ Current_c.Gray->hue_units_label);
}
}
@@ -231,14 +231,14 @@ rcm_spinbutton_to_radians_over_PI (GtkWidget *button,
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
gtk_adjustment_configure (adj,
- value * rcm_units_factor (Current.Units),
+ value * rcm_units_factor (Current_c.Units),
gtk_adjustment_get_lower (adj), 2.0,
0.0001, 0.001,
gtk_adjustment_get_page_size (adj));
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 4);
- gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
+ gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current_c.Units));
}
void
@@ -247,27 +247,27 @@ rcm_switch_to_radians_over_PI (GtkWidget *button,
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- Current.Units = RADIANS_OVER_PI;
+ Current_c.Units = RADIANS_OVER_PI;
- rcm_spinbutton_to_radians_over_PI (Current.From->alpha_entry,
- Current.From->angle->alpha,
- Current.From->alpha_units_label);
+ rcm_spinbutton_to_radians_over_PI (Current_c.From->alpha_entry,
+ Current_c.From->angle->alpha,
+ Current_c.From->alpha_units_label);
- rcm_spinbutton_to_radians_over_PI (Current.From->beta_entry,
- Current.From->angle->beta,
- Current.From->beta_units_label);
+ rcm_spinbutton_to_radians_over_PI (Current_c.From->beta_entry,
+ Current_c.From->angle->beta,
+ Current_c.From->beta_units_label);
- rcm_spinbutton_to_radians_over_PI (Current.To->alpha_entry,
- Current.To->angle->alpha,
- Current.To->alpha_units_label);
+ rcm_spinbutton_to_radians_over_PI (Current_c.To->alpha_entry,
+ Current_c.To->angle->alpha,
+ Current_c.To->alpha_units_label);
- rcm_spinbutton_to_radians_over_PI (Current.To->beta_entry,
- Current.To->angle->beta,
- Current.To->beta_units_label);
+ rcm_spinbutton_to_radians_over_PI (Current_c.To->beta_entry,
+ Current_c.To->angle->beta,
+ Current_c.To->beta_units_label);
- rcm_spinbutton_to_radians_over_PI (Current.Gray->hue_entry,
- Current.Gray->hue,
- Current.Gray->hue_units_label);
+ rcm_spinbutton_to_radians_over_PI (Current_c.Gray->hue_entry,
+ Current_c.Gray->hue,
+ Current_c.Gray->hue_units_label);
}
}
@@ -280,9 +280,9 @@ rcm_switch_to_gray_to (GtkWidget *button,
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- Current.Gray_to_from = GRAY_TO;
+ Current_c.Gray_to_from = GRAY_TO;
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
}
@@ -292,9 +292,9 @@ rcm_switch_to_gray_from (GtkWidget *button,
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- Current.Gray_to_from = GRAY_FROM;
+ Current_c.Gray_to_from = GRAY_FROM;
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
}
@@ -305,7 +305,7 @@ void
rcm_preview_as_you_drag (GtkWidget *button,
gpointer *value)
{
- Current.RealTime = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ Current_c.RealTime = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
}
void
@@ -316,15 +316,15 @@ rcm_combo_callback (GtkWidget *widget,
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value);
- Current.reduced = rcm_reduce_image (Current.drawable, Current.mask,
+ Current_c.reduced = rcm_reduce_image (Current_c.drawable, Current_c.mask,
MAX_PREVIEW_SIZE, value);
- gtk_widget_set_size_request (Current.Bna->before,
- Current.reduced->width,
- Current.reduced->height);
- gtk_widget_set_size_request (Current.Bna->after,
- Current.reduced->width,
- Current.reduced->height);
+ gtk_widget_set_size_request (Current_c.Bna->before,
+ Current_c.reduced->width,
+ Current_c.reduced->height);
+ gtk_widget_set_size_request (Current_c.Bna->after,
+ Current_c.reduced->width,
+ Current_c.reduced->height);
}
@@ -375,14 +375,14 @@ rcm_button_press_event (GtkWidget *widget,
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->alpha_entry),
circle->angle->alpha *
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->beta_entry),
circle->angle->beta *
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
- if (Current.RealTime)
- rcm_render_preview (Current.Bna->after);
+ if (Current_c.RealTime)
+ rcm_render_preview (Current_c.Bna->after);
}
}
else
@@ -396,7 +396,7 @@ rcm_release_event (GtkWidget *widget,
GdkEventButton *event,
RcmCircle *circle)
{
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
return TRUE;
}
@@ -430,14 +430,14 @@ rcm_motion_notify_event (GtkWidget *widget,
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->alpha_entry),
circle->angle->alpha *
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->beta_entry),
circle->angle->beta *
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
- if (Current.RealTime)
- rcm_render_preview (Current.Bna->after);
+ if (Current_c.RealTime)
+ rcm_render_preview (Current_c.Bna->after);
}
gdk_event_request_motions (event);
@@ -484,13 +484,13 @@ rcm_gray_button_press_event (GtkWidget *widget,
gtk_widget_queue_draw (circle->preview);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->hue_entry),
- circle->hue * rcm_units_factor (Current.Units));
+ circle->hue * rcm_units_factor (Current_c.Units));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->satur_entry),
circle->satur);
- if (Current.RealTime)
- rcm_render_preview (Current.Bna->after);
+ if (Current_c.RealTime)
+ rcm_render_preview (Current_c.Bna->after);
return TRUE;
}
@@ -500,7 +500,7 @@ rcm_gray_release_event (GtkWidget *widget,
GdkEventButton *event,
RcmGray *circle)
{
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
return TRUE;
}
@@ -524,13 +524,13 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
circle->satur = 1;
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->hue_entry),
- circle->hue * rcm_units_factor(Current.Units));
+ circle->hue * rcm_units_factor(Current_c.Units));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->satur_entry),
circle->satur);
- if (Current.RealTime)
- rcm_render_preview (Current.Bna->after);
+ if (Current_c.RealTime)
+ rcm_render_preview (Current_c.Bna->after);
gdk_event_request_motions (event);
@@ -545,11 +545,11 @@ rcm_set_alpha (GtkWidget *entry,
RcmCircle *circle)
{
circle->angle->alpha = (gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry)) /
- rcm_units_factor (Current.Units));
+ rcm_units_factor (Current_c.Units));
gtk_widget_queue_draw (circle->preview);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
void
@@ -557,11 +557,11 @@ rcm_set_beta (GtkWidget *entry,
RcmCircle *circle)
{
circle->angle->beta = (gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry)) /
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
gtk_widget_queue_draw (circle->preview);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
void
@@ -569,11 +569,11 @@ rcm_set_hue (GtkWidget *entry,
RcmGray *circle)
{
circle->hue = (gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry)) /
- rcm_units_factor(Current.Units));
+ rcm_units_factor(Current_c.Units));
gtk_widget_queue_draw (circle->preview);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
void
@@ -584,7 +584,7 @@ rcm_set_satur (GtkWidget *entry,
gtk_widget_queue_draw (circle->preview);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
void
@@ -595,5 +595,5 @@ rcm_set_gray_sat (GtkWidget *entry,
gtk_widget_queue_draw (circle->preview);
- rcm_render_preview (Current.Bna->after);
+ rcm_render_preview (Current_c.Bna->after);
}
diff --git a/plug-ins/color-rotate/color-rotate-dialog.c b/plug-ins/color-rotate/color-rotate-dialog.c
index 6ffc5a1..d072011 100644
--- a/plug-ins/color-rotate/color-rotate-dialog.c
+++ b/plug-ins/color-rotate/color-rotate-dialog.c
@@ -121,13 +121,13 @@ rcm_create_previews (void)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- frame = rcm_create_one_preview (&Current.Bna->before, ORIGINAL,
- Current.reduced->width,
- Current.reduced->height);
+ frame = rcm_create_one_preview (&Current_c.Bna->before, ORIGINAL,
+ Current_c.reduced->width,
+ Current_c.reduced->height);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
- g_signal_connect_after (Current.Bna->before, "size-allocate",
+ g_signal_connect_after (Current_c.Bna->before, "size-allocate",
G_CALLBACK (rcm_render_preview),
NULL);
@@ -139,13 +139,13 @@ rcm_create_previews (void)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- frame = rcm_create_one_preview (&Current.Bna->after, CURRENT,
- Current.reduced->width,
- Current.reduced->height);
+ frame = rcm_create_one_preview (&Current_c.Bna->after, CURRENT,
+ Current_c.reduced->width,
+ Current_c.reduced->height);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
- g_signal_connect_after (Current.Bna->after, "size-allocate",
+ g_signal_connect_after (Current_c.Bna->after, "size-allocate",
G_CALLBACK (rcm_render_preview),
NULL);
@@ -155,12 +155,12 @@ rcm_create_previews (void)
button = gtk_check_button_new_with_label (_("Continuous update"));
gtk_box_pack_start(GTK_BOX (vbox), button, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), Current.RealTime);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), Current_c.RealTime);
gtk_widget_show (button);
g_signal_connect (button, "clicked",
G_CALLBACK (rcm_preview_as_you_drag),
- &(Current.RealTime));
+ &(Current_c.RealTime));
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -174,7 +174,7 @@ rcm_create_previews (void)
_("Selection"), SELECTION,
_("Context"), SELECTION_IN_CONTEXT,
NULL);
- gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), Current.Slctn);
+ gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), Current_c.Slctn);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo);
@@ -315,7 +315,7 @@ rcm_create_one_circle (gint height,
st);
/* label */
- st->alpha_units_label = gtk_label_new (rcm_units_string (Current.Units));
+ st->alpha_units_label = gtk_label_new (rcm_units_string (Current_c.Units));
gtk_widget_show (st->alpha_units_label);
gtk_table_attach (GTK_TABLE (legend_table),
@@ -341,7 +341,7 @@ rcm_create_one_circle (gint height,
st);
/* label */
- st->beta_units_label = gtk_label_new (rcm_units_string (Current.Units));
+ st->beta_units_label = gtk_label_new (rcm_units_string (Current_c.Units));
gtk_widget_show (st->beta_units_label);
gtk_table_attach (GTK_TABLE (legend_table), st->beta_units_label, 5,6, 0,1,
@@ -374,16 +374,16 @@ rcm_create_main (void)
{
GtkWidget *vbox;
- Current.From = rcm_create_one_circle (SUM, C_("color-rotate", "From:"));
- Current.To = rcm_create_one_circle (SUM, C_("color-rotate", "To:"));
+ Current_c.From = rcm_create_one_circle (SUM, C_("color-rotate", "From:"));
+ Current_c.To = rcm_create_one_circle (SUM, C_("color-rotate", "To:"));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (vbox), Current.From->frame,
+ gtk_box_pack_start (GTK_BOX (vbox), Current_c.From->frame,
FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), Current.To->frame,
+ gtk_box_pack_start (GTK_BOX (vbox), Current_c.To->frame,
FALSE, FALSE, 0);
return vbox;
@@ -407,7 +407,7 @@ rcm_create_gray (void)
RcmGray *st;
GtkAdjustment *adj;
- Current.Gray = st = g_new (RcmGray, 1);
+ Current_c.Gray = st = g_new (RcmGray, 1);
st->hue = 0;
st->satur = 0;
@@ -483,7 +483,7 @@ rcm_create_gray (void)
st);
/* Gray: Circle: units label */
- st->hue_units_label = gtk_label_new (rcm_units_string (Current.Units));
+ st->hue_units_label = gtk_label_new (rcm_units_string (Current_c.Units));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (table), st->hue_units_label, 2, 3, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
@@ -524,24 +524,24 @@ rcm_create_gray (void)
gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- if (Current.Gray_to_from == GRAY_FROM)
+ if (Current_c.Gray_to_from == GRAY_FROM)
gtk_button_clicked (GTK_BUTTON (button));
g_signal_connect (button, "clicked",
G_CALLBACK (rcm_switch_to_gray_from),
- &(Current.Gray_to_from));
+ &(Current_c.Gray_to_from));
button = gtk_radio_button_new_with_label (group, _("Change to this"));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- if (Current.Gray_to_from == GRAY_TO)
+ if (Current_c.Gray_to_from == GRAY_TO)
gtk_button_clicked (GTK_BUTTON (button));
g_signal_connect (button, "clicked",
G_CALLBACK (rcm_switch_to_gray_to),
- &(Current.Gray_to_from));
+ &(Current_c.Gray_to_from));
/** Gray: What is gray? **/
frame = gimp_frame_new (_("Gray Threshold"));
@@ -598,7 +598,7 @@ rcm_create_units (void)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- if (Current.Units == RADIANS)
+ if (Current_c.Units == RADIANS)
gtk_button_clicked (GTK_BUTTON (button));
g_signal_connect (button, "clicked",
@@ -610,7 +610,7 @@ rcm_create_units (void)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- if (Current.Units == RADIANS_OVER_PI)
+ if (Current_c.Units == RADIANS_OVER_PI)
gtk_button_clicked (GTK_BUTTON (button));
g_signal_connect (button, "clicked",
@@ -621,7 +621,7 @@ rcm_create_units (void)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- if (Current.Units == DEGREES)
+ if (Current_c.Units == DEGREES)
gtk_button_clicked (GTK_BUTTON (button));
g_signal_connect (button, "clicked",
@@ -643,7 +643,7 @@ color_rotate_dialog (void)
GtkWidget *previews;
gboolean run;
- Current.Bna = g_new (RcmBna, 1);
+ Current_c.Bna = g_new (RcmBna, 1);
gimp_ui_init (PLUG_IN_BINARY, TRUE);
color_rotate_stock_init ();
@@ -664,13 +664,13 @@ color_rotate_dialog (void)
gimp_window_set_transient (GTK_WINDOW (dialog));
- Current.Bna->dlg = dialog;
+ Current_c.Bna->dlg = dialog;
/* Create sub-dialogs */
- Current.reduced = rcm_reduce_image (Current.drawable, Current.mask,
- MAX_PREVIEW_SIZE, Current.Slctn);
+ Current_c.reduced = rcm_reduce_image (Current_c.drawable, Current_c.mask,
+ MAX_PREVIEW_SIZE, Current_c.Slctn);
- Current.Bna->bna_frame = previews = rcm_create_previews ();
+ Current_c.Bna->bna_frame = previews = rcm_create_previews ();
/* H-Box */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
@@ -698,9 +698,9 @@ color_rotate_dialog (void)
gtk_widget_show (dialog);
- rcm_render_circle (Current.From->preview, SUM, MARGIN);
- rcm_render_circle (Current.To->preview, SUM, MARGIN);
- rcm_render_circle (Current.Gray->preview, GRAY_SUM, GRAY_MARGIN);
+ rcm_render_circle (Current_c.From->preview, SUM, MARGIN);
+ rcm_render_circle (Current_c.To->preview, SUM, MARGIN);
+ rcm_render_circle (Current_c.Gray->preview, GRAY_SUM, GRAY_MARGIN);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
diff --git a/plug-ins/color-rotate/color-rotate-utils.c b/plug-ins/color-rotate/color-rotate-utils.c
index 1fe8da7..38750d0 100644
--- a/plug-ins/color-rotate/color-rotate-utils.c
+++ b/plug-ins/color-rotate/color-rotate-utils.c
@@ -169,7 +169,7 @@ rcm_angle_inside_slice (float angle,
gboolean
rcm_is_gray (float s)
{
- return (s <= Current.Gray->gray_sat);
+ return (s <= Current_c.Gray->gray_sat);
}
@@ -328,10 +328,10 @@ rcm_render_preview (GtkWidget *preview)
version = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (preview), "mode"));
- reduced = Current.reduced;
+ reduced = Current_c.reduced;
RW = reduced->width;
RH = reduced->height;
- bytes = Current.drawable->bpp;
+ bytes = Current_c.drawable->bpp;
hsv_array = reduced->hsv;
rgb_array = reduced->rgb;
@@ -355,14 +355,14 @@ rcm_render_preview (GtkWidget *preview)
if (rcm_is_gray(S) && (reduced->mask[i*RW+j] != 0))
{
- switch (Current.Gray_to_from)
+ switch (Current_c.Gray_to_from)
{
case GRAY_FROM:
- if (rcm_angle_inside_slice (Current.Gray->hue,
- Current.From->angle) <= 1)
+ if (rcm_angle_inside_slice (Current_c.Gray->hue,
+ Current_c.From->angle) <= 1)
{
- H = Current.Gray->hue/TP;
- S = Current.Gray->satur;
+ H = Current_c.Gray->hue/TP;
+ S = Current_c.Gray->satur;
}
else
skip = TRUE;
@@ -372,8 +372,8 @@ rcm_render_preview (GtkWidget *preview)
unchanged = FALSE;
skip = TRUE;
gimp_hsv_to_rgb4 (rgb,
- Current.Gray->hue/TP,
- Current.Gray->satur,
+ Current_c.Gray->hue/TP,
+ Current_c.Gray->satur,
V);
break;
@@ -385,10 +385,10 @@ rcm_render_preview (GtkWidget *preview)
if (!skip)
{
unchanged = FALSE;
- H = rcm_linear (rcm_left_end (Current.From->angle),
- rcm_right_end (Current.From->angle),
- rcm_left_end (Current.To->angle),
- rcm_right_end (Current.To->angle),
+ H = rcm_linear (rcm_left_end (Current_c.From->angle),
+ rcm_right_end (Current_c.From->angle),
+ rcm_left_end (Current_c.To->angle),
+ rcm_right_end (Current_c.To->angle),
H * TP);
H = angle_mod_2PI(H) / TP;
diff --git a/plug-ins/color-rotate/color-rotate.c b/plug-ins/color-rotate/color-rotate.c
index e4056ab..b811fa4 100644
--- a/plug-ins/color-rotate/color-rotate.c
+++ b/plug-ins/color-rotate/color-rotate.c
@@ -62,7 +62,7 @@ static void color_rotate (GimpDrawable *drawable);
/* Global variables */
-RcmParams Current =
+RcmParams Current_c =
{
SELECTION, /* SELECTION ONLY */
TRUE, /* REAL TIME */
@@ -129,18 +129,18 @@ run (const gchar *name,
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
- Current.drawable = gimp_drawable_get (param[2].data.d_drawable);
- Current.mask = gimp_drawable_get (gimp_image_get_selection (param[1].data.d_image));
+ Current_c.drawable = gimp_drawable_get (param[2].data.d_drawable);
+ Current_c.mask = gimp_drawable_get (gimp_image_get_selection (param[1].data.d_image));
- if (gimp_drawable_is_rgb (Current.drawable->drawable_id))
+ if (gimp_drawable_is_rgb (Current_c.drawable->drawable_id))
{
if (color_rotate_dialog ())
{
gimp_progress_init (_("Rotating the colors"));
- gimp_tile_cache_ntiles (2 * (Current.drawable->width /
+ gimp_tile_cache_ntiles (2 * (Current_c.drawable->width /
gimp_tile_width () + 1));
- color_rotate (Current.drawable);
+ color_rotate (Current_c.drawable);
gimp_displays_flush ();
}
else
@@ -156,7 +156,7 @@ run (const gchar *name,
values[0].data.d_status = status;
if (status == GIMP_PDB_SUCCESS)
- gimp_drawable_detach (Current.drawable);
+ gimp_drawable_detach (Current_c.drawable);
}
@@ -185,13 +185,13 @@ color_rotate_row (const guchar *src_row,
if (rcm_is_gray (S))
{
- if (Current.Gray_to_from == GRAY_FROM)
+ if (Current_c.Gray_to_from == GRAY_FROM)
{
- if (rcm_angle_inside_slice (Current.Gray->hue,
- Current.From->angle) <= 1)
+ if (rcm_angle_inside_slice (Current_c.Gray->hue,
+ Current_c.From->angle) <= 1)
{
- H = Current.Gray->hue / TP;
- S = Current.Gray->satur;
+ H = Current_c.Gray->hue / TP;
+ S = Current_c.Gray->satur;
}
else
{
@@ -201,17 +201,17 @@ color_rotate_row (const guchar *src_row,
else
{
skip = TRUE;
- gimp_hsv_to_rgb4 (rgb, Current.Gray->hue / TP,
- Current.Gray->satur, V);
+ gimp_hsv_to_rgb4 (rgb, Current_c.Gray->hue / TP,
+ Current_c.Gray->satur, V);
}
}
if (! skip)
{
- H = rcm_linear (rcm_left_end (Current.From->angle),
- rcm_right_end (Current.From->angle),
- rcm_left_end (Current.To->angle),
- rcm_right_end (Current.To->angle),
+ H = rcm_linear (rcm_left_end (Current_c.From->angle),
+ rcm_right_end (Current_c.From->angle),
+ rcm_left_end (Current_c.To->angle),
+ rcm_right_end (Current_c.To->angle),
H * TP);
H = angle_mod_2PI (H) / TP;
diff --git a/plug-ins/color-rotate/color-rotate.h b/plug-ins/color-rotate/color-rotate.h
index 883efc3..fe3698a 100644
--- a/plug-ins/color-rotate/color-rotate.h
+++ b/plug-ins/color-rotate/color-rotate.h
@@ -133,4 +133,4 @@ typedef struct
/* Global variables */
-extern RcmParams Current;
+extern RcmParams Current_c;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
