gimp-gap r827 - in trunk: . gap libgapbase libgapvidapi libgapvidutil vid_common vid_enc_avi vid_enc_ffmpeg vid_enc_rawframes vid_enc_single
- From: wolfgangh svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp-gap r827 - in trunk: . gap libgapbase libgapvidapi libgapvidutil vid_common vid_enc_avi vid_enc_ffmpeg vid_enc_rawframes vid_enc_single
- Date: Sun, 5 Apr 2009 06:47:08 +0000 (UTC)
Author: wolfgangh
Date: Sun Apr 5 06:47:07 2009
New Revision: 827
URL: http://svn.gnome.org/viewvc/gimp-gap?rev=827&view=rev
Log:
replaced tab characters by blanks
Modified:
trunk/ChangeLog
trunk/gap/gap-intl.h
trunk/gap/gap_arr_dialog.c
trunk/gap/gap_arr_dialog.h
trunk/gap/gap_audio_extract.c
trunk/gap/gap_audio_wav.c
trunk/gap/gap_audio_wav.h
trunk/gap/gap_base_ops.c
trunk/gap/gap_bluebox.c
trunk/gap/gap_bluebox_main.c
trunk/gap/gap_dbbrowser_utils.c
trunk/gap/gap_dbbrowser_utils.h
trunk/gap/gap_decode_mplayer.c
trunk/gap/gap_decode_mplayer_main.c
trunk/gap/gap_decode_xanim.c
trunk/gap/gap_filter_codegen.c
trunk/gap/gap_filter_foreach.c
trunk/gap/gap_filter_iterators.c
trunk/gap/gap_filter_main.c
trunk/gap/gap_filter_pdb.c
trunk/gap/gap_fmac_main.c
trunk/gap/gap_frontends_main.c
trunk/gap/gap_image.c
trunk/gap/gap_layer_copy.c
trunk/gap/gap_layer_copy.h
trunk/gap/gap_lib.c
trunk/gap/gap_lock.c
trunk/gap/gap_main.c
trunk/gap/gap_match.c
trunk/gap/gap_morph_dialog.c
trunk/gap/gap_morph_exec.c
trunk/gap/gap_morph_exec.h
trunk/gap/gap_morph_main.c
trunk/gap/gap_morph_main.h
trunk/gap/gap_morph_tween_dialog.c
trunk/gap/gap_mov_dialog.c
trunk/gap/gap_mov_dialog.h
trunk/gap/gap_mov_exec.c
trunk/gap/gap_mov_render.c
trunk/gap/gap_mpege.c
trunk/gap/gap_name2layer_main.c
trunk/gap/gap_navi_activtable.c
trunk/gap/gap_navigator_dialog.c
trunk/gap/gap_onion_base.c
trunk/gap/gap_onion_dialog.c
trunk/gap/gap_onion_main.c
trunk/gap/gap_pdb_calls.c
trunk/gap/gap_pdb_calls.h
trunk/gap/gap_player_dialog.h
trunk/gap/gap_player_main.c
trunk/gap/gap_pview_da.c
trunk/gap/gap_range_ops.c
trunk/gap/gap_range_ops.h
trunk/gap/gap_stock.c
trunk/gap/gap_story_dialog.h
trunk/gap/gap_story_main.c
trunk/gap/gap_story_render_audio.c
trunk/gap/gap_story_render_audio.h
trunk/gap/gap_story_render_processor.h
trunk/gap/gap_story_sox.c
trunk/gap/gap_story_vthumb.c
trunk/gap/gap_thumbnail.c
trunk/gap/gap_thumbnail.h
trunk/gap/gap_vex_dialog.c
trunk/gap/gap_vex_dialog.h
trunk/gap/gap_vex_exec.c
trunk/gap/gap_vex_main.c
trunk/gap/gap_video_index_creator.c
trunk/gap/gap_vin.c
trunk/gap/gap_wr_color_huesat.c
trunk/gap/gap_wr_color_levels.c
trunk/gap/gap_wr_opacity.c
trunk/gap/gap_wr_trans.c
trunk/gap/gimplastvaldesc.c
trunk/libgapbase/gap_base.c
trunk/libgapbase/gap_base.h
trunk/libgapbase/gap_file_util.c
trunk/libgapbase/gap_file_util.h
trunk/libgapbase/gap_val_file.c
trunk/libgapbase/gap_val_file.h
trunk/libgapvidapi/gap_vid_api-intl.h
trunk/libgapvidapi/gap_vid_api.c
trunk/libgapvidapi/gap_vid_api.h
trunk/libgapvidapi/gap_vid_api_gimp.c
trunk/libgapvidapi/gap_vid_api_mpeg3.c
trunk/libgapvidapi/gap_vid_api_mpeg3toc.c
trunk/libgapvidapi/gap_vid_api_util.c
trunk/libgapvidapi/gap_vid_api_vidindex.c
trunk/libgapvidutil/gap_gve_jpeg.c
trunk/libgapvidutil/gap_gve_jpeg.h
trunk/libgapvidutil/gap_gve_misc_util.c
trunk/libgapvidutil/gap_gve_png.c
trunk/libgapvidutil/gap_gve_png.h
trunk/libgapvidutil/gap_gve_raw.c
trunk/libgapvidutil/gap_gve_sox.c
trunk/libgapvidutil/gap_gve_xvid.c
trunk/vid_common/gap_cme_callbacks.c
trunk/vid_common/gap_cme_gui.c
trunk/vid_common/gap_cme_gui.h
trunk/vid_common/gap_cme_main.c
trunk/vid_enc_avi/gap_enc_avi_gui.c
trunk/vid_enc_avi/gap_enc_avi_main.c
trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.h
trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
trunk/vid_enc_rawframes/gap_enc_rawframes_main.c
trunk/vid_enc_single/gap_enc_singleframes_main.c
Modified: trunk/gap/gap-intl.h
==============================================================================
--- trunk/gap/gap-intl.h (original)
+++ trunk/gap/gap-intl.h Sun Apr 5 06:47:07 2009
@@ -19,7 +19,7 @@
# define bind_textdomain_codeset(Domain, Codeset) (Domain)
#endif
-#define INIT_I18N() G_STMT_START{ \
+#define INIT_I18N() G_STMT_START{ \
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \
textdomain (GETTEXT_PACKAGE); \
Modified: trunk/gap/gap_arr_dialog.c
==============================================================================
--- trunk/gap/gap_arr_dialog.c (original)
+++ trunk/gap/gap_arr_dialog.c Sun Apr 5 06:47:07 2009
@@ -183,13 +183,13 @@
static void default_button_cb (GtkWidget *widget, t_all_arr_args *arr_all);
static void default_button_create_value (char *title, GtkWidget *hbox,
GapArrArg *arr_ptr, t_arr_interface *arrint_ptr,
- t_all_arr_args *arr_all);
+ t_all_arr_args *arr_all);
static void
arr_close_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_arr_interface *arrint_ptr;
GtkWidget *dlg;
@@ -201,7 +201,7 @@
{
arrint_ptr = (t_arr_interface *) g_object_get_data (G_OBJECT (widget)
, GAP_ARR_INTERFACE_PTR
- );
+ );
}
if(arrint_ptr)
@@ -227,7 +227,7 @@
{
arrint_ptr = (t_arr_interface *) g_object_get_data (G_OBJECT (widget)
, GAP_ARR_INTERFACE_PTR
- );
+ );
}
if((arr_ptr)
@@ -238,7 +238,7 @@
if(arr_ptr->help_func)
{
/* call user help function */
- arr_ptr->help_func (arr_ptr->help_id, arrint_ptr->dlg);
+ arr_ptr->help_func (arr_ptr->help_id, arrint_ptr->dlg);
}
else
{
@@ -251,7 +251,7 @@
static void
but_array_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_arr_interface *arrint_ptr;
@@ -272,7 +272,7 @@
static void
entry_create_value(char *title, GtkTable *table, int row,
GapArrArg *arr_ptr, t_arr_interface *arrint_ptr,
- t_entry_cb_func entry_update_cb, char *init_txt)
+ t_entry_cb_func entry_update_cb, char *init_txt)
{
GtkWidget *entry;
GtkWidget *label;
@@ -294,8 +294,8 @@
}
gtk_widget_show(entry);
g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK (entry_update_cb),
- arr_ptr);
+ G_CALLBACK (entry_update_cb),
+ arr_ptr);
arr_ptr->text_entry = entry;
}
@@ -308,7 +308,7 @@
static void
label_create_value(char *title, GtkTable *table, int row,
GapArrArg *arr_ptr, t_arr_interface *arrint_ptr,
- gfloat align)
+ gfloat align)
{
GtkWidget *label;
GtkWidget *hbox;
@@ -362,7 +362,7 @@
static void
default_button_create_value(char *title, GtkWidget *hbox,
GapArrArg *arr_ptr, t_arr_interface *arrint_ptr,
- t_all_arr_args *arr_all)
+ t_all_arr_args *arr_all)
{
GtkWidget *button;
@@ -371,8 +371,8 @@
gtk_widget_show(button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK(default_button_cb),
- arr_all);
+ G_CALLBACK(default_button_cb),
+ arr_all);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
@@ -416,23 +416,23 @@
strncpy(arr_ptr->text_buf_ret, arr_ptr->text_buf_default, arr_ptr->text_buf_len -1);
buf = g_strdup(arr_ptr->text_buf_default);
}
- if(arr_ptr->widget_type == GAP_ARR_WGT_OPT_ENTRY)
- {
+ if(arr_ptr->widget_type == GAP_ARR_WGT_OPT_ENTRY)
+ {
arr_ptr->radio_ret = arr_ptr->radio_default;
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (arr_ptr->combo), arr_ptr->radio_ret);
- }
- break;
+ }
+ break;
case GAP_ARR_WGT_FLT_PAIR:
case GAP_ARR_WGT_FLT:
arr_ptr->flt_ret = arr_ptr->flt_default;
- fmt = g_strdup_printf("%%.%df", arr_ptr->flt_digits);
+ fmt = g_strdup_printf("%%.%df", arr_ptr->flt_digits);
buf = g_strdup_printf(fmt, arr_ptr->flt_ret);
g_free(fmt);
if(arr_ptr->adjustment)
{
gtk_adjustment_set_value (GTK_ADJUSTMENT (arr_ptr->adjustment), (gfloat)arr_ptr->flt_default);
}
- break;
+ break;
case GAP_ARR_WGT_INT_PAIR:
case GAP_ARR_WGT_INT:
arr_ptr->int_ret = arr_ptr->int_default;
@@ -441,31 +441,31 @@
{
gtk_adjustment_set_value (GTK_ADJUSTMENT (arr_ptr->adjustment), (gfloat)arr_ptr->int_default);
}
- break;
+ break;
case GAP_ARR_WGT_TOGGLE:
arr_ptr->int_ret = arr_ptr->int_default;
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (arr_ptr->check_button),
- arr_ptr->int_default);
- break;
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (arr_ptr->check_button),
+ arr_ptr->int_default);
+ break;
case GAP_ARR_WGT_RADIO:
arr_ptr->radio_ret = arr_ptr->radio_default;
- {
- t_radio_arg *rgp_list;
-
- for(rgp_list = (t_radio_arg *)arr_ptr->radiogroup
- ;rgp_list != NULL
- ;rgp_list = (t_radio_arg *)rgp_list->next)
- {
- if(rgp_list->radio_index == arr_ptr->radio_ret)
- {
+ {
+ t_radio_arg *rgp_list;
+
+ for(rgp_list = (t_radio_arg *)arr_ptr->radiogroup
+ ;rgp_list != NULL
+ ;rgp_list = (t_radio_arg *)rgp_list->next)
+ {
+ if(rgp_list->radio_index == arr_ptr->radio_ret)
+ {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rgp_list->radio_button)
- , TRUE);
- break;
- }
- }
- }
- break;
+ , TRUE);
+ break;
+ }
+ }
+ }
+ break;
case GAP_ARR_WGT_OPTIONMENU:
arr_ptr->radio_ret = arr_ptr->radio_default;
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (arr_ptr->combo), arr_ptr->radio_ret);
@@ -493,8 +493,8 @@
static void
p_font_callback (gchar *name
- ,gboolean dialog_closing
- ,gpointer user_data)
+ ,gboolean dialog_closing
+ ,gpointer user_data)
{
GapArrArg *arr_ptr;
@@ -543,15 +543,15 @@
/* Button to invoke fontbrowser */
button = gtk_button_new_with_label ( _("Font Browser"));
gtk_table_attach( GTK_TABLE(table), button, 2, 3, row, row +1,
- 0, 0, 0, 0 );
+ 0, 0, 0, 0 );
if(arr_ptr->help_txt != NULL)
{
gimp_help_set_help_data(button, arr_ptr->help_txt,NULL);
}
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (fontsel_open_cb),
- arr_ptr);
+ G_CALLBACK (fontsel_open_cb),
+ arr_ptr);
}
@@ -599,21 +599,21 @@
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel),
- arr_ptr->text_buf_ret);
+ arr_ptr->text_buf_ret);
gtk_widget_show (filesel);
g_signal_connect (G_OBJECT (filesel), "destroy",
- G_CALLBACK (filesel_close_cb),
- arr_ptr);
+ G_CALLBACK (filesel_close_cb),
+ arr_ptr);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (filesel_ok_cb),
- arr_ptr);
+ arr_ptr);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (filesel_close_cb),
- arr_ptr);
+ arr_ptr);
}
@@ -630,11 +630,11 @@
button = gtk_button_new_with_label ( "..." );
g_object_set_data (G_OBJECT (button), GAP_ARR_INTERFACE_PTR, (gpointer)arrint_ptr);
gtk_table_attach( GTK_TABLE(table), button, 2, 3, row, row +1,
- 0, 0, 0, 0 );
+ 0, 0, 0, 0 );
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (filesel_open_cb),
- arr_ptr);
+ G_CALLBACK (filesel_open_cb),
+ arr_ptr);
}
@@ -723,14 +723,14 @@
gtk_widget_show (hbox1);
spinbutton = gimp_spin_button_new (&adj, /* return value */
- initial_val,
- umin,
- umax,
- sstep,
- (gdouble) arr_ptr->pagestep,
- 0.0, /* page_size */
- 1.0, /* climb_rate */
- l_digits /* digits */
+ initial_val,
+ umin,
+ umax,
+ sstep,
+ (gdouble) arr_ptr->pagestep,
+ 0.0, /* page_size */
+ 1.0, /* climb_rate */
+ l_digits /* digits */
);
g_object_set_data (G_OBJECT (spinbutton), GAP_ARR_INTERFACE_PTR, (gpointer)arrint_ptr);
@@ -754,16 +754,16 @@
if(int_flag)
{
g_signal_connect
- (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_int_adjustment_update),
- &arr_ptr->int_ret);
+ (G_OBJECT (adj), "value_changed",
+ G_CALLBACK (gimp_int_adjustment_update),
+ &arr_ptr->int_ret);
}
else
{
g_signal_connect
- (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &arr_ptr->flt_ret);
+ (G_OBJECT (adj), "value_changed",
+ G_CALLBACK (gimp_double_adjustment_update),
+ &arr_ptr->flt_ret);
}
@@ -846,7 +846,7 @@
g_object_set_data (G_OBJECT (check_button), GAP_ARR_INTERFACE_PTR, (gpointer)arrint_ptr);
gtk_table_attach ( GTK_TABLE (table), check_button, 1, 3, row, row+1, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- arr_ptr->int_ret);
+ arr_ptr->int_ret);
if(arr_ptr->help_txt != NULL)
{
gimp_help_set_help_data(check_button, arr_ptr->help_txt,NULL);
@@ -1006,7 +1006,7 @@
gtk_table_attach ( GTK_TABLE (radio_table), radio_button, 0, 2, l_idy, l_idy+1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
if(l_radio_help_txt != NULL)
{
gimp_help_set_help_data(radio_button, l_radio_help_txt, NULL);
@@ -1015,8 +1015,8 @@
radio_ptr->radio_button = radio_button;
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (radio_update_cb),
- radio_ptr);
+ G_CALLBACK (radio_update_cb),
+ radio_ptr);
}
@@ -1077,7 +1077,7 @@
}
gtk_widget_show(entry);
g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK(text_entry_update_cb),
+ G_CALLBACK(text_entry_update_cb),
arr_ptr);
arr_ptr->text_entry = entry;
@@ -1093,7 +1093,7 @@
arr_ptr);
gtk_table_attach(GTK_TABLE(table), combo, l_col, l_col+1, row, row +1,
- GTK_FILL, GTK_FILL, 0, 0);
+ GTK_FILL, GTK_FILL, 0, 0);
if(arr_ptr->help_txt != NULL)
{
@@ -1156,23 +1156,23 @@
adj =
gimp_scale_entry_new( GTK_TABLE (table), 0, row, /* table col, row */
- title, /* label text */
- arr_ptr->scale_width, /* scalesize */
- arr_ptr->entry_width, /* entrysize */
- (gfloat)arr_ptr->flt_ret, /* init value */
- (gfloat)arr_ptr->flt_min, /* lower, */
- (gfloat)arr_ptr->flt_max, /* upper */
- arr_ptr->flt_step, /* step */
- arr_ptr->pagestep, /* pagestep */
- arr_ptr->flt_digits, /* digits */
- arr_ptr->constraint, /* constrain */
- umin, umax, /* lower, upper (unconstrained) */
- arr_ptr->help_txt, /* tooltip */
- NULL); /* privatetip */
+ title, /* label text */
+ arr_ptr->scale_width, /* scalesize */
+ arr_ptr->entry_width, /* entrysize */
+ (gfloat)arr_ptr->flt_ret, /* init value */
+ (gfloat)arr_ptr->flt_min, /* lower, */
+ (gfloat)arr_ptr->flt_max, /* upper */
+ arr_ptr->flt_step, /* step */
+ arr_ptr->pagestep, /* pagestep */
+ arr_ptr->flt_digits, /* digits */
+ arr_ptr->constraint, /* constrain */
+ umin, umax, /* lower, upper (unconstrained) */
+ arr_ptr->help_txt, /* tooltip */
+ NULL); /* privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &arr_ptr->flt_ret);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &arr_ptr->flt_ret);
arr_ptr->adjustment = adj;
}
@@ -1201,23 +1201,23 @@
adj =
gimp_scale_entry_new( GTK_TABLE (table), 0, row, /* table col, row */
- title, /* label text */
- arr_ptr->scale_width, /* scalesize */
- arr_ptr->entry_width, /* entrysize */
- (gfloat)arr_ptr->int_ret, /* init value */
- (gfloat)arr_ptr->int_min, /* lower, */
- (gfloat)arr_ptr->int_max, /* upper */
- arr_ptr->int_step, /* step */
- arr_ptr->pagestep, /* pagestep */
- 0, /* digits */
- arr_ptr->constraint, /* constrain */
- umin, umax, /* lower, upper (unconstrained) */
- arr_ptr->help_txt, /* tooltip */
- NULL); /* privatetip */
+ title, /* label text */
+ arr_ptr->scale_width, /* scalesize */
+ arr_ptr->entry_width, /* entrysize */
+ (gfloat)arr_ptr->int_ret, /* init value */
+ (gfloat)arr_ptr->int_min, /* lower, */
+ (gfloat)arr_ptr->int_max, /* upper */
+ arr_ptr->int_step, /* step */
+ arr_ptr->pagestep, /* pagestep */
+ 0, /* digits */
+ arr_ptr->constraint, /* constrain */
+ umin, umax, /* lower, upper (unconstrained) */
+ arr_ptr->help_txt, /* tooltip */
+ NULL); /* privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_int_adjustment_update),
- &arr_ptr->int_ret);
+ G_CALLBACK (gimp_int_adjustment_update),
+ &arr_ptr->int_ret);
arr_ptr->adjustment = adj;
}
@@ -1289,8 +1289,8 @@
// gtk_window_set_position (GTK_WINDOW (arrint_ptr->dlg), GTK_WIN_POS_MOUSE);
g_signal_connect (G_OBJECT (arrint_ptr->dlg), "destroy",
- G_CALLBACK (arr_close_callback),
- NULL);
+ G_CALLBACK (arr_close_callback),
+ NULL);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (arrint_ptr->dlg)->action_area), 2);
gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (arrint_ptr->dlg)->action_area), FALSE);
@@ -1368,10 +1368,10 @@
printf ("GAP_ARR_WGT_ACT_BUTTON not implemented yet, widget type ignored\n");
break;
case GAP_ARR_WGT_DEFAULT_BUTTON:
- arr_def_ptr = arr_ptr;
+ arr_def_ptr = arr_ptr;
break;
case GAP_ARR_WGT_HELP_BUTTON:
- arr_help_ptr = arr_ptr;
+ arr_help_ptr = arr_ptr;
break;
default: /* undefined widget type */
printf ("Unknown widget type %d ignored\n", arr_ptr->widget_type);
@@ -1398,8 +1398,8 @@
button, TRUE);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK(arr_help_callback),
- arr_help_ptr);
+ G_CALLBACK(arr_help_callback),
+ arr_help_ptr);
}
}
@@ -1430,8 +1430,8 @@
if( b_argv[l_idx].but_val == b_def_val ) gtk_widget_grab_default (button);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (but_array_callback),
- &b_argv[l_idx].but_val);
+ G_CALLBACK (but_array_callback),
+ &b_argv[l_idx].but_val);
}
@@ -1503,7 +1503,7 @@
}
return (arrint_ptr->run);
-} /* end gap_arr_std_dialog */
+} /* end gap_arr_std_dialog */
@@ -1582,7 +1582,7 @@
arr_ptr->radio_ret = 0;
arr_ptr->radio_argv = NULL;
arr_ptr->radio_help_argv = NULL;
- /* for GAP_ARR_WGT_OPT_ENTRY */
+ /* for GAP_ARR_WGT_OPT_ENTRY */
arr_ptr->text_buf_len = 0;
arr_ptr->text_buf_default = NULL;
arr_ptr->text_buf_ret = NULL;
@@ -1612,7 +1612,7 @@
}
-} /* end gap_arr_arg_init */
+} /* end gap_arr_arg_init */
/* ============================================================================
* simplified calls of gap_arr_std_dialog
@@ -1671,7 +1671,7 @@
b_def_val)
); /* ret value for window close */
-} /* end gap_arr_buttons_dialog */
+} /* end gap_arr_buttons_dialog */
@@ -1687,7 +1687,7 @@
long gap_arr_slider_dialog(const char *title, const char *frame,
const char *label, const char *tooltip,
long min, long max, long curr, long constraint,
- const char *help_id)
+ const char *help_id)
{
static GapArrArg argv[2];
gboolean l_rc;
@@ -1719,7 +1719,7 @@
{ return (long)(argv[0].int_ret);
}
else return -1;
-} /* end gap_arr_slider_dialog */
+} /* end gap_arr_slider_dialog */
/* ------------------------
@@ -1828,8 +1828,8 @@
l_rc =gap_arr_std_dialog ( _("GAP Question"),
_("File Overwrite Warning"),
- 1, argv,
- 2, l_argv, -1);
+ 1, argv,
+ 2, l_argv, -1);
g_free(l_msg);
if(l_rc < 0)
{
@@ -1941,12 +1941,12 @@
gint l_errno;
if(0 != gap_file_mkdir(l_dir, mode))
{
- l_errno = errno;
- g_message(_("ERROR: could not create directory:"
- "'%s'"
- "%s")
- ,l_dir
- ,g_strerror (l_errno) );
+ l_errno = errno;
+ g_message(_("ERROR: could not create directory:"
+ "'%s'"
+ "%s")
+ ,l_dir
+ ,g_strerror (l_errno) );
l_rc = FALSE;/* can not create vindex (invalid direcory path) */
}
}
@@ -1977,31 +1977,31 @@
{
if(!g_file_test(vindex_file, G_FILE_TEST_EXISTS))
{
- FILE *fp;
- gint l_errno;
+ FILE *fp;
+ gint l_errno;
/* try to pre-create an empty videoindex file
- * this is done to check file creation errors immediate.
- * without this pre-create check the error would be detected very late
- * (after minutes minutes on large videos)
- * when the whole video was scanned and the index
- * should be written to file.
- */
- fp = g_fopen(vindex_file, "wb");
- if(fp)
- {
+ * this is done to check file creation errors immediate.
+ * without this pre-create check the error would be detected very late
+ * (after minutes minutes on large videos)
+ * when the whole video was scanned and the index
+ * should be written to file.
+ */
+ fp = g_fopen(vindex_file, "wb");
+ if(fp)
+ {
fclose(fp); /* OK, empty file written */
- }
- else
- {
+ }
+ else
+ {
l_errno = errno;
g_message(_("ERROR: Failed to write videoindex\n"
- "file: '%s'\n"
- "%s")
- , vindex_file
- , g_strerror (l_errno));
- l_rc = FALSE;
- }
+ "file: '%s'\n"
+ "%s")
+ , vindex_file
+ , g_strerror (l_errno));
+ l_rc = FALSE;
+ }
}
}
@@ -2048,7 +2048,7 @@
l_videofile = NULL;
l_vindex_file = NULL;
value_string = gimp_gimprc_query("video-index-creation");
-
+
if(value_string)
{
if((*value_string == 'n')
@@ -2064,7 +2064,7 @@
return(l_rc);
}
-
+
l_rc = FALSE;
if(value_string)
{
@@ -2101,14 +2101,14 @@
}
l_info_msg = g_strdup_printf(_("Do you want to create a videoindex file ?\n"
- "\n"
- "If you want GIMP-GAP to create videoindex files automatically\n"
- "when recommanded, whithout showing up this dialog again\n"
- "then you should add the following line to\n"
- "your gimprc file:\n"
- "%s")
- , "(video-index-creation \"yes\")"
- );
+ "\n"
+ "If you want GIMP-GAP to create videoindex files automatically\n"
+ "when recommanded, whithout showing up this dialog again\n"
+ "then you should add the following line to\n"
+ "your gimprc file:\n"
+ "%s")
+ , "(video-index-creation \"yes\")"
+ );
l_ii = 0;
gap_arr_arg_init(&argv[l_ii], GAP_ARR_WGT_LABEL_LEFT);
argv[l_ii].label_txt = " ";
Modified: trunk/gap/gap_arr_dialog.h
==============================================================================
--- trunk/gap/gap_arr_dialog.h (original)
+++ trunk/gap/gap_arr_dialog.h Sun Apr 5 06:47:07 2009
@@ -179,7 +179,7 @@
const char *label_txt,
const char *tooltip_txt,
long min, long max, long curr, long constraint,
- const char *help_id);
+ const char *help_id);
Modified: trunk/gap/gap_audio_extract.c
==============================================================================
--- trunk/gap/gap_audio_extract.c (original)
+++ trunk/gap/gap_audio_extract.c Sun Apr 5 06:47:07 2009
@@ -442,12 +442,12 @@
if(extracted_frames > 1)
{
l_samples_to_read = (gdouble)(extracted_frames +1.0)
- / (gdouble)gvahand->framerate
+ / (gdouble)gvahand->framerate
* (gdouble)gvahand->samplerate;
if(gap_debug)
{
printf("A: l_samples_to_read %.0f extracted_frames:%d\n"
- , (float)l_samples_to_read
+ , (float)l_samples_to_read
,(int)extracted_frames
);
}
@@ -455,12 +455,12 @@
else
{
l_samples_to_read = (gdouble)(expected_frames +1.0)
- / (gdouble)gvahand->framerate
+ / (gdouble)gvahand->framerate
* (gdouble)gvahand->samplerate;
if(gap_debug)
{
printf("B: l_samples_to_read %.0f extracted_frames:%d expected_frames:%d\n"
- ,(float)l_samples_to_read
+ ,(float)l_samples_to_read
,(int)extracted_frames
,(int)expected_frames
);
Modified: trunk/gap/gap_audio_wav.c
==============================================================================
--- trunk/gap/gap_audio_wav.c (original)
+++ trunk/gap/gap_audio_wav.c Sun Apr 5 06:47:07 2009
@@ -99,7 +99,7 @@
if(l_errno != 0)
{
g_message(_("Problem while writing audiofile: %s")
- ,g_strerror (l_errno) );
+ ,g_strerror (l_errno) );
printf("gap_audio_wav errno:%d %s\n", l_errno, g_strerror (l_errno));
exit (-1);
}
@@ -219,7 +219,7 @@
{
printf("p_wav_open_seek_data_private file:%s:\n file does not exist or size 0\n"
, filename
- );
+ );
}
/* stat error (file does not exist) */
return(NULL);
@@ -231,7 +231,7 @@
{
printf("p_wav_open_seek_data_private file: %s\n file size < 48 byte\n"
, filename
- );
+ );
}
return(NULL); /* too short for WAVE file */
}
@@ -243,7 +243,7 @@
{
printf("p_wav_open_seek_data_private file: %s\n open read binary failed\n"
, filename
- );
+ );
}
return(NULL);
}
@@ -281,7 +281,7 @@
{
printf("check failed on file: %s\n The RIFFWAVEfmt header string was not found\n"
, filename
- );
+ );
}
fclose (fp);
return(NULL);
@@ -310,10 +310,10 @@
{
if(gap_debug)
{
- printf("p_wav_open_seek_data_private file: %s\n l_len_to_read: %d not plausible\n"
+ printf("p_wav_open_seek_data_private file: %s\n l_len_to_read: %d not plausible\n"
, filename
- , (int)l_len_to_read
- );
+ , (int)l_len_to_read
+ );
}
break; /* chunk length contains nonsens, give up searching for data chunk */
}
@@ -374,7 +374,7 @@
{
printf ("p_audio_wav_file_check: open read or HDR and data chunk test failed on '%s'\n"
, audfile
- );
+ );
}
return(l_rc);
}
@@ -482,10 +482,10 @@
static t_Playlist_Check_Retcodes
p_check_for_valid_playlist(const char *audfile, long *sample_rate, long *channels
, long *bytes_per_sample, long *bits, long *samples
- , long *all_playlist_references
- , long *valid_playlist_references
- , long desired_samplerate
- )
+ , long *all_playlist_references
+ , long *valid_playlist_references
+ , long desired_samplerate
+ )
{
t_Playlist_Check_Retcodes l_retval;
long l_bytes_per_sample = 4;
@@ -522,7 +522,7 @@
{
if((l_buf[0] == '#') || (l_buf[0] == '\n') || (l_buf[0] == '\0'))
{
- continue; /* skip comment lines, and empty lines */
+ continue; /* skip comment lines, and empty lines */
}
l_buf[sizeof(l_buf) -1] = '\0'; /* make sure we have a terminated string */
@@ -534,101 +534,101 @@
if(referred_wavfile)
- {
- g_free(referred_wavfile);
- }
+ {
+ g_free(referred_wavfile);
+ }
referred_wavfile = gap_file_make_abspath_filename(&l_buf[0], audfile);
- if(gap_debug)
- {
- printf("p_check_for_valid_playlist: checking reference file: %s\n", referred_wavfile);
- }
+ if(gap_debug)
+ {
+ printf("p_check_for_valid_playlist: checking reference file: %s\n", referred_wavfile);
+ }
- l_rc = gap_audio_wav_file_check(referred_wavfile
+ l_rc = gap_audio_wav_file_check(referred_wavfile
, &l_sample_rate
, &l_channels
, &l_bytes_per_sample
, &l_bits
, &l_samples
);
- if(gap_debug)
- {
- printf("REF-file: %s bits:%d (expected:%d) samplerate:%d (expected: %d) l_rc: %d\n"
- ,referred_wavfile
- ,(int)l_bits
- ,(int)16
- ,(int)l_sample_rate
- ,(int)desired_samplerate
- ,(int)l_rc
- );
- }
+ if(gap_debug)
+ {
+ printf("REF-file: %s bits:%d (expected:%d) samplerate:%d (expected: %d) l_rc: %d\n"
+ ,referred_wavfile
+ ,(int)l_bits
+ ,(int)16
+ ,(int)l_sample_rate
+ ,(int)desired_samplerate
+ ,(int)l_rc
+ );
+ }
if(l_rc == 0)
{
- (*all_playlist_references)++;
+ (*all_playlist_references)++;
- /* use audio informations from the 1.st valid referenced file for output
- * (or pick information of any other referenced audiofile
- * if we have no matching audio file reference)
- */
- if(ii == 0)
- {
- *sample_rate = l_sample_rate;
- *channels = l_channels;
- *bytes_per_sample = l_bytes_per_sample;
- *bits = l_bits;
- *samples = l_samples;
- }
+ /* use audio informations from the 1.st valid referenced file for output
+ * (or pick information of any other referenced audiofile
+ * if we have no matching audio file reference)
+ */
+ if(ii == 0)
+ {
+ *sample_rate = l_sample_rate;
+ *channels = l_channels;
+ *bytes_per_sample = l_bytes_per_sample;
+ *bits = l_bits;
+ *samples = l_samples;
+ }
if((l_bits == 16)
- && (l_sample_rate == desired_samplerate))
- {
- /* we have found at least one reference to an audiofile
- * with matching bits and samplerate
- * therefore we consider audfile as valid playlist file
- */
+ && (l_sample_rate == desired_samplerate))
+ {
+ /* we have found at least one reference to an audiofile
+ * with matching bits and samplerate
+ * therefore we consider audfile as valid playlist file
+ */
ii++;
l_retval = IS_VALID_PLAYLIST;
- }
- else
- {
- /* the file seems to be a play list
- * but the referenced file does not match desired parameters
- */
- if(l_retval != IS_VALID_PLAYLIST)
- {
+ }
+ else
+ {
+ /* the file seems to be a play list
+ * but the referenced file does not match desired parameters
+ */
+ if(l_retval != IS_VALID_PLAYLIST)
+ {
l_retval = IS_ANY_PLAYLIST;
- }
- break;
- }
- }
- else
- {
+ }
+ break;
+ }
+ }
+ else
+ {
/* report unexpected content as warning, but only when
- * we have already identified that file as playlist
- * (otherwise checks on audiofiles would also
- * report such a warning that would confusing)
- */
- if(ii > 0)
- {
+ * we have already identified that file as playlist
+ * (otherwise checks on audiofiles would also
+ * report such a warning that would confusing)
+ */
+ if(ii > 0)
+ {
g_message(_("The file: %s\n"
- "has unexpect content that will be ignored.\n"
- "You should specify an audio file in RIFF WAVE fileformat,\n"
- "or a textfile containing filenames of such audio files")
- , audfile
- );
- }
- break;
- }
+ "has unexpect content that will be ignored.\n"
+ "You should specify an audio file in RIFF WAVE fileformat,\n"
+ "or a textfile containing filenames of such audio files")
+ , audfile
+ );
+ }
+ break;
+ }
}
else
{
g_message(_("The file: %s\n"
- "contains too many audio-input tracks\n"
- "(only %d tracks are used, the rest are ignored).")
- , audfile
- , (int) MAX_AUDIO_STREAMS
- );
- break;
+ "contains too many audio-input tracks\n"
+ "(only %d tracks are used, the rest are ignored).")
+ , audfile
+ , (int) MAX_AUDIO_STREAMS
+ );
+ break;
}
l_buf[0] = '\0';
}
@@ -639,12 +639,12 @@
if(l_retval == IS_ANY_PLAYLIST)
{
g_message(_("The file: %s\n"
- "is an audio playlist, but contains references to audiofiles that\n"
- "do not match the desired sample rate of %d Hz\n"
- "or do not have 16 bits per sample")
- , audfile
- , (int)desired_samplerate
- );
+ "is an audio playlist, but contains references to audiofiles that\n"
+ "do not match the desired sample rate of %d Hz\n"
+ "or do not have 16 bits per sample")
+ , audfile
+ , (int)desired_samplerate
+ );
}
if(referred_wavfile)
@@ -671,21 +671,21 @@
int
gap_audio_playlist_wav_file_check(const char *audfile, long *sample_rate, long *channels
, long *bytes_per_sample, long *bits, long *samples
- , long *all_playlist_references
- , long *valid_playlist_references
- , long desired_samplerate
- )
+ , long *all_playlist_references
+ , long *valid_playlist_references
+ , long desired_samplerate
+ )
{
int l_rc;
/* check for WAV file, and get audio informations */
l_rc = gap_audio_wav_file_check(audfile
, sample_rate
- , channels
+ , channels
, bytes_per_sample
- , bits
- , samples
- );
+ , bits
+ , samples
+ );
if (l_rc ==0)
{
@@ -697,36 +697,36 @@
l_rc_playlistcheck = p_check_for_valid_playlist(audfile
, sample_rate
- , channels
- , bytes_per_sample
- , bits
- , samples
- , all_playlist_references
- , valid_playlist_references
- , desired_samplerate
- );
+ , channels
+ , bytes_per_sample
+ , bits
+ , samples
+ , all_playlist_references
+ , valid_playlist_references
+ , desired_samplerate
+ );
switch(l_rc_playlistcheck)
{
case IS_VALID_PLAYLIST:
- if(gap_debug)
- {
- printf(": The file %s is a valid playlist\n", audfile);
- }
- return 0;
- break;
+ if(gap_debug)
+ {
+ printf(": The file %s is a valid playlist\n", audfile);
+ }
+ return 0;
+ break;
case IS_ANY_PLAYLIST:
- if(gap_debug)
- {
- printf(": The file %s is a non matching playlist\n", audfile);
- }
- return -2;
- break;
+ if(gap_debug)
+ {
+ printf(": The file %s is a non matching playlist\n", audfile);
+ }
+ return -2;
+ break;
default:
- if(gap_debug)
- {
- printf(": The file %s is not a playlist\n", audfile);
- }
- break;
+ if(gap_debug)
+ {
+ printf(": The file %s is not a playlist\n", audfile);
+ }
+ break;
}
}
Modified: trunk/gap/gap_audio_wav.h
==============================================================================
--- trunk/gap/gap_audio_wav.h (original)
+++ trunk/gap/gap_audio_wav.h Sun Apr 5 06:47:07 2009
@@ -45,9 +45,9 @@
int gap_audio_playlist_wav_file_check(const char *audfile, long *sample_rate, long *channels
, long *bytes_per_sample, long *bits, long *samples
- , long *all_playlist_references
- , long *valid_playlist_references
- , long desired_samplerate
- );
+ , long *all_playlist_references
+ , long *valid_playlist_references
+ , long desired_samplerate
+ );
#endif
Modified: trunk/gap/gap_base_ops.c
==============================================================================
--- trunk/gap/gap_base_ops.c (original)
+++ trunk/gap/gap_base_ops.c Sun Apr 5 06:47:07 2009
@@ -471,7 +471,7 @@
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld") ,l_hi, l_lo);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
l_lo++;
@@ -603,7 +603,7 @@
gchar *tmp_errtxt;
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), l_lo, l_hi);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
l_lo--;
@@ -696,21 +696,21 @@
{
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), dest, l_tmp_nr);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
if(0 != gap_lib_rename_frame(ainfo_ptr, ainfo_ptr->curr_frame_nr, dest))
{
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), ainfo_ptr->curr_frame_nr, dest);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
if(0 != gap_lib_rename_frame(ainfo_ptr, l_tmp_nr, ainfo_ptr->curr_frame_nr))
{
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), l_tmp_nr, ainfo_ptr->curr_frame_nr);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
@@ -798,7 +798,7 @@
{
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), l_lo, l_hi);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
if(ainfo_ptr->run_mode == GIMP_RUN_INTERACTIVE)
@@ -820,7 +820,7 @@
{
tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), l_lo, l_hi);
gap_arr_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
- g_free(tmp_errtxt);
+ g_free(tmp_errtxt);
return -1;
}
if(ainfo_ptr->run_mode == GIMP_RUN_INTERACTIVE)
@@ -973,7 +973,7 @@
}
return(rc);
-} /* end gap_base_next */
+} /* end gap_base_next */
gint32
gap_base_prev(GimpRunMode run_mode, gint32 image_id)
@@ -992,7 +992,7 @@
}
return(rc);
-} /* end gap_base_prev */
+} /* end gap_base_prev */
/* ============================================================================
* gap_base_first gap_base_last
@@ -1021,7 +1021,7 @@
}
return(rc);
-} /* end gap_base_first */
+} /* end gap_base_first */
gint32
gap_base_last(GimpRunMode run_mode, gint32 image_id)
@@ -1042,7 +1042,7 @@
}
return(rc);
-} /* end gap_base_last */
+} /* end gap_base_last */
/* ============================================================================
* gap_base_goto
@@ -1075,24 +1075,24 @@
if(run_mode == GIMP_RUN_INTERACTIVE)
{
l_title = g_strdup_printf (_("Go To Frame (%ld/%ld)")
- , ainfo_ptr->curr_frame_nr
- , ainfo_ptr->frame_cnt);
+ , ainfo_ptr->curr_frame_nr
+ , ainfo_ptr->frame_cnt);
l_hline = g_strdup_printf (_("Destination Frame Number (%ld - %ld)")
- , ainfo_ptr->first_frame_nr
- , ainfo_ptr->last_frame_nr);
+ , ainfo_ptr->first_frame_nr
+ , ainfo_ptr->last_frame_nr);
l_dest = gap_arr_slider_dialog(l_title, l_hline,
- _("Number:")
- ,_("Go to this frame number") /* tooltip */
+ _("Number:")
+ ,_("Go to this frame number") /* tooltip */
, ainfo_ptr->first_frame_nr
, ainfo_ptr->last_frame_nr
, ainfo_ptr->curr_frame_nr
, TRUE
- , NULL /* help_id NULL: has no help button */
- );
+ , NULL /* help_id NULL: has no help button */
+ );
- g_free (l_title);
- g_free (l_hline);
+ g_free (l_title);
+ g_free (l_hline);
if(l_dest < 0)
{
@@ -1120,7 +1120,7 @@
}
return(rc);
-} /* end gap_base_goto */
+} /* end gap_base_goto */
/* ------------------------
@@ -1176,10 +1176,10 @@
if(run_mode == GIMP_RUN_INTERACTIVE)
{
l_title = g_strdup_printf (_("Delete Frames (%ld/%ld)")
- , ainfo_ptr->curr_frame_nr
- , ainfo_ptr->frame_cnt);
+ , ainfo_ptr->curr_frame_nr
+ , ainfo_ptr->frame_cnt);
l_hline = g_strdup_printf (_("Delete frames from %ld to (number)")
- , ainfo_ptr->curr_frame_nr);
+ , ainfo_ptr->curr_frame_nr);
l_max = ainfo_ptr->last_frame_nr;
if(l_max == ainfo_ptr->curr_frame_nr)
@@ -1192,20 +1192,20 @@
}
l_tooltip = g_strdup_printf(_("Delete frames starting at current number %d "
- "up to this number (inclusive)")
- , (int)ainfo_ptr->curr_frame_nr );
+ "up to this number (inclusive)")
+ , (int)ainfo_ptr->curr_frame_nr );
l_cnt = gap_arr_slider_dialog(l_title, l_hline
- , _("Number:")
- , l_tooltip
+ , _("Number:")
+ , l_tooltip
, ainfo_ptr->curr_frame_nr
, l_max
, ainfo_ptr->curr_frame_nr
, TRUE
- , GAP_HELP_ID_DELETE);
+ , GAP_HELP_ID_DELETE);
- g_free (l_tooltip);
- g_free (l_title);
- g_free (l_hline);
+ g_free (l_tooltip);
+ g_free (l_title);
+ g_free (l_hline);
if(l_cnt >= 0)
{
@@ -1243,7 +1243,7 @@
return(rc);
-} /* end gap_base_del */
+} /* end gap_base_del */
/* ------------------------
@@ -1479,8 +1479,8 @@
gchar *l_title;
l_title = g_strdup_printf (_("Duplicate Frames (%ld/%ld)")
- , ainfo_ptr->curr_frame_nr
- , ainfo_ptr->frame_cnt);
+ , ainfo_ptr->curr_frame_nr
+ , ainfo_ptr->frame_cnt);
gap_arr_arg_init(&argv[0], GAP_ARR_WGT_INT_PAIR);
argv[0].label_txt = _("From Frame:");
@@ -1525,7 +1525,7 @@
}
-} /* end p_dup_dialog */
+} /* end p_dup_dialog */
/* ============================================================================
@@ -1551,21 +1551,21 @@
{
if(0 != gap_lib_chk_framechange(ainfo_ptr)) { l_cnt = -1; }
else
- {
- if(*ainfo_ptr->extension == '\0' && ainfo_ptr->frame_cnt == 0)
- {
- /* duplicate was called on a frame without extension and without framenumer in its name
- * (typical for new created images named like 'Untitled' (or 'Unbenannt' for german GUI or .. in other languages)
- */
- gap_arr_msg_win(ainfo_ptr->run_mode,
- _("Operation cancelled.\n"
- "GAP video plug-ins only work with filenames\n"
- "that end in numbers like _000001.xcf.\n"
- "==> Rename your image, then try again."));
- return -1;
- }
- l_cnt = p_dup_dialog(ainfo_ptr, &l_from, &l_to);
- }
+ {
+ if(*ainfo_ptr->extension == '\0' && ainfo_ptr->frame_cnt == 0)
+ {
+ /* duplicate was called on a frame without extension and without framenumer in its name
+ * (typical for new created images named like 'Untitled' (or 'Unbenannt' for german GUI or .. in other languages)
+ */
+ gap_arr_msg_win(ainfo_ptr->run_mode,
+ _("Operation cancelled.\n"
+ "GAP video plug-ins only work with filenames\n"
+ "that end in numbers like _000001.xcf.\n"
+ "==> Rename your image, then try again."));
+ return -1;
+ }
+ l_cnt = p_dup_dialog(ainfo_ptr, &l_from, &l_to);
+ }
if((0 != gap_lib_chk_framechange(ainfo_ptr)) || (l_cnt < 1))
{
@@ -1593,7 +1593,7 @@
return(rc);
-} /* end gap_base_dup */
+} /* end gap_base_dup */
/* ============================================================================
@@ -1632,22 +1632,22 @@
l_initial = ainfo_ptr->last_frame_nr;
}
l_title = g_strdup_printf (_("Exchange Current Frame (%ld)")
- , ainfo_ptr->curr_frame_nr);
+ , ainfo_ptr->curr_frame_nr);
l_tooltip = g_strdup_printf(_("Exchange the current frame %d "
- "with the frame that has the number entered here")
- , (int)ainfo_ptr->curr_frame_nr );
+ "with the frame that has the number entered here")
+ , (int)ainfo_ptr->curr_frame_nr );
l_dest = gap_arr_slider_dialog(l_title,
- _("Exchange with Frame"),
- _("Number:")
- , l_tooltip
- , ainfo_ptr->first_frame_nr
- , ainfo_ptr->last_frame_nr
- , l_initial
- , TRUE
- , GAP_HELP_ID_EXCHANGE);
- g_free (l_tooltip);
- g_free (l_title);
+ _("Exchange with Frame"),
+ _("Number:")
+ , l_tooltip
+ , ainfo_ptr->first_frame_nr
+ , ainfo_ptr->last_frame_nr
+ , l_initial
+ , TRUE
+ , GAP_HELP_ID_EXCHANGE);
+ g_free (l_tooltip);
+ g_free (l_title);
if(0 != gap_lib_chk_framechange(ainfo_ptr))
{
@@ -1671,7 +1671,7 @@
}
return(rc);
-} /* end gap_base_exchg */
+} /* end gap_base_exchg */
/* ============================================================================
* p_shift_dialog
@@ -1685,8 +1685,8 @@
gchar *l_title;
l_title = g_strdup_printf (_("Frame Sequence Shift (%ld/%ld)")
- , ainfo_ptr->curr_frame_nr
- , ainfo_ptr->frame_cnt);
+ , ainfo_ptr->curr_frame_nr
+ , ainfo_ptr->frame_cnt);
gap_arr_arg_init(&argv[0], GAP_ARR_WGT_INT_PAIR);
argv[0].label_txt = _("From Frame:");
@@ -1906,7 +1906,7 @@
gchar *l_title;
l_title = g_strdup_printf (_("Renumber Frames (%ld)")
- , ainfo_ptr->frame_cnt);
+ , ainfo_ptr->frame_cnt);
gap_arr_arg_init(&argv[0], GAP_ARR_WGT_INT_PAIR);
argv[0].label_txt = _("First Frame Number:");
@@ -1941,7 +1941,7 @@
return -1;
}
-} /* end p_renumber_dialog */
+} /* end p_renumber_dialog */
/* ------------------------
@@ -2143,9 +2143,9 @@
{
if(0 != gap_lib_chk_framechange(ainfo_ptr)) { l_cnt = -1; }
else
- {
- l_cnt = p_renumber_dialog(ainfo_ptr, &l_start_frame_nr, &l_digits);
- }
+ {
+ l_cnt = p_renumber_dialog(ainfo_ptr, &l_start_frame_nr, &l_digits);
+ }
if(0 != gap_lib_chk_framechange(ainfo_ptr))
{
@@ -2176,4 +2176,4 @@
}
return(rc);
-} /* end gap_base_renumber */
+} /* end gap_base_renumber */
Modified: trunk/gap/gap_bluebox.c
==============================================================================
--- trunk/gap/gap_bluebox.c (original)
+++ trunk/gap/gap_bluebox.c Sun Apr 5 06:47:07 2009
@@ -250,12 +250,12 @@
dlg = gimp_dialog_new (_("Bluebox"), GAP_BLUEBOX_PLUGIN_NAME,
NULL, 0,
- gimp_standard_help_func, GAP_BLUEBOX_HELP_ID,
+ gimp_standard_help_func, GAP_BLUEBOX_HELP_ID,
- GIMP_STOCK_RESET, GAP_BLUEBOX_RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL);
+ GIMP_STOCK_RESET, GAP_BLUEBOX_RESPONSE_RESET,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
bbp->shell = dlg;
@@ -292,11 +292,11 @@
/* the keycolor button */
button = gimp_color_button_new (_("Bluebox Color Picker"),
- 40, 20, /* WIDTH, HEIGHT, */
- &bbp->vals.keycolor,
- GIMP_COLOR_AREA_FLAT);
+ 40, 20, /* WIDTH, HEIGHT, */
+ &bbp->vals.keycolor,
+ GIMP_COLOR_AREA_FLAT);
gtk_table_attach (GTK_TABLE (table), button, 1, 3, row, row+1,
- GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0) ;
+ GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0) ;
gtk_widget_show (button);
g_object_set_data(G_OBJECT(button), "bbp", bbp);
bbp->keycolor_button = button;
@@ -315,16 +315,16 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Alpha Tolerance:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.tolerance,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lower/upper unconstrained */
- _("Sharp pixel selection by color with 0.0. "
- "Values greater than 0 give the selection more or less variable alpha value, "
- "depending on disparity with the key color."), NULL);
+ _("Alpha Tolerance:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.tolerance,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lower/upper unconstrained */
+ _("Sharp pixel selection by color with 0.0. "
+ "Values greater than 0 give the selection more or less variable alpha value, "
+ "depending on disparity with the key color."), NULL);
bbp->tolerance_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -334,15 +334,15 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Source Alpha:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.source_alpha,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Affect only pixels with alpha >= source alpha "
- "where 1.0 is full opaque"), NULL);
+ _("Source Alpha:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.source_alpha,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Affect only pixels with alpha >= source alpha "
+ "where 1.0 is full opaque"), NULL);
bbp->source_alpha_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -352,15 +352,15 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Target Alpha:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.target_alpha,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Set alpha of affected pixel to target alpha "
- "where 0.0 is full transparent"), NULL);
+ _("Target Alpha:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.target_alpha,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Set alpha of affected pixel to target alpha "
+ "where 0.0 is full transparent"), NULL);
bbp->target_alpha_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -380,7 +380,7 @@
check_button = gtk_check_button_new_with_label (" ");
gtk_table_attach ( GTK_TABLE (table), check_button, 1, 3, row, row+1, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- bbp->vals.feather_edges);
+ bbp->vals.feather_edges);
gimp_help_set_help_data(check_button, _("ON: Feather edges using feather radius"), NULL);
gtk_widget_show(check_button);
bbp->feather_edges_toggle = check_button;
@@ -391,14 +391,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Feather Radius:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.feather_radius,
- 0.0, 100.0, /* lower/upper */
- 1.0, 10.0, /* step, page */
- 1, /* digits */
- TRUE, /* constrain */
- 0.0, 100.0, /* lowr/upper unconstrained */
- _("Feather radius for smoothing the alpha channel"), NULL);
+ _("Feather Radius:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.feather_radius,
+ 0.0, 100.0, /* lower/upper */
+ 1.0, 10.0, /* step, page */
+ 1, /* digits */
+ TRUE, /* constrain */
+ 0.0, 100.0, /* lowr/upper unconstrained */
+ _("Feather radius for smoothing the alpha channel"), NULL);
bbp->feather_radius_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -408,14 +408,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Shrink/Grow:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.grow,
- -20.0, 20.0, /* lower/upper */
- 1.0, 10.0, /* step, page */
- 0, /* digits */
- TRUE, /* constrain */
- -20.0, 20.0, /* lowr/upper unconstrained */
- _("Grow selection in pixels (use negative values for shrink)"), NULL);
+ _("Shrink/Grow:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.grow,
+ -20.0, 20.0, /* lower/upper */
+ 1.0, 10.0, /* step, page */
+ 0, /* digits */
+ TRUE, /* constrain */
+ -20.0, 20.0, /* lowr/upper unconstrained */
+ _("Grow selection in pixels (use negative values for shrink)"), NULL);
bbp->grow_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -434,7 +434,7 @@
check_button = gtk_check_button_new_with_label (" ");
gtk_table_attach ( GTK_TABLE (table), check_button, 1, 2, row, row+1, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- bbp->instant_preview);
+ bbp->instant_preview);
gimp_help_set_help_data(check_button, _("ON: Keep preview image up to date"), NULL);
gtk_widget_show(check_button);
bbp->instant_preview_toggle = check_button;
@@ -455,14 +455,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->master_table), 0, row++,
- _("Previewsize:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->pv_size_percent,
- 5.0, 100.0, /* lower/upper */
- 1.0, 10.0, /* step, page */
- 1, /* digits */
- TRUE, /* constrain */
- 5.0, 100.0, /* lowr/upper unconstrained */
- _("Size of the preview image in percent of the original"), NULL);
+ _("Previewsize:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->pv_size_percent,
+ 5.0, 100.0, /* lower/upper */
+ 1.0, 10.0, /* step, page */
+ 1, /* digits */
+ TRUE, /* constrain */
+ 5.0, 100.0, /* lowr/upper unconstrained */
+ _("Size of the preview image in percent of the original"), NULL);
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
G_CALLBACK (p_gdouble_adjustment_callback),
@@ -533,24 +533,24 @@
gimp_color_button_set_color ((GimpColorButton *)bbp->keycolor_button, &bbp->vals.keycolor);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->feather_edges_toggle)
- ,bbp->vals.feather_edges);
+ ,bbp->vals.feather_edges);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->instant_preview_toggle)
- ,bbp->instant_preview);
+ ,bbp->instant_preview);
radio_active = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_RGB);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->thres_rgb_toggle)
- ,radio_active);
+ ,radio_active);
radio_active = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_HSV);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->thres_hsv_toggle)
- ,radio_active);
+ ,radio_active);
radio_active = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_VAL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->thres_val_toggle)
- ,radio_active);
+ ,radio_active);
radio_active = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_ALL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bbp->thres_all_toggle)
- ,radio_active);
+ ,radio_active);
}
} /* end p_reset_callback */
@@ -606,10 +606,10 @@
bbp->thres_all_toggle = NULL;
/* p_quit_callback is the signal handler for the "destroy"
- * signal of the shell window.
- * the gtk_widget_destroy call will immediate reenter this procedure.
- * (for this reason the bbp->shell is set to NULL
- * before the gtk_widget_destroy call)
+ * signal of the shell window.
+ * the gtk_widget_destroy call will immediate reenter this procedure.
+ * (for this reason the bbp->shell is set to NULL
+ * before the gtk_widget_destroy call)
*/
gtk_widget_destroy(l_shell);
}
@@ -875,13 +875,13 @@
l_radio_pressed = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_RGB);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Apply thresholds in the RGB colormodel"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_radio_thres_RGB_callback),
- bbp);
+ G_CALLBACK (p_radio_thres_RGB_callback),
+ bbp);
l_idx = 1;
@@ -895,13 +895,13 @@
l_radio_pressed = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_HSV);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Apply thresholds in the HSV colormodel"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_radio_thres_HSV_callback),
- bbp);
+ G_CALLBACK (p_radio_thres_HSV_callback),
+ bbp);
@@ -916,13 +916,13 @@
l_radio_pressed = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_VAL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Use single threshold value"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_radio_thres_VAL_callback),
- bbp);
+ G_CALLBACK (p_radio_thres_VAL_callback),
+ bbp);
l_idx = 3;
@@ -936,13 +936,13 @@
l_radio_pressed = (bbp->vals.thres_mode == GAP_BLUBOX_THRES_VAL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Use both HSV and RGB threshold values"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_radio_thres_ALL_callback),
- bbp);
+ G_CALLBACK (p_radio_thres_ALL_callback),
+ bbp);
/* attach radio_table */
@@ -963,14 +963,14 @@
GtkObject *adj;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold R:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_r,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for red channel"), NULL);
+ _("Threshold R:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_r,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for red channel"), NULL);
bbp->thres_r_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -980,14 +980,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold G:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_g,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for green channel"), NULL);
+ _("Threshold G:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_g,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for green channel"), NULL);
bbp->thres_g_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -998,14 +998,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold B:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_b,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for blue channel"), NULL);
+ _("Threshold B:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_b,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for blue channel"), NULL);
bbp->thres_b_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -1025,14 +1025,14 @@
GtkObject *adj;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold H:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_h,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for hue"), NULL);
+ _("Threshold H:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_h,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for hue"), NULL);
bbp->thres_h_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -1042,14 +1042,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold S:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_s,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for saturation"), NULL);
+ _("Threshold S:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_s,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for saturation"), NULL);
bbp->thres_s_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -1060,14 +1060,14 @@
row++;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row,
- _("Threshold V:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres_v,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Threshold for value"), NULL);
+ _("Threshold V:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres_v,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Threshold for value"), NULL);
bbp->thres_v_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -1089,14 +1089,14 @@
row = 0;
adj = gimp_scale_entry_new (GTK_TABLE (bbp->thres_table), 0, row++,
- _("Threshold:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
- bbp->vals.thres,
- 0.0, 1.0, /* lower/upper */
- 0.01, 0.1, /* step, page */
- 3, /* digits */
- TRUE, /* constrain */
- 0.0, 1.0, /* lowr/upper unconstrained */
- _("Common color threshold"), NULL);
+ _("Threshold:"), SCALE_WIDTH, SPIN_BUTTON_WIDTH,
+ bbp->vals.thres,
+ 0.0, 1.0, /* lower/upper */
+ 0.01, 0.1, /* step, page */
+ 3, /* digits */
+ TRUE, /* constrain */
+ 0.0, 1.0, /* lowr/upper unconstrained */
+ _("Common color threshold"), NULL);
bbp->thres_adj = adj;
g_object_set_data(G_OBJECT(adj), "bbp", bbp);
g_signal_connect (adj, "value_changed",
@@ -1149,7 +1149,7 @@
gtk_table_attach (GTK_TABLE (bbp->master_table), bbp->thres_table, 0, 3
, bbp->thres_table_attach_row, bbp->thres_table_attach_row +1,
- GTK_FILL, GTK_SHRINK, 0, 0) ;
+ GTK_FILL, GTK_SHRINK, 0, 0) ;
gtk_widget_show(bbp->thres_table);
return bbp->thres_table;
@@ -1181,7 +1181,7 @@
{
bbp->instant_timertag = (gint32) g_timeout_add(INSTANT_TIMERINTERVAL_MILLISEC,
(GtkFunction)p_instant_timer_callback
- , bbp);
+ , bbp);
}
} /* end p_install_timer */
@@ -1234,7 +1234,7 @@
*/
static inline gdouble
p_check_RGB_thres (GimpRGB *src,
- GapBlueboxGlobalParams *bbp)
+ GapBlueboxGlobalParams *bbp)
{
gdouble l_diff_r;
gdouble l_diff_g;
@@ -1281,7 +1281,7 @@
*/
static inline gdouble
p_check_HSV_thres (GimpRGB *src,
- GapBlueboxGlobalParams *bbp)
+ GapBlueboxGlobalParams *bbp)
{
gdouble l_diff_h;
gdouble l_diff_s;
@@ -1332,7 +1332,7 @@
*/
static inline gdouble
p_check_VAL_thres (GimpRGB *src,
- GapBlueboxGlobalParams *bbp)
+ GapBlueboxGlobalParams *bbp)
{
gdouble l_maxdiff;
@@ -1362,7 +1362,7 @@
*/
static inline void
p_pixel_render_alpha (GimpRGB *src,
- GapBlueboxGlobalParams *bbp)
+ GapBlueboxGlobalParams *bbp)
{
if(src->a >= bbp->vals.source_alpha)
{
@@ -1543,27 +1543,27 @@
|| (l_height != gimp_image_height(bbp->pv_image_id)))
{
/* check if we can reuse the previw image
- * (that was built in a previus call)
- */
- if((bbp->run_flag)
- || (bbp->pv_master_layer_id < 0))
- {
+ * (that was built in a previus call)
+ */
+ if((bbp->run_flag)
+ || (bbp->pv_master_layer_id < 0))
+ {
replace_pv_image = TRUE;
- }
- else
- {
- if(l_width > gimp_image_width(bbp->pv_image_id))
- {
- /* must force recreate the master copy for quality reasons */
- if(bbp->pv_master_layer_id >= 0)
- {
- gimp_image_remove_layer(bbp->pv_image_id, bbp->pv_master_layer_id);
+ }
+ else
+ {
+ if(l_width > gimp_image_width(bbp->pv_image_id))
+ {
+ /* must force recreate the master copy for quality reasons */
+ if(bbp->pv_master_layer_id >= 0)
+ {
+ gimp_image_remove_layer(bbp->pv_image_id, bbp->pv_master_layer_id);
bbp->pv_master_layer_id = -1;
- }
- }
+ }
+ }
gimp_image_scale(bbp->pv_image_id, l_width, l_height);
- }
+ }
}
}
if(replace_pv_image)
@@ -1587,16 +1587,16 @@
bbp->pv_master_layer_id = -1;
bbp->pv_image_id = gimp_image_new(l_width
,l_height
- ,GIMP_RGB
- );
+ ,GIMP_RGB
+ );
gimp_image_set_filename(bbp->pv_image_id, _("BlueboxPreview.xcf"));
bbp->pv_layer_id = gimp_layer_new(bbp->pv_image_id, _("Previewlayer")
,l_width
- ,l_height
- ,GIMP_RGBA_IMAGE
+ ,l_height
+ ,GIMP_RGBA_IMAGE
,100.0 /* Opacity full opaque */
,GIMP_NORMAL_MODE
- );
+ );
gimp_image_add_layer(bbp->pv_image_id, bbp->pv_layer_id, 0);
gimp_layer_set_offsets(bbp->pv_layer_id, 0, 0);
@@ -1610,7 +1610,7 @@
{
gap_layer_copy_content(bbp->pv_layer_id /* dest */
, bbp->layer_id /* src */
- );
+ );
}
else
{
@@ -1621,20 +1621,20 @@
*/
bbp->pv_master_layer_id = gimp_layer_new(bbp->pv_image_id, _("Masterlayer")
,src_drawable->width
- ,src_drawable->height
- ,GIMP_RGBA_IMAGE
+ ,src_drawable->height
+ ,GIMP_RGBA_IMAGE
,100.0 /* Opacity full opaque */
,GIMP_NORMAL_MODE
- );
+ );
gimp_image_add_layer(bbp->pv_image_id, bbp->pv_master_layer_id, 1);
if(!gimp_drawable_has_alpha(bbp->pv_master_layer_id))
{
- gimp_layer_add_alpha(bbp->pv_master_layer_id);
+ gimp_layer_add_alpha(bbp->pv_master_layer_id);
}
gap_layer_copy_content(bbp->pv_master_layer_id /* dest */
, bbp->layer_id /* src */
- );
+ );
gimp_layer_scale(bbp->pv_master_layer_id, l_width, l_height, 0);
gimp_layer_set_offsets(bbp->pv_master_layer_id, 0, 0);
gimp_drawable_set_visible(bbp->pv_master_layer_id, FALSE);
@@ -1643,7 +1643,7 @@
/* use a the scaled mastercopy when operating with reduced preview size */
gap_layer_copy_content(bbp->pv_layer_id /* dest */
, bbp->pv_master_layer_id /* src */
- );
+ );
}
@@ -1679,8 +1679,8 @@
current_selection_channel_id = gimp_image_get_selection(bbp->pv_image_id);
gap_layer_copy_picked_channel(bbp->pv_layer_id, 3 /* dst_pick is the alpha channel */
,current_selection_channel_id, 0
- ,FALSE /* shadow */
- );
+ ,FALSE /* shadow */
+ );
gimp_selection_none(bbp->pv_image_id);
}
@@ -1689,8 +1689,8 @@
/* Apply to the calling drawable */
gap_layer_copy_picked_channel(bbp->layer_id, 3 /* dst_pick is the alpha channel */
,bbp->pv_layer_id, 3
- ,TRUE /* shadow */
- );
+ ,TRUE /* shadow */
+ );
gimp_drawable_detach (src_drawable);
Modified: trunk/gap/gap_bluebox_main.c
==============================================================================
--- trunk/gap/gap_bluebox_main.c (original)
+++ trunk/gap/gap_bluebox_main.c Sun Apr 5 06:47:07 2009
@@ -69,8 +69,8 @@
{GIMP_PDB_COLOR, "keycolor", "Select Pixels to be treansparent by this KeyColor" },
{GIMP_PDB_INT32, "thres_mode", "0 .. use the 3 threshold values for RGB\n"
"1 .. use the 3 threshold values for HSV\n"
- "2 .. use only one simple Threshold\n"
- "3 .. use all 6 threshold values for HSV and RGB"},
+ "2 .. use only one simple Threshold\n"
+ "3 .. use all 6 threshold values for HSV and RGB"},
{GIMP_PDB_FLOAT, "thres_r", "threshold value 0.0 upto 1.0 for RED value (ignored in thers_modes 1 and 2)"},
{GIMP_PDB_FLOAT, "thres_g", "threshold value 0.0 upto 1.0 for GREEN value (ignored in thers_modes 1 and 2)"},
{GIMP_PDB_FLOAT, "thres_b", "threshold value 0.0 upto 1.0 for BLUE value (ignored in thers_modes 1 and 2)"},
@@ -80,9 +80,9 @@
{GIMP_PDB_FLOAT, "thres", "threshold value 0.0 upto 1.0 (ignored in thers_modes 0, 1 and 3)"},
{GIMP_PDB_FLOAT, "tolerance", "alpha tolerance value 0.0 upto 1.0\n"
"0.0 makes hard pixel selection by color threshold(s)\n"
- "greater values allow more or less variable Alpha Values\n"
- "for the selected Pixels within the threshold(s)\n"
- "depending on their difference to the keycolor"},
+ "greater values allow more or less variable Alpha Values\n"
+ "for the selected Pixels within the threshold(s)\n"
+ "depending on their difference to the keycolor"},
{GIMP_PDB_INT32, "grow", "Grow the Selection in Pixels (negative values for shrinking the selection)"},
{GIMP_PDB_INT32, "feather_edges", "TRUE: feather edges using feather_radius, FALSE: sharp edges (do not blur the selection)"},
{GIMP_PDB_FLOAT, "feather_radius", "Feather Radius (makes the selection smooth)"},
@@ -100,9 +100,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
@@ -166,14 +166,14 @@
gimp_install_procedure(GAP_BLUEBOX_PLUGIN_NAME,
"The bluebox effectfilter makes the specified color transparent",
"This plug-in selects pixels in the specified drawable by keycolor "
- "and makes the Selected Pixels transparent. "
- "If there is a selection at calling time, then operate only "
- "on Pixels that are already selected (where selection value is > 0) "
- "The Slection by color follows threshold values "
- "The thresholds operate on RGB or HSV colormodel, "
- "depending on the thres_mode parameter. "
- "The selection by keycolor can be smoothed (by feather_radius) "
- "and/or extended by a grow value.",
+ "and makes the Selected Pixels transparent. "
+ "If there is a selection at calling time, then operate only "
+ "on Pixels that are already selected (where selection value is > 0) "
+ "The Slection by color follows threshold values "
+ "The thresholds operate on RGB or HSV colormodel, "
+ "depending on the thres_mode parameter. "
+ "The selection by keycolor can be smoothed (by feather_radius) "
+ "and/or extended by a grow value.",
"Wolfgang Hofer (hof gimp org)",
"Wolfgang Hofer",
gap_bluebox_version,
@@ -239,52 +239,52 @@
{
case GIMP_RUN_INTERACTIVE:
{
- /* Possibly retrieve data */
- gimp_get_data (GAP_BLUEBOX_DATA_KEY_VALS, &bbp->vals);
+ /* Possibly retrieve data */
+ gimp_get_data (GAP_BLUEBOX_DATA_KEY_VALS, &bbp->vals);
l_rc = gap_bluebox_dialog(bbp);
if(l_rc < 0)
- {
+ {
status = GIMP_PDB_CANCEL;
- }
+ }
}
- break;
+ break;
case GIMP_RUN_NONINTERACTIVE:
- {
- if (n_params != G_N_ELEMENTS (args_bluebox))
- {
- status = GIMP_PDB_CALLING_ERROR;
- }
- else
- {
- bbp->vals.keycolor = param[3].data.d_color;
- bbp->vals.thres_mode = param[4].data.d_int32;
- bbp->vals.thres_r = param[5].data.d_float;
- bbp->vals.thres_g = param[6].data.d_float;
- bbp->vals.thres_b = param[7].data.d_float;
- bbp->vals.thres_h = param[8].data.d_float;
- bbp->vals.thres_s = param[9].data.d_float;
- bbp->vals.thres_v = param[10].data.d_float;
- bbp->vals.thres = param[11].data.d_float;
- bbp->vals.tolerance = param[12].data.d_float;
- bbp->vals.grow = (gdouble)param[13].data.d_int32;
- bbp->vals.feather_edges = param[14].data.d_int32;
- bbp->vals.feather_radius = param[15].data.d_float;
- bbp->vals.source_alpha = param[16].data.d_float;
- bbp->vals.target_alpha = param[17].data.d_float;
+ {
+ if (n_params != G_N_ELEMENTS (args_bluebox))
+ {
+ status = GIMP_PDB_CALLING_ERROR;
+ }
+ else
+ {
+ bbp->vals.keycolor = param[3].data.d_color;
+ bbp->vals.thres_mode = param[4].data.d_int32;
+ bbp->vals.thres_r = param[5].data.d_float;
+ bbp->vals.thres_g = param[6].data.d_float;
+ bbp->vals.thres_b = param[7].data.d_float;
+ bbp->vals.thres_h = param[8].data.d_float;
+ bbp->vals.thres_s = param[9].data.d_float;
+ bbp->vals.thres_v = param[10].data.d_float;
+ bbp->vals.thres = param[11].data.d_float;
+ bbp->vals.tolerance = param[12].data.d_float;
+ bbp->vals.grow = (gdouble)param[13].data.d_int32;
+ bbp->vals.feather_edges = param[14].data.d_int32;
+ bbp->vals.feather_radius = param[15].data.d_float;
+ bbp->vals.source_alpha = param[16].data.d_float;
+ bbp->vals.target_alpha = param[17].data.d_float;
bbp->run_flag = TRUE;
- }
+ }
}
- break;
+ break;
case GIMP_RUN_WITH_LAST_VALS:
- {
- /* Possibly retrieve data */
- gimp_get_data (GAP_BLUEBOX_DATA_KEY_VALS, &bbp->vals);
- bbp->run_flag = TRUE;
+ {
+ /* Possibly retrieve data */
+ gimp_get_data (GAP_BLUEBOX_DATA_KEY_VALS, &bbp->vals);
+ bbp->run_flag = TRUE;
}
- break;
- default:
- break;
+ break;
+ default:
+ break;
}
}
Modified: trunk/gap/gap_dbbrowser_utils.c
==============================================================================
--- trunk/gap/gap_dbbrowser_utils.c (original)
+++ trunk/gap/gap_dbbrowser_utils.c Sun Apr 5 06:47:07 2009
@@ -119,20 +119,20 @@
static void procedure_select_callback (GtkTreeSelection *sel,
- dbbrowser_t *dbbrowser);
+ dbbrowser_t *dbbrowser);
static void dialog_search_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser);
+ dbbrowser_t *dbbrowser);
static void dialog_select (dbbrowser_t *dbbrowser,
- gchar *proc_name);
+ gchar *proc_name);
static void dialog_close_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser);
+ dbbrowser_t *dbbrowser);
static void dialog_help_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser);
+ dbbrowser_t *dbbrowser);
static void convert_string (gchar *str);
/* GAP specific extra callbacks */
static void dialog_num_button_callback (dbbrowser_t* dbbrowser,
- gint button_nr);
+ gint button_nr);
static void dialog_button_1_callback (GtkWidget *widget,
dbbrowser_t* dbbrowser);
static void dialog_button_2_callback (GtkWidget *widget,
@@ -140,9 +140,9 @@
static void dialog_button_3_callback (GtkWidget *widget,
dbbrowser_t* dbbrowser);
static void p_create_action_area_buttons (dbbrowser_t *dbbrowser,
- char *button_1_txt,
- char *button_2_txt,
- const char *help_id
+ char *button_1_txt,
+ char *button_2_txt,
+ const char *help_id
);
/* create and perform the dialog */
@@ -154,8 +154,8 @@
t_constraint_func constraint_func_sel1,
t_constraint_func constraint_func_sel2,
GapDbBrowserResult *result,
- gint32 image_id,
- const char *help_id)
+ gint32 image_id,
+ const char *help_id)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
@@ -191,7 +191,7 @@
hpaned = gtk_hpaned_new ();
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
- hpaned, TRUE, TRUE, 0);
+ hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
@@ -204,10 +204,10 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
@@ -218,10 +218,10 @@
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
- -1, NULL,
- renderer,
- "text", 0,
- NULL);
+ -1, NULL,
+ renderer,
+ "text", 0,
+ NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
gtk_widget_set_size_request (dbbrowser->tv, DBL_LIST_WIDTH, DBL_HEIGHT);
@@ -230,7 +230,7 @@
dbbrowser->sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (dbbrowser->tv));
g_signal_connect (dbbrowser->sel, "changed",
- G_CALLBACK (procedure_select_callback), dbbrowser);
+ G_CALLBACK (procedure_select_callback), dbbrowser);
/* search entry */
@@ -245,7 +245,7 @@
dbbrowser->search_entry = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (dbbrowser->search_entry), TRUE);
gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry,
- TRUE, TRUE, 0);
+ TRUE, TRUE, 0);
gtk_widget_show (dbbrowser->search_entry);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), dbbrowser->search_entry);
@@ -255,15 +255,15 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
- dbbrowser->descr_vbox);
+ dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@@ -311,9 +311,9 @@
static void
p_create_action_area_buttons(dbbrowser_t *dbbrowser,
- char *button_1_txt,
- char *button_2_txt,
- const char *help_id
+ char *button_1_txt,
+ char *button_2_txt,
+ const char *help_id
)
{
GtkWidget *table;
@@ -337,11 +337,11 @@
button = gtk_button_new_with_label ( _("Gen Code by name"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (dialog_button_3_callback), dbbrowser );
+ G_CALLBACK (dialog_button_3_callback), dbbrowser );
gtk_table_attach (GTK_TABLE (table), button,
- cof, cof+1, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof, cof+1, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (button);
row++;
@@ -353,8 +353,8 @@
g_signal_connect (G_OBJECT (dbbrowser->name_button), "clicked",
G_CALLBACK (dialog_search_callback), dbbrowser);
gtk_table_attach (GTK_TABLE (table), dbbrowser->name_button,
- cof, cof+1, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof, cof+1, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show(dbbrowser->name_button);
/* Button Search by Blurb */
@@ -363,8 +363,8 @@
g_signal_connect (G_OBJECT (dbbrowser->blurb_button), "clicked",
G_CALLBACK (dialog_search_callback), dbbrowser);
gtk_table_attach (GTK_TABLE (table), dbbrowser->blurb_button,
- cof+1, cof+2, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof+1, cof+2, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show(dbbrowser->blurb_button);
/* Button Search by Menupath */
@@ -373,8 +373,8 @@
g_signal_connect (G_OBJECT (dbbrowser->menupath_button), "clicked",
G_CALLBACK (dialog_search_callback), dbbrowser);
gtk_table_attach (GTK_TABLE (table), dbbrowser->menupath_button,
- cof+2, cof+3, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof+2, cof+3, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show(dbbrowser->menupath_button);
@@ -384,10 +384,10 @@
dbbrowser->app_const_button = gtk_button_new_with_label (button_1_txt);
GTK_WIDGET_SET_FLAGS (dbbrowser->app_const_button, GTK_CAN_DEFAULT);
g_signal_connect (G_OBJECT (dbbrowser->app_const_button), "clicked",
- G_CALLBACK (dialog_button_1_callback), dbbrowser );
+ G_CALLBACK (dialog_button_1_callback), dbbrowser );
gtk_table_attach (GTK_TABLE (table), dbbrowser->app_const_button,
- cof, cof+1, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof, cof+1, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive (dbbrowser->app_const_button, FALSE);
gtk_widget_show (dbbrowser->app_const_button);
} else dbbrowser->app_const_button = NULL;
@@ -397,10 +397,10 @@
dbbrowser->app_vary_button = gtk_button_new_with_label (button_2_txt);
GTK_WIDGET_SET_FLAGS (dbbrowser->app_vary_button, GTK_CAN_DEFAULT);
g_signal_connect (G_OBJECT (dbbrowser->app_vary_button), "clicked",
- G_CALLBACK (dialog_button_2_callback), dbbrowser );
+ G_CALLBACK (dialog_button_2_callback), dbbrowser );
gtk_table_attach (GTK_TABLE (table), dbbrowser->app_vary_button,
- cof+1, cof+2, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof+1, cof+2, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_set_sensitive (dbbrowser->app_vary_button, FALSE);
gtk_widget_show (dbbrowser->app_vary_button);
} else dbbrowser->app_vary_button = NULL;
@@ -409,10 +409,10 @@
button = gtk_button_new_from_stock ( GTK_STOCK_CANCEL);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (dialog_close_callback), dbbrowser);
+ G_CALLBACK (dialog_close_callback), dbbrowser);
gtk_table_attach (GTK_TABLE (table), button,
- cof+2, cof+3, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ cof+2, cof+3, row, row + 1,
+ GTK_FILL, 0, 0, 0);
gtk_widget_show (button);
@@ -423,23 +423,23 @@
gtk_widget_show (button);
dbbrowser->help_id = help_id;
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (dialog_help_callback), dbbrowser);
+ G_CALLBACK (dialog_help_callback), dbbrowser);
gtk_table_attach (GTK_TABLE (table), button,
- 0, 1, row, row + 1,
- GTK_FILL, 0, 0, 0);
+ 0, 1, row, row + 1,
+ GTK_FILL, 0, 0, 0);
}
gtk_widget_show (table);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->action_area),
- table, TRUE, TRUE, 0);
+ table, TRUE, TRUE, 0);
} /* end p_create_action_area_buttons */
static void
procedure_select_callback (GtkTreeSelection *sel,
- dbbrowser_t *dbbrowser)
+ dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
@@ -450,8 +450,8 @@
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
gtk_tree_model_get (GTK_TREE_MODEL (dbbrowser->store), &iter,
- 1, &func,
- -1);
+ 1, &func,
+ -1);
dialog_select (dbbrowser, func);
if(dbbrowser->app_const_button)
{
@@ -464,7 +464,7 @@
/* update the description box (right) */
static void
dialog_select (dbbrowser_t *dbbrowser,
- gchar *proc_name)
+ gchar *proc_name)
{
GtkWidget *old_description;
@@ -490,16 +490,16 @@
gimp_procedural_db_proc_info (proc_name,
- &dbbrowser->selected_proc_blurb,
- &dbbrowser->selected_proc_help,
- &dbbrowser->selected_proc_author,
- &dbbrowser->selected_proc_copyright,
- &dbbrowser->selected_proc_date,
- &dbbrowser->selected_proc_type,
- &dbbrowser->selected_nparams,
- &dbbrowser->selected_nreturn_vals,
- &dbbrowser->selected_params,
- &dbbrowser->selected_return_vals);
+ &dbbrowser->selected_proc_blurb,
+ &dbbrowser->selected_proc_help,
+ &dbbrowser->selected_proc_author,
+ &dbbrowser->selected_proc_copyright,
+ &dbbrowser->selected_proc_date,
+ &dbbrowser->selected_proc_type,
+ &dbbrowser->selected_nparams,
+ &dbbrowser->selected_nreturn_vals,
+ &dbbrowser->selected_params,
+ &dbbrowser->selected_return_vals);
/* save the "old" table */
old_description = dbbrowser->description;
@@ -518,7 +518,7 @@
dbbrowser->selected_nreturn_vals,
dbbrowser->selected_params,
dbbrowser->selected_return_vals);
-
+
if (old_description)
@@ -583,7 +583,7 @@
/* the HELP dialog */
static void
dialog_help_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser)
+ dbbrowser_t *dbbrowser)
{
if(dbbrowser)
{
@@ -597,7 +597,7 @@
/* end of the dialog */
static void
dialog_close_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser)
+ dbbrowser_t *dbbrowser)
{
GtkWidget *dlg;
@@ -620,7 +620,7 @@
/* GAP dialog_num_button_callback (end of the dialog) */
static void
dialog_num_button_callback (dbbrowser_t* dbbrowser,
- gint button_nr)
+ gint button_nr)
{
if (dbbrowser->selected_proc_name==NULL)
{
@@ -664,7 +664,7 @@
/* search in the whole db */
static void
dialog_search_callback (GtkWidget *widget,
- dbbrowser_t *dbbrowser)
+ dbbrowser_t *dbbrowser)
{
gchar **proc_list;
gint num_procs;
@@ -688,18 +688,18 @@
query_text = gtk_entry_get_text (GTK_ENTRY (dbbrowser->search_entry));
while (*query_text)
- {
- if ((*query_text == '_') || (*query_text == '-'))
- g_string_append (query, "[-_]");
- else
- g_string_append_c (query, *query_text);
+ {
+ if ((*query_text == '_') || (*query_text == '-'))
+ g_string_append (query, "[-_]");
+ else
+ g_string_append_c (query, *query_text);
- query_text++;
- }
+ query_text++;
+ }
gimp_procedural_db_query (query->str,
- ".*", ".*", ".*", ".*", ".*", ".*",
- &num_procs, &proc_list);
+ ".*", ".*", ".*", ".*", ".*", ".*",
+ &num_procs, &proc_list);
g_string_free (query, TRUE);
}
@@ -708,24 +708,24 @@
dialog_show_message (dbbrowser, _("Searching by blurb - please wait"));
gimp_procedural_db_query (".*",
- (gchar *) gtk_entry_get_text
- (GTK_ENTRY (dbbrowser->search_entry)),
- ".*", ".*", ".*", ".*", ".*",
- &num_procs, &proc_list);
+ (gchar *) gtk_entry_get_text
+ (GTK_ENTRY (dbbrowser->search_entry)),
+ ".*", ".*", ".*", ".*", ".*",
+ &num_procs, &proc_list);
}
else
{
if (widget == dbbrowser->menupath_button)
{
dialog_show_message (dbbrowser, _("Searching by menupath - please wait"));
- }
- else
+ }
+ else
{
dialog_show_message (dbbrowser, _("Searching - please wait"));
- }
+ }
gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*",
- &num_procs, &proc_list);
+ &num_procs, &proc_list);
}
dbbrowser->store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
@@ -747,63 +747,63 @@
pre_selection = FALSE;
if (widget == dbbrowser->menupath_button)
{
- gchar *menu_path;
-
- menu_path = gap_db_get_plugin_menupath(proc_list[i]);
- if(menu_path)
- {
- if(pattern)
- {
- if(gap_match_name(menu_path
- , pattern
- , GAP_MTCH_ANYWHERE /* gint32 mode */
- , FALSE /* NOT case_sensitive */
- ))
- {
- pre_selection = TRUE; /* select matching menupath */
- }
- }
- else
- {
- pre_selection = TRUE; /* if we dont have a pattern select all */
- }
- }
- g_free(menu_path);
- }
- else
- {
- /* for all other cases than menupath_button
- * the pre_selection was already done at gimp_procedural_db_query
- */
- pre_selection = TRUE;
- }
-
+ gchar *menu_path;
+
+ menu_path = gap_db_get_plugin_menupath(proc_list[i]);
+ if(menu_path)
+ {
+ if(pattern)
+ {
+ if(gap_match_name(menu_path
+ , pattern
+ , GAP_MTCH_ANYWHERE /* gint32 mode */
+ , FALSE /* NOT case_sensitive */
+ ))
+ {
+ pre_selection = TRUE; /* select matching menupath */
+ }
+ }
+ else
+ {
+ pre_selection = TRUE; /* if we dont have a pattern select all */
+ }
+ }
+ g_free(menu_path);
+ }
+ else
+ {
+ /* for all other cases than menupath_button
+ * the pre_selection was already done at gimp_procedural_db_query
+ */
+ pre_selection = TRUE;
+ }
+
if (pre_selection)
{
- /* the filter constraint_function checks if the
- * PDB-proc has a typical interface to operate on a single drawable.
- * all other PDB-procedures are not listed in the GAP-dbbrowser
- */
- if (0 != (dbbrowser->constraint_func)((char *)proc_list[i], dbbrowser->current_image_id))
+ /* the filter constraint_function checks if the
+ * PDB-proc has a typical interface to operate on a single drawable.
+ * all other PDB-procedures are not listed in the GAP-dbbrowser
+ */
+ if (0 != (dbbrowser->constraint_func)((char *)proc_list[i], dbbrowser->current_image_id))
{
i_added++;
-
- if((dbbrowser->codegen_flag != 0) && (gap_debug))
- {
+
+ if((dbbrowser->codegen_flag != 0) && (gap_debug))
+ {
gap_codegen_gen_forward_iter_ALT(proc_list[i]);
gap_codegen_gen_tab_iter_ALT(proc_list[i]);
gap_codegen_gen_code_iter_ALT(proc_list[i]);
- }
+ }
label = g_strdup (proc_list[i]);
convert_string (label);
gtk_list_store_append (dbbrowser->store, &iter);
gtk_list_store_set (dbbrowser->store, &iter,
- 0, label,
- 1, proc_list[i],
- -1);
+ 0, label,
+ 1, proc_list[i],
+ -1);
g_free (label);
}
- }
+ }
g_free (proc_list[i]);
}
@@ -832,7 +832,7 @@
while (*str)
{
if (*str == '_')
- *str = '-';
+ *str = '-';
str++;
}
@@ -916,13 +916,13 @@
*/
return_vals = gimp_run_procedure ("gimp_plugins_query",
&nreturn_vals,
- GIMP_PDB_STRING, "", /* search all elements*/
+ GIMP_PDB_STRING, "", /* search all elements*/
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
{
- initialized = TRUE;
- }
+ initialized = TRUE;
+ }
}
@@ -941,13 +941,13 @@
for (loop = 0; loop < return_vals[1].data.d_int32; loop++)
- {
- if(strcmp(search_text, realname_strs[loop]) == 0)
- {
- menu_path = g_strdup (menu_strs[loop]);
- break; /* stop at 1st match */
- }
- }
+ {
+ if(strcmp(search_text, realname_strs[loop]) == 0)
+ {
+ menu_path = g_strdup (menu_strs[loop]);
+ break; /* stop at 1st match */
+ }
+ }
}
/* Dont Destroy, but Keep the Returned Parameters for the lifetime of this process */
Modified: trunk/gap/gap_dbbrowser_utils.h
==============================================================================
--- trunk/gap/gap_dbbrowser_utils.h (original)
+++ trunk/gap/gap_dbbrowser_utils.h Sun Apr 5 06:47:07 2009
@@ -55,9 +55,9 @@
t_constraint_func constraint_func_sel1,
t_constraint_func constraint_func_sel2,
GapDbBrowserResult *result,
- gint32 image_id,
- const char *help_id
- );
+ gint32 image_id,
+ const char *help_id
+ );
gchar*
gap_db_get_plugin_menupath (const gchar *name);
Modified: trunk/gap/gap_decode_mplayer.c
==============================================================================
--- trunk/gap/gap_decode_mplayer.c (original)
+++ trunk/gap/gap_decode_mplayer.c Sun Apr 5 06:47:07 2009
@@ -56,13 +56,13 @@
* the old MPlayer1.0pre5 options can be selected via dialog.
*
* -ss <time> (see -sb option too)
- * Seek to given time position.
+ * Seek to given time position.
*
- * EXAMPLE:
- * -ss 56
- * seeks to 56 seconds
- * -ss 01:10:00
- * seeks to 1 hour 10 min
+ * EXAMPLE:
+ * -ss 56
+ * seeks to 56 seconds
+ * -ss 01:10:00
+ * seeks to 1 hour 10 min
*
* -frames <number>
* Play/convert only first <number> frames, then quit.
@@ -73,25 +73,25 @@
* set video output to jpeg device (this device saves jpeg frames to disc)
*
* -jpeg <option1:option2:...> (-vo jpeg only) # old syntax for Mplayer1.0pre5
- * Specify options for the JPEG output.
- * Available options are:
+ * Specify options for the JPEG output.
+ * Available options are:
*
- * [no]progressive
- * Specify standard or progressive JPEG.
- * [no]baseline
- * Specify use of baseline or not.
- * optimize=<value>
- * Optimization factor [0-100]
- * smooth=<value>
- * Smooth factor [0-100]
- * quality=<value>
- * Quality factor [0-100]
- * outdir=<value>
- * Directory to save the JPEG files
+ * [no]progressive
+ * Specify standard or progressive JPEG.
+ * [no]baseline
+ * Specify use of baseline or not.
+ * optimize=<value>
+ * Optimization factor [0-100]
+ * smooth=<value>
+ * Smooth factor [0-100]
+ * quality=<value>
+ * Quality factor [0-100]
+ * outdir=<value>
+ * Directory to save the JPEG files
* -z <0-9> (-vo png only) # old syntax for Mplayer1.0pre5
- * Specifies compression level for PNG output.
- * 0 no compression
- * 9 max compression
+ * Specifies compression level for PNG output.
+ * 0 no compression
+ * 9 max compression
*
* -dvdangle <angle id> (DVD only)
* Some DVD discs contain scenes that can be viewed
@@ -106,17 +106,17 @@
*
*
* -aid <id> (also see -alang option)
- * Select audio channel [MPEG: 0-31 AVI/OGM: 1-99 ASF/
- * RM: 0-127 VOB(AC3): 128-159 VOB(LPCM): 160-191
- * MPEG-TS 17-8190]. MPlayer prints the available IDs
- * when running in verbose (-v) mode. When playing an
- * MPEG-TS stream, MPlayer/Mencoder will use the first
- * program (if present) with the chosen audio stream.
+ * Select audio channel [MPEG: 0-31 AVI/OGM: 1-99 ASF/
+ * RM: 0-127 VOB(AC3): 128-159 VOB(LPCM): 160-191
+ * MPEG-TS 17-8190]. MPlayer prints the available IDs
+ * when running in verbose (-v) mode. When playing an
+ * MPEG-TS stream, MPlayer/Mencoder will use the first
+ * program (if present) with the chosen audio stream.
* -nosound
- * Do not play/encode sound. Useful for benchmarking.
+ * Do not play/encode sound. Useful for benchmarking.
*
* -novideo
- * Do not play/encode video.
+ * Do not play/encode video.
*
*
* examples (MPlayer 1.0pre5):
@@ -130,13 +130,13 @@
* ==> extracts 150 jpeg frames starting at second 13
*
* 00000001.jpg
- * ..
+ * ..
* mplayer -vo png -ss 00:00:14 -frames 25 -z 9 videoinput.rm
*
* ==> extracts 25 png frames in best compression starting at second 13
*
* 00000001.jpg
- * ..
+ * ..
* examples (MPlayer 1.0pre7 or latest CVS):
* -----------------------
* mplayer -ss 00:00:14 -frames 200 -ao pcm:file=extracted_audio.wav videoinput.rm
@@ -148,7 +148,7 @@
* ==> extracts 150 jpeg frames starting at second 13 WARNING does not work yet
*
* 00000001.jpg
- * ..
+ * ..
*
* mplayer -vo png:z=9 -ss 00:00:14 -frames 25 videoinput.mpg
* ==> extracts 25 png frames in best compression starting at second 13 WARNING does not work yet
@@ -354,7 +354,7 @@
if(tab_idx < 3)
{
tab[tab_idx] = num;
- tab_idx++;
+ tab_idx++;
}
num = 0;
factor = 1;
@@ -492,7 +492,7 @@
argv[ii].label_txt = _("Output Audio:");
argv[ii].help_txt = _("Filename for the extracted audiodata. "
"Audiodata is written in RIFF WAV fileformat "
- "(but only if audiotrack >= 1)");
+ "(but only if audiotrack >= 1)");
argv[ii].text_buf_len = sizeof(gpp->audio_filename);
argv[ii].text_buf_ret = gpp->audio_filename;
argv[ii].entry_width = MPDIALOG_LARGE_ENTRY_WIDTH;
@@ -648,8 +648,8 @@
params_ok = FALSE;
g_snprintf(err_msg_buffer, sizeof(err_msg_buffer)
, _("videofile %s not existent\n")
- , gpp->video_filename
- );
+ , gpp->video_filename
+ );
}
if((gpp->start_minute > 59)
|| (gpp->start_second > 59))
@@ -657,8 +657,8 @@
params_ok = FALSE;
g_snprintf(err_msg_buffer, sizeof(err_msg_buffer)
,_("Illegal starttime %s")
- , buf_start_time
- );
+ , buf_start_time
+ );
}
if(params_ok)
@@ -729,7 +729,7 @@
, G_DIR_SEPARATOR_S
, (int)frame_nr
,ext
- );
+ );
}
/* ------------------------------
@@ -796,15 +796,15 @@
{
if (! g_path_is_absolute (gpp->basename))
{
- gchar *current;
+ gchar *current;
- current = g_get_current_dir ();
- absolute = g_build_filename (current, gpp->basename, NULL);
- g_free (current);
+ current = g_get_current_dir ();
+ absolute = g_build_filename (current, gpp->basename, NULL);
+ g_free (current);
}
else
{
- absolute = g_strdup (gpp->basename);
+ absolute = g_strdup (gpp->basename);
}
p_dirname(absolute);
@@ -1063,7 +1063,7 @@
/* check gimprc for the mplayer executable name (including path) */
if ( (cp = gimp_gimprc_query("mplayer_prog")) != NULL )
{
- gpp->mplayer_prog = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
+ gpp->mplayer_prog = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
if(g_file_test (gpp->mplayer_prog, G_FILE_TEST_IS_EXECUTABLE) )
{
mplayer_prog_found = TRUE;
@@ -1072,10 +1072,10 @@
{
g_message(_("WARNING: your gimprc file configuration for the mediaplayer\n"
"does not point to an executable program;\n"
- "the configured value for %s is: %s\n")
- , "mplayer_prog"
- , gpp->mplayer_prog
- );
+ "the configured value for %s is: %s\n")
+ , "mplayer_prog"
+ , gpp->mplayer_prog
+ );
}
}
@@ -1084,19 +1084,19 @@
{
if ( (cp = g_getenv("GAP_MPLAYER_PROG")) != NULL )
{
- gpp->mplayer_prog = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
+ gpp->mplayer_prog = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
if(g_file_test (gpp->mplayer_prog, G_FILE_TEST_IS_EXECUTABLE) )
{
- mplayer_prog_found = TRUE;
+ mplayer_prog_found = TRUE;
}
else
{
- g_message(_("WARNING: the environment variable %s\n"
+ g_message(_("WARNING: the environment variable %s\n"
"does not point to an executable program;\n"
- "the current value is: %s\n")
- , "GAP_MPLAYER_PROG"
- , gpp->mplayer_prog
- );
+ "the current value is: %s\n")
+ , "GAP_MPLAYER_PROG"
+ , gpp->mplayer_prog
+ );
}
}
}
@@ -1118,8 +1118,8 @@
{
l_rc = 10; /* ERROR */
global_errlist = g_strdup_printf(_("The mediaplayer executable file '%s' was not found.")
- , MPLAYER_PROG
- );
+ , MPLAYER_PROG
+ );
}
return (l_rc);
@@ -1162,7 +1162,7 @@
}
if(gap_debug) printf("poll ended on mplayer pid: %d\n", (int)mplayer_pid);
-} /* end p_poll */
+} /* end p_poll */
/* -----------------------
@@ -1192,7 +1192,7 @@
*/
g_snprintf(l_buf, sizeof(l_buf), "cd \"%s\"; "
, gpp->mplayer_working_dir
- );
+ );
}
else
{
@@ -1203,10 +1203,10 @@
g_snprintf(l_cmd, sizeof(l_cmd), "%s%s -ss %02d:%02d:%02d -frames %d "
, l_buf /* optional cd gpp->mplayer_working_dir */
, gpp->mplayer_prog /* programname */
- , (int)gpp->start_hour
- , (int)gpp->start_minute
- , (int)gpp->start_second
- , (int)gpp->number_of_frames
+ , (int)gpp->start_hour
+ , (int)gpp->start_minute
+ , (int)gpp->start_second
+ , (int)gpp->number_of_frames
);
if (gpp->atrack > 0)
@@ -1215,7 +1215,7 @@
{
/* select a non-default audiotrack (such as multilingual dvd stuff) */
g_snprintf(l_buf, sizeof(l_buf), "-aid %d "
- ,(int)gpp->atrack
+ ,(int)gpp->atrack
);
strcat(l_cmd, l_buf);
}
@@ -1259,7 +1259,7 @@
{
/* select a non-default videotrack (usually another DVD angle) */
g_snprintf(l_buf, sizeof(l_buf), "-dvdangle %d "
- ,(int)gpp->vtrack
+ ,(int)gpp->vtrack
);
strcat(l_cmd, l_buf);
}
@@ -1276,57 +1276,57 @@
if(gpp->use_old_mplayer1_syntax)
{
g_snprintf(l_buf, sizeof(l_buf), "jpeg -jpeg quality=%d:optimize=%d:smooth=%d"
- ,(int)gpp->jpg_quality
- ,(int)gpp->jpg_optimize
- ,(int)gpp->jpg_smooth
+ ,(int)gpp->jpg_quality
+ ,(int)gpp->jpg_optimize
+ ,(int)gpp->jpg_smooth
);
}
- else
- {
+ else
+ {
g_snprintf(l_buf, sizeof(l_buf), "jpeg:quality=%d:optimize=%d:smooth=%d"
- ,(int)gpp->jpg_quality
- ,(int)gpp->jpg_optimize
- ,(int)gpp->jpg_smooth
+ ,(int)gpp->jpg_quality
+ ,(int)gpp->jpg_optimize
+ ,(int)gpp->jpg_smooth
);
- }
+ }
- strcat(l_cmd, l_buf);
+ strcat(l_cmd, l_buf);
if(gpp->jpg_progressive)
- {
+ {
strcat(l_cmd, ":progressive");
- }
- else
- {
+ }
+ else
+ {
strcat(l_cmd, ":noprogressive");
- }
+ }
if(gpp->jpg_baseline)
- {
+ {
strcat(l_cmd, ":baseline");
- }
- else
- {
+ }
+ else
+ {
strcat(l_cmd, ":nobaseline");
- }
- strcat(l_cmd, " ");
+ }
+ strcat(l_cmd, " ");
break;
case MPENC_PNG:
default:
if(gpp->use_old_mplayer1_syntax)
{
g_snprintf(l_buf, sizeof(l_buf), "png -z %d"
- ,(int)gpp->png_compression
+ ,(int)gpp->png_compression
);
- }
- else
- {
+ }
+ else
+ {
g_snprintf(l_buf, sizeof(l_buf), "png:z=%d"
- ,(int)gpp->png_compression
+ ,(int)gpp->png_compression
);
- }
+ }
strcat(l_cmd, l_buf); /* other formats extract as png,
- * and may need further processing for convert
- */
+ * and may need further processing for convert
+ */
break;
}
@@ -1363,29 +1363,29 @@
l_fp = g_fopen(l_mplayer_startscript, "w+");
if (l_fp != NULL)
{
- fprintf(l_fp, "#!/bin/sh\n");
- fprintf(l_fp, "CURR_DIR=`pwd`\n");
+ fprintf(l_fp, "#!/bin/sh\n");
+ fprintf(l_fp, "CURR_DIR=`pwd`\n");
if(gpp->vtrack > 0)
- {
- fprintf(l_fp, "cd \"%s\"\n", gpp->mplayer_working_dir);
- }
- fprintf(l_fp, "%s &\n"
+ {
+ fprintf(l_fp, "cd \"%s\"\n", gpp->mplayer_working_dir);
+ }
+ fprintf(l_fp, "%s &\n"
, l_cmd /* start mplayer as background process */
- );
- fprintf(l_fp, "MPLAYER_PID=$!\n");
- fprintf(l_fp, "cd \"$CURR_DIR\"\n");
- fprintf(l_fp, "echo \"$MPLAYER_PID # MPLAYER_PID\"\n");
- fprintf(l_fp, "echo \"$MPLAYER_PID # MPLAYER_PID\" > \"%s\"\n", l_mplayer_pidfile);
+ );
+ fprintf(l_fp, "MPLAYER_PID=$!\n");
+ fprintf(l_fp, "cd \"$CURR_DIR\"\n");
+ fprintf(l_fp, "echo \"$MPLAYER_PID # MPLAYER_PID\"\n");
+ fprintf(l_fp, "echo \"$MPLAYER_PID # MPLAYER_PID\" > \"%s\"\n", l_mplayer_pidfile);
- /* we pass the mplayer pid in a file,
+ /* we pass the mplayer pid in a file,
* exitcodes are truncated to 8 bit
* by the system call
*/
- /* fprintf(l_fp, "exit $MPLAYER_PID\n"); */
- fclose(l_fp);
+ /* fprintf(l_fp, "exit $MPLAYER_PID\n"); */
+ fclose(l_fp);
/* set execute permissions for the generated shellscript */
- gap_file_chmod(l_mplayer_startscript, GAP_FILE_MKDIR_MODE);
+ gap_file_chmod(l_mplayer_startscript, GAP_FILE_MKDIR_MODE);
}
/* START the generated shellscrit */
@@ -1394,9 +1394,9 @@
l_fp = g_fopen(l_mplayer_pidfile, "r");
if (l_fp != NULL)
{
- fscanf(l_fp, "%d", &l_rc);
- fclose(l_fp);
- l_mplayer_pid = (pid_t)l_rc;
+ fscanf(l_fp, "%d", &l_rc);
+ fclose(l_fp);
+ l_mplayer_pid = (pid_t)l_rc;
}
g_remove(l_mplayer_startscript);
@@ -1574,7 +1574,7 @@
global_errlist = g_strdup_printf(
_("could not start mplayer process\n(program=%s)")
, gpp->mplayer_prog
- );
+ );
l_rc = -1;
}
}
@@ -1589,8 +1589,8 @@
{
/* if mplayer was started as asynchron process
* we use a polling procedure to show progress
- * the polling is done until the asynchron process is finished
- */
+ * the polling is done until the asynchron process is finished
+ */
p_poll(gpp, l_mplayer_pid, extension);
}
@@ -1628,22 +1628,22 @@
{
gimp_progress_init (_("Renaming frames..."));
l_rc = p_rename_frames(gpp
- ,1 /* first */
- ,gpp->number_of_frames /* last_frame */
- ,gpp->basename
- ,extension
- );
+ ,1 /* first */
+ ,gpp->number_of_frames /* last_frame */
+ ,gpp->basename
+ ,extension
+ );
}
else
{
gimp_progress_init (_("Converting frames..."));
l_rc = p_convert_frames(gpp
- ,1 /* first_frame */
- ,gpp->number_of_frames /* last_frame */
- ,gpp->basename
- ,extension
- ,extension2
- );
+ ,1 /* first_frame */
+ ,gpp->number_of_frames /* last_frame */
+ ,gpp->basename
+ ,extension
+ ,extension2
+ );
}
if (l_input_dir_created_by_myself)
@@ -1681,11 +1681,11 @@
{
/* load first frame and add a display */
p_build_gap_framename(l_first_to_laod
- ,sizeof(l_first_to_laod)
- ,1 /* mplayer starts extracted frames with nr 00000001 */
- ,gpp->basename
- ,&extension2[1]
- );
+ ,sizeof(l_first_to_laod)
+ ,1 /* mplayer starts extracted frames with nr 00000001 */
+ ,gpp->basename
+ ,&extension2[1]
+ );
l_rc = gap_lib_load_image(l_first_to_laod);
if(l_rc >= 0) gimp_display_new(l_rc);
Modified: trunk/gap/gap_decode_mplayer_main.c
==============================================================================
--- trunk/gap/gap_decode_mplayer_main.c (original)
+++ trunk/gap/gap_decode_mplayer_main.c Sun Apr 5 06:47:07 2009
@@ -65,9 +65,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -101,30 +101,30 @@
gimp_plugin_domain_register (GETTEXT_PACKAGE, LOCALEDIR);
gimp_install_procedure(GAP_MPLAYER_PLUGIN_NAME,
- "This plugin calls mplayer to split any video to video frames. "
- "MPlayer 1.0 must be installed on your system.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("MPlayer based extraction..."),
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_mplayer), nreturn_vals,
- args_mplayer, return_vals);
+ "This plugin calls mplayer to split any video to video frames. "
+ "MPlayer 1.0 must be installed on your system.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("MPlayer based extraction..."),
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_mplayer), nreturn_vals,
+ args_mplayer, return_vals);
gimp_install_procedure(GAP_MPLAYER_PLUGIN_NAME_TOOLBOX,
- "This plugin calls mplayer to split any video to video frames. "
- "MPlayer 1.0 must be installed on your system.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("MPlayer based extraction..."),
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_mplayer_ext), nreturn_vals,
- args_mplayer_ext, return_vals);
+ "This plugin calls mplayer to split any video to video frames. "
+ "MPlayer 1.0 must be installed on your system.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("MPlayer based extraction..."),
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_mplayer_ext), nreturn_vals,
+ args_mplayer_ext, return_vals);
{
@@ -142,15 +142,15 @@
gimp_plugin_menu_register (GAP_MPLAYER_PLUGIN_NAME_TOOLBOX, menupath_toolbox_video_split);
}
-} /* end query */
+} /* end query */
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals)
+ , GimpParam **return_vals)
{
const char *l_env;
@@ -202,36 +202,36 @@
if (status == GIMP_PDB_SUCCESS)
{
gpp = &mplayer_gpp;
-
- /* setup default values (for the 1.st call per session) */
+
+ /* setup default values (for the 1.st call per session) */
gpp->video_filename[0] = '\0';
gpp->audio_filename[0] = '\0';
- gpp->number_of_frames = 100;
- gpp->vtrack = 1;
- gpp->atrack = 1;
- gpp->png_compression = 0;
- gpp->jpg_quality = 86;
- gpp->jpg_optimize = 100;
- gpp->jpg_smooth = 0;
- gpp->jpg_progressive = FALSE;
- gpp->jpg_baseline = TRUE;
+ gpp->number_of_frames = 100;
+ gpp->vtrack = 1;
+ gpp->atrack = 1;
+ gpp->png_compression = 0;
+ gpp->jpg_quality = 86;
+ gpp->jpg_optimize = 100;
+ gpp->jpg_smooth = 0;
+ gpp->jpg_progressive = FALSE;
+ gpp->jpg_baseline = TRUE;
gpp->start_hour = 0;
gpp->start_minute = 0;
gpp->start_second = 0;
- gpp->img_format = MPENC_JPEG;
- gpp->silent = FALSE;
- gpp->autoload = TRUE;
- gpp->run_mplayer_asynchron = TRUE;
-
+ gpp->img_format = MPENC_JPEG;
+ gpp->silent = FALSE;
+ gpp->autoload = TRUE;
+ gpp->run_mplayer_asynchron = TRUE;
+
g_snprintf(gpp->basename, sizeof(gpp->basename), "frame_");
- gimp_get_data(GAP_MPLAYER_PLUGIN_NAME, gpp);
+ gimp_get_data(GAP_MPLAYER_PLUGIN_NAME, gpp);
mplayer_gpp.run_mode = run_mode;
-
+
l_rc = gap_mplayer_decode(gpp);
-
- gimp_set_data(GAP_MPLAYER_PLUGIN_NAME, gpp, sizeof(mplayer_gpp));
+
+ gimp_set_data(GAP_MPLAYER_PLUGIN_NAME, gpp, sizeof(mplayer_gpp));
}
}
Modified: trunk/gap/gap_decode_xanim.c
==============================================================================
--- trunk/gap/gap_decode_xanim.c (original)
+++ trunk/gap/gap_decode_xanim.c Sun Apr 5 06:47:07 2009
@@ -208,7 +208,7 @@
-1);
return (l_rc);
-} /* end p_xanim_info */
+} /* end p_xanim_info */
/* ============================================================================
@@ -218,16 +218,16 @@
static int
p_xanim_dialog (gint32 *first_frame,
gint32 *last_frame,
- char *filename,
- gint32 len_filename,
- char *basename,
- gint32 len_basename,
- GapXAnimFormats *Format,
- gint32 *extract_video,
- gint32 *extract_audio,
- gint32 *jpeg_quality,
- gint32 *autoload,
- gint32 *run_xanim_asynchron)
+ char *filename,
+ gint32 len_filename,
+ char *basename,
+ gint32 len_basename,
+ GapXAnimFormats *Format,
+ gint32 *extract_video,
+ gint32 *extract_audio,
+ gint32 *jpeg_quality,
+ gint32 *autoload,
+ gint32 *run_xanim_asynchron)
{
#define XADIALOG_NUM_ARGS 13
static GapArrArg argv[XADIALOG_NUM_ARGS];
@@ -237,8 +237,8 @@
argv[0].label_txt = _("Video:");
argv[0].help_txt = _("Name of a videofile to read by xanim. "
"Frames are extracted from the videofile "
- "and written to separate diskfiles. "
- "xanim exporting edition is required.");
+ "and written to separate diskfiles. "
+ "xanim exporting edition is required.");
argv[0].text_buf_len = len_filename;
argv[0].text_buf_ret = filename;
argv[0].entry_width = 250;
@@ -274,7 +274,7 @@
gap_arr_arg_init(&argv[4], GAP_ARR_WGT_OPTIONMENU);
argv[4].label_txt = _("Format");
argv[4].help_txt = _("Fileformat for the extracted video frames. "
- "(xcf is extracted as ppm and converted to xcf)");
+ "(xcf is extracted as ppm and converted to xcf)");
argv[4].radio_argc = 3;
argv[4].radio_argv = radio_args;
argv[4].radio_ret = 0;
@@ -316,14 +316,14 @@
gap_arr_arg_init(&argv[11], GAP_ARR_WGT_LABEL_LEFT);
argv[11].label_txt = _("\nWarning: xanim 2.80 is old unmaintained software\n"
"and has only limited MPEG support.\n"
- "Most of the frames (type P and B) will be skipped.");
+ "Most of the frames (type P and B) will be skipped.");
gap_arr_arg_init(&argv[12], GAP_ARR_WGT_HELP_BUTTON);
argv[12].help_id = GAP_XANIM_HELP_ID;
if(TRUE == gap_arr_ok_cancel_dialog(_("Xanim based extraction (DEPRECATED)"),
- _("Select Frame Range"), XADIALOG_NUM_ARGS, argv))
+ _("Select Frame Range"), XADIALOG_NUM_ARGS, argv))
{
if(argv[1].int_ret < argv[2].int_ret )
{
@@ -349,7 +349,7 @@
}
-} /* end p_xanim_dialog */
+} /* end p_xanim_dialog */
static gint
@@ -374,8 +374,8 @@
return(gap_arr_std_dialog ( _("GAP Question"),
_("File already exists"),
- 1, argv,
- 3, l_argv, -1));
+ 1, argv,
+ 3, l_argv, -1));
}
}
return (overwrite_mode);
@@ -412,7 +412,7 @@
if(fname[l_idx] == G_DIR_SEPARATOR)
{
fname[l_idx] = '\0';
- return;
+ return;
}
l_idx--;
}
@@ -532,27 +532,27 @@
l_max_found = l_nr;
l_delta = (l_high - l_nr) / 2;
if(l_delta == 0)
- {
- l_delta = 1;
- }
+ {
+ l_delta = 1;
+ }
l_nr = l_max_found + l_delta;
}
else
- {
+ {
if(l_nr == from_nr) { return (-1); } /* no frames found */
if(l_nr < l_high)
- {
+ {
l_high = l_nr;
- l_nr = l_max_found + 1;
- }
- else
- {
- return(l_max_found);
- }
+ l_nr = l_max_found + 1;
+ }
+ else
+ {
+ return(l_max_found);
+ }
}
}
-} /* end p_find_max_xanim_frame */
+} /* end p_find_max_xanim_frame */
static int
gap_lib_rename_frames(gint32 frame_from, gint32 frame_to, char *basename, char *ext)
@@ -574,8 +574,8 @@
if(l_max_found < 0)
{
global_errlist = g_strdup_printf(
- _("can't find any extracted frames,\n%s\nmaybe xanim has failed or was cancelled"),
- l_src_frame);
+ _("can't find any extracted frames,\n%s\nmaybe xanim has failed or was cancelled"),
+ l_src_frame);
return(-1);
}
@@ -595,53 +595,53 @@
if (strcmp(l_src_frame, l_dst_frame) != 0)
{
/* check overwrite if Destination frame already exsts */
- l_overwrite_mode = p_overwrite_dialog(l_dst_frame, l_overwrite_mode);
- if (l_overwrite_mode < 0)
- {
- global_errlist = g_strdup_printf(
- _("frames are not extracted, because overwrite of %s was cancelled"),
- l_dst_frame);
- return(-1);
- }
- else
- {
- g_remove(l_dst_frame);
- if (gap_lib_file_exists(l_dst_frame))
+ l_overwrite_mode = p_overwrite_dialog(l_dst_frame, l_overwrite_mode);
+ if (l_overwrite_mode < 0)
+ {
+ global_errlist = g_strdup_printf(
+ _("frames are not extracted, because overwrite of %s was cancelled"),
+ l_dst_frame);
+ return(-1);
+ }
+ else
+ {
+ g_remove(l_dst_frame);
+ if (gap_lib_file_exists(l_dst_frame))
{
- global_errlist = g_strdup_printf(
- _("failed to overwrite %s (check permissions ?)"),
- l_dst_frame);
- return(-1);
- }
- }
+ global_errlist = g_strdup_printf(
+ _("failed to overwrite %s (check permissions ?)"),
+ l_dst_frame);
+ return(-1);
+ }
+ }
if (l_use_mv)
- {
+ {
g_rename(l_src_frame, l_dst_frame);
- }
-
- if (!gap_lib_file_exists(l_dst_frame))
- {
- gap_lib_file_copy(l_src_frame, l_dst_frame);
- if (gap_lib_file_exists(l_dst_frame))
- {
+ }
+
+ if (!gap_lib_file_exists(l_dst_frame))
+ {
+ gap_lib_file_copy(l_src_frame, l_dst_frame);
+ if (gap_lib_file_exists(l_dst_frame))
+ {
l_use_mv = FALSE; /* if destination is on another device use copy-remove strategy */
- g_remove(l_src_frame);
- }
- else
- {
- global_errlist = g_strdup_printf(
- _("failed to write %s (check permissions ?)"),
- l_dst_frame);
- return(-1);
- }
- }
+ g_remove(l_src_frame);
+ }
+ else
+ {
+ global_errlist = g_strdup_printf(
+ _("failed to write %s (check permissions ?)"),
+ l_dst_frame);
+ return(-1);
+ }
+ }
}
l_frame_nr++;
if(l_max_found > 0) gimp_progress_update ((gdouble)l_frame_nr / (gdouble)l_max_found);
}
return(0);
-} /* end gap_lib_rename_frames */
+} /* end gap_lib_rename_frames */
static void
gap_lib_delete_frames(gint32 max_tries, gint32 frame_from, gint32 frame_to, char *ext)
@@ -665,17 +665,17 @@
if (gap_lib_file_exists(l_framename))
{
/* if xanim has already written the next frame
- * we can delete the previous (unwanted) frame now
- */
+ * we can delete the previous (unwanted) frame now
+ */
p_build_xanim_framename(l_framename, sizeof(l_framename), global_delete_number, ext);
- if(gap_debug) printf("delete frame: %s\n", l_framename);
- g_remove(l_framename);
+ if(gap_debug) printf("delete frame: %s\n", l_framename);
+ g_remove(l_framename);
- global_delete_number = l_next_number;
+ global_delete_number = l_next_number;
}
l_tries++;
}
-} /* end gap_lib_delete_frames */
+} /* end gap_lib_delete_frames */
static void
@@ -706,7 +706,7 @@
}
if(gap_debug) printf("poll ended on xanim pid: %d\n", (int)xanim_pid);
-} /* end p_poll */
+} /* end p_poll */
static int
@@ -803,17 +803,17 @@
return(10);
}
return (0); /* OK, xanim output looks like expected */
-} /* end p_check_xanim */
+} /* end p_check_xanim */
static pid_t
p_start_xanim_process(gint32 first_frame, gint32 last_frame,
char *filename,
- GapXAnimFormats Format,
- gint32 extract_video,
- gint32 extract_audio,
- gint32 jpeg_quality ,
- char *one_past_last_frame,
- gint32 run_xanim_asynchron)
+ GapXAnimFormats Format,
+ gint32 extract_video,
+ gint32 extract_audio,
+ gint32 jpeg_quality ,
+ char *one_past_last_frame,
+ gint32 run_xanim_asynchron)
{
gchar l_cmd[500];
gchar l_buf[40];
@@ -839,14 +839,14 @@
{
case XAENC_PPMRAW:
strcat(l_cmd, "+Ee ");
- break;
+ break;
case XAENC_JPEG:
g_snprintf(l_buf, sizeof(l_buf), "+Eq%d ", (int)jpeg_quality);
- strcat(l_cmd, l_buf);
- break;
+ strcat(l_cmd, l_buf);
+ break;
default:
strcat(l_cmd, "+Ee ");
- break;
+ break;
}
/* additional option "Pause after N Frames" is used,
@@ -877,24 +877,24 @@
l_fp = g_fopen(l_xanim_startscript, "w+");
if (l_fp != NULL)
{
- fprintf(l_fp, "#!/bin/sh\n");
- /* fprintf(l_fp, "(%s ; touch %s) &\n" */
- fprintf(l_fp, "%s & # ; touch %s) &\n"
+ fprintf(l_fp, "#!/bin/sh\n");
+ /* fprintf(l_fp, "(%s ; touch %s) &\n" */
+ fprintf(l_fp, "%s & # ; touch %s) &\n"
, l_cmd /* start xanim as background process */
- , one_past_last_frame /* and create a dummy frame when xanim is done */
- );
- fprintf(l_fp, "XANIM_PID=$!\n");
- fprintf(l_fp, "echo \"$XANIM_PID # XANIM_PID\"\n");
- fprintf(l_fp, "echo \"$XANIM_PID # XANIM_PID\" > \"%s\"\n", l_xanim_pidfile);
+ , one_past_last_frame /* and create a dummy frame when xanim is done */
+ );
+ fprintf(l_fp, "XANIM_PID=$!\n");
+ fprintf(l_fp, "echo \"$XANIM_PID # XANIM_PID\"\n");
+ fprintf(l_fp, "echo \"$XANIM_PID # XANIM_PID\" > \"%s\"\n", l_xanim_pidfile);
- /* we pass the xanim pid in a file,
+ /* we pass the xanim pid in a file,
* exitcodes are truncated to 8 bit
* by the system call
*/
- /* fprintf(l_fp, "exit $XANIM_PID\n"); */
- fclose(l_fp);
+ /* fprintf(l_fp, "exit $XANIM_PID\n"); */
+ fclose(l_fp);
- gap_file_chmod(l_xanim_startscript, GAP_FILE_MKDIR_MODE);
+ gap_file_chmod(l_xanim_startscript, GAP_FILE_MKDIR_MODE);
}
l_rc = system(l_xanim_startscript);
@@ -902,9 +902,9 @@
l_fp = g_fopen(l_xanim_pidfile, "r");
if (l_fp != NULL)
{
- fscanf(l_fp, "%d", &l_rc);
- fclose(l_fp);
- l_xanim_pid = (pid_t)l_rc;
+ fscanf(l_fp, "%d", &l_rc);
+ fclose(l_fp);
+ l_xanim_pid = (pid_t)l_rc;
}
g_remove(l_xanim_startscript);
@@ -925,18 +925,18 @@
}
return(l_xanim_pid);
-} /* end p_start_xanim_process */
+} /* end p_start_xanim_process */
#ifdef THIS_IS_A_COMMENT_EXEC_DID_NOT_WORK_AND_LEAVES_A_ZOMBIE_PROCESS
static pid_t
p_start_xanim_process_exec(gint32 first_frame, gint32 last_frame,
char *filename,
- GapXAnimFormats Format,
- gint32 extract_video,
- gint32 extract_audio,
- gint32 jpeg_quality
- )
+ GapXAnimFormats Format,
+ gint32 extract_video,
+ gint32 extract_audio,
+ gint32 jpeg_quality
+ )
{
char *args[20];
char l_buf[40];
@@ -966,14 +966,14 @@
{
case XAENC_PPMRAW:
args[l_idx] = g_strdup("+Ee");
- break;
+ break;
case XAENC_JPEG:
g_snprintf(l_buf, sizeof(l_buf), "+Eq%d", (int)jpeg_quality);
- args[l_idx] = g_strdup(l_buf);
- break;
+ args[l_idx] = g_strdup(l_buf);
+ break;
default:
args[l_idx] = g_strdup("+Ee");
- break;
+ break;
}
/* additional option "Pause after N Frames" is used,
@@ -1006,7 +1006,7 @@
}
return(l_xanim_pid);
-} /* end p_start_xanim_process */
+} /* end p_start_xanim_process */
#endif
@@ -1048,14 +1048,14 @@
l_rc = p_xanim_dialog (&first_frame,
&last_frame,
- filename, sizeof(filename),
- basename, sizeof(basename),
- &Format,
- &extract_video,
- &extract_audio,
- &jpeg_quality,
- &autoload,
- &run_xanim_asynchron);
+ filename, sizeof(filename),
+ basename, sizeof(basename),
+ &Format,
+ &extract_video,
+ &extract_audio,
+ &jpeg_quality,
+ &autoload,
+ &run_xanim_asynchron);
if(l_rc != 0)
@@ -1083,15 +1083,15 @@
case XAENC_PPMRAW:
strcpy(extension, "ppm");
strcpy(extension2, ".ppm");
- break;
+ break;
case XAENC_JPEG:
strcpy(extension, "jpg");
strcpy(extension2, ".jpg");
- break;
+ break;
default:
strcpy(extension, "ppm");
strcpy(extension2, ".xcf");
- break;
+ break;
}
p_build_xanim_framename(l_one_past_last_frame, sizeof(l_one_past_last_frame), last_frame +1 , extension);
@@ -1144,20 +1144,20 @@
*/
l_xanim_pid = p_start_xanim_process(first_frame, last_frame,
- filename,
+ filename,
Format,
- extract_video,
- extract_audio,
- jpeg_quality,
+ extract_video,
+ extract_audio,
+ jpeg_quality,
l_one_past_last_frame,
- run_xanim_asynchron);
+ run_xanim_asynchron);
if (l_xanim_pid == -1 )
{
global_errlist = g_strdup_printf(
_("could not start xanim process\n(program=%s)"),
global_xanim_prog );
- l_rc = -1;
+ l_rc = -1;
}
}
@@ -1176,8 +1176,8 @@
if (p_find_max_xanim_frame (first_frame, extension) < first_frame)
{
global_errlist = g_strdup_printf(
- _("can't find any extracted frames,\n"
- "xanim has failed or was cancelled"));
+ _("can't find any extracted frames,\n"
+ "xanim has failed or was cancelled"));
l_rc = -1;
}
else
@@ -1187,10 +1187,10 @@
p_dirname(l_dst_dir);
if (*l_dst_dir != '\0')
{
- if ( !g_file_test(l_dst_dir, G_FILE_TEST_IS_DIR) )
- {
+ if ( !g_file_test(l_dst_dir, G_FILE_TEST_IS_DIR) )
+ {
gap_file_mkdir (l_dst_dir, GAP_FILE_MKDIR_MODE);
- }
+ }
}
if(strcmp(extension, &extension2[1]) == 0)
@@ -1206,12 +1206,12 @@
if (l_input_dir_created_by_myself)
{
- if (strcmp(l_dst_dir, global_xanim_input_dir) != 0)
- {
+ if (strcmp(l_dst_dir, global_xanim_input_dir) != 0)
+ {
/* remove input dir with all files */
g_snprintf(l_cmd, sizeof(l_cmd), "rm -rf \"%s\"", global_xanim_input_dir);
system(l_cmd);
- }
+ }
}
g_free(l_dst_dir);
gimp_progress_update (1.0);
@@ -1239,9 +1239,9 @@
p_build_gap_framename(l_first_to_laod, sizeof(l_first_to_laod), first_frame, basename, &extension2[1]);
l_rc = gap_lib_load_image(l_first_to_laod);
- if(l_rc >= 0) gimp_display_new(l_rc);
+ if(l_rc >= 0) gimp_display_new(l_rc);
}
}
return(l_rc);
-} /* end gap_xanim_decode */
+} /* end gap_xanim_decode */
Modified: trunk/gap/gap_filter_codegen.c
==============================================================================
--- trunk/gap/gap_filter_codegen.c (original)
+++ trunk/gap/gap_filter_codegen.c Sun Apr 5 06:47:07 2009
@@ -99,11 +99,11 @@
l_ti = time(0L); /* Get UNIX time */
l_t = localtime(&l_ti); /* konvert time to tm struct */
g_snprintf(gendate, sizeof_gendate, "%02d.%02d.%02d %02d:%02d"
- , l_t->tm_mday
- , l_t->tm_mon + 1
- , l_t->tm_year
- , l_t->tm_hour
- , l_t->tm_min);
+ , l_t->tm_mday
+ , l_t->tm_mon + 1
+ , l_t->tm_year
+ , l_t->tm_hour
+ , l_t->tm_min);
}
@@ -183,16 +183,16 @@
* regarding a particular procedure.
*/
if (gimp_procedural_db_proc_info (proc_name,
- &l_proc_blurb,
- &l_proc_help,
- &l_proc_author,
- &l_proc_copyright,
- &l_proc_date,
- &l_proc_type,
- &l_nparams,
- &l_nreturn_vals,
- &l_params,
- &l_return_vals))
+ &l_proc_blurb,
+ &l_proc_help,
+ &l_proc_author,
+ &l_proc_copyright,
+ &l_proc_date,
+ &l_proc_type,
+ &l_nparams,
+ &l_nreturn_vals,
+ &l_params,
+ &l_return_vals))
{
p_clean_name(proc_name, &l_clean_proc_name[0]);
/* procedure found in PDB */
@@ -307,7 +307,7 @@
gap_codegen_gen_code_iterator(proc_name);
return l_rc;
-} /* gap_codegen_gen_code_iter_ALT */
+} /* gap_codegen_gen_code_iter_ALT */
gint gap_codegen_gen_forward_iter_ALT(char *proc_name)
{
@@ -375,16 +375,16 @@
* regarding a particular procedure.
*/
if (gimp_procedural_db_proc_info (proc_name,
- &l_proc_blurb,
- &l_proc_help,
- &l_proc_author,
- &l_proc_copyright,
- &l_proc_date,
- &l_proc_type,
- &l_nparams,
- &l_nreturn_vals,
- &l_params,
- &l_return_vals))
+ &l_proc_blurb,
+ &l_proc_help,
+ &l_proc_author,
+ &l_proc_copyright,
+ &l_proc_date,
+ &l_proc_type,
+ &l_nparams,
+ &l_nreturn_vals,
+ &l_params,
+ &l_return_vals))
{
p_clean_name(proc_name, &l_clean_proc_name[0]);
/* procedure found in PDB */
@@ -753,4 +753,4 @@
return l_rc;
-} /* gap_codegen_gen_code_iterator */
+} /* gap_codegen_gen_code_iterator */
Modified: trunk/gap/gap_filter_foreach.c
==============================================================================
--- trunk/gap/gap_filter_foreach.c (original)
+++ trunk/gap/gap_filter_foreach.c Sun Apr 5 06:47:07 2009
@@ -88,7 +88,7 @@
static void p_gdisplays_update_full(gint32 image_id);
static gint p_pitstop(GimpRunMode run_mode, char *plugin_name, gint text_flag,
char *step_backup_file, gint len_step_backup_file,
- gint32 layer_idx);
+ gint32 layer_idx);
static void p_visibilty_restore(gint32 image_id, gint nlayers, int *visible_tab, char *plugin_name);
static gint32 p_get_indexed_layerid(gint32 image_id, gint *nlayers, gint32 idx, char *plugin_name);
@@ -115,7 +115,7 @@
static gint
p_pitstop(GimpRunMode run_mode, char *plugin_name, gint text_flag,
char *step_backup_file, gint len_step_backup_file,
- gint32 layer_idx)
+ gint32 layer_idx)
{
const gchar *l_env;
gchar *l_msg;
@@ -130,7 +130,7 @@
gap_arr_arg_init(&l_argv[0], GAP_ARR_WGT_FILESEL);
l_argv[0].label_txt = _("Backup to file");
- l_argv[0].entry_width = 140; /* pixel */
+ l_argv[0].entry_width = 140; /* pixel */
l_argv[0].help_txt = _("Make backup of the image after each step");
l_argv[0].text_buf_len = len_step_backup_file;
l_argv[0].text_buf_ret = step_backup_file;
@@ -177,7 +177,7 @@
}
return 0; /* continue without question */
-} /* end p_pitstop */
+} /* end p_pitstop */
@@ -400,9 +400,9 @@
/* optional dialog between both calls (to see the effect of 1.call) */
if(p_pitstop(run_mode, canonical_plugin_name, 0,
- l_step_backup_file, sizeof(l_step_backup_file), 0
- )
- < 0)
+ l_step_backup_file, sizeof(l_step_backup_file), 0
+ )
+ < 0)
{
if(gap_debug) printf("TERMINATED: by pitstop dialog\n");
/* restore the visibility of all layers */
@@ -489,11 +489,11 @@
if(l_rc < 0) break;
if(l_pit_rc > 0) /* last pit_rc was a skip, so ask again for the next layer */
- {
+ {
l_pit_rc = p_pitstop(run_mode, canonical_plugin_name, 1,
- l_step_backup_file, sizeof(l_step_backup_file),
- l_idx );
- }
+ l_step_backup_file, sizeof(l_step_backup_file),
+ l_idx );
+ }
if(l_pit_rc < 0)
{
if(gap_debug) printf("TERMINATED: by pitstop dialog\n");
@@ -538,17 +538,17 @@
if(l_rc < 0) break;
if(l_pit_rc == 0) /* 0 == continue without further dialogs */
- {
+ {
/* call the plugin itself with runmode RUN_WITH_LAST_VALUES */
l_rc = gap_filt_pdb_call_plugin(canonical_plugin_name, image_id, l_layer_id, GIMP_RUN_WITH_LAST_VALS);
/* check if to save each step to backup file */
- if((l_step_backup_file[0] != '\0') && (l_step_backup_file[0] != ' '))
- {
- printf ("Saving image to backupfile:%s step = %d\n",
- l_step_backup_file, (int)l_idx);
- gap_filt_pdb_save_xcf(image_id, l_step_backup_file);
- }
- }
+ if((l_step_backup_file[0] != '\0') && (l_step_backup_file[0] != ' '))
+ {
+ printf ("Saving image to backupfile:%s step = %d\n",
+ l_step_backup_file, (int)l_idx);
+ gap_filt_pdb_save_xcf(image_id, l_step_backup_file);
+ }
+ }
if(run_mode == GIMP_RUN_INTERACTIVE)
{
@@ -556,7 +556,7 @@
gimp_progress_update (l_percentage);
}
- } /* end for */
+ } /* end for */
}
@@ -572,7 +572,7 @@
if(l_plugin_iterator != NULL) g_free(l_plugin_iterator);
return l_rc;
-} /* end p_foreach_multilayer2 */
+} /* end p_foreach_multilayer2 */
/* ------------------------
@@ -595,8 +595,8 @@
gap_filt_pdb_constraint_proc_sel1,
gap_filt_pdb_constraint_proc_sel2,
&l_browser_result,
- image_id,
- GAP_DB_BROWSER_FILTERALL_HELP_ID)
+ image_id,
+ GAP_DB_BROWSER_FILTERALL_HELP_ID)
< 0)
{
if(gap_debug) printf("DEBUG: gap_db_browser_dialog cancelled\n");
@@ -612,7 +612,7 @@
return(p_foreach_multilayer(run_mode,
image_id,
- plugin_name,
- apply_mode ));
+ plugin_name,
+ apply_mode ));
}
Modified: trunk/gap/gap_filter_iterators.c
==============================================================================
--- trunk/gap/gap_filter_iterators.c (original)
+++ trunk/gap/gap_filter_iterators.c Sun Apr 5 06:47:07 2009
@@ -156,11 +156,11 @@
}
typedef struct {
- guchar color[3];
+ guchar color[3];
} t_color;
typedef struct {
- gint color[3];
+ gint color[3];
} t_gint_color;
typedef struct t_CML_PARAM
@@ -169,8 +169,8 @@
gint composition;
gint arrange;
gint cyclic_range;
- gdouble mod_rate; /* diff / old-value */
- gdouble env_sensitivity; /* self-diff : env-diff */
+ gdouble mod_rate; /* diff / old-value */
+ gdouble env_sensitivity; /* self-diff : env-diff */
gint diffusion_dist;
gdouble ch_sensitivity;
gint range_num;
@@ -1703,141 +1703,141 @@
*/
static t_iter_ALT_tab g_iter_ALT_tab[] =
{
- { "plug-in-alienmap2", p_plug_in_alienmap2_iter_ALT }
- , { "plug-in-cml-explorer", p_plug_in_cml_explorer_iter_ALT }
- , { "plug-in-CentralReflection", p_plug_in_CentralReflection_iter_ALT }
- , { "plug-in-Twist", p_plug_in_Twist_iter_ALT }
-/*, { "plug-in-alienmap", p_plug_in_alienmap_iter_ALT } */
-/*, { "plug-in-align-layers", p_plug_in_align_layers_iter_ALT } */
- , { "plug-in-alpha2color", p_plug_in_alpha2color_iter_ALT }
- , { "plug-in-anamorphose", p_plug_in_anamorphose_iter_ALT }
-/*, { "plug-in-animationoptimize", p_plug_in_animationoptimize_iter_ALT } */
-/*, { "plug-in-animationplay", p_plug_in_animationplay_iter_ALT } */
-/*, { "plug-in-animationunoptimize", p_plug_in_animationunoptimize_iter_ALT } */
- , { "plug-in-apply-canvas", p_plug_in_apply_canvas_iter_ALT }
- , { "plug-in-applylens", p_plug_in_applylens_iter_ALT }
-/*, { "plug-in-autocrop", p_plug_in_autocrop_iter_ALT } */
-/*, { "plug-in-autostretch-hsv", p_plug_in_autostretch_hsv_iter_ALT } */
- , { "plug-in-blinds", p_plug_in_blinds_iter_ALT }
-/*, { "plug-in-blur", p_plug_in_blur_iter_ALT } */
- , { "plug-in-blur2", p_plug_in_blur2_iter_ALT }
-/*, { "plug-in-blur-randomize", p_plug_in_blur_randomize_iter_ALT } */
- , { "plug-in-borderaverage", p_plug_in_borderaverage_iter_ALT }
- , { "plug-in-bump-map", p_plug_in_bump_map_iter_ALT }
-/*, { "plug-in-c-astretch", p_plug_in_c_astretch_iter_ALT } */
- , { "plug-in-cartoon", p_plug_in_cartoon_iter_ALT }
- , { "plug-in-checkerboard", p_plug_in_checkerboard_iter_ALT }
-/*, { "plug-in-color-adjust", p_plug_in_color_adjust_iter_ALT } */
- , { "plug-in-color-map", p_plug_in_color_map_iter_ALT }
- , { "plug-in-colorify", p_plug_in_colorify_iter_ALT }
- , { "plug-in-colortoalpha", p_plug_in_colortoalpha_iter_ALT }
- , { "plug-in-colors-channel-mixer", p_plug_in_colors_channel_mixer_iter_ALT }
-/*, { "plug-in-compose", p_plug_in_compose_iter_ALT } */
- , { "plug-in-convmatrix", p_plug_in_convmatrix_iter_ALT }
- , { "plug-in-cubism", p_plug_in_cubism_iter_ALT }
-/*, { "plug-in-decompose", p_plug_in_decompose_iter_ALT } */
-/*, { "plug-in-deinterlace", p_plug_in_deinterlace_iter_ALT } */
- , { "plug-in-depth-merge", p_plug_in_depth_merge_iter_ALT }
- , { "plug-in-despeckle", p_plug_in_despeckle_iter_ALT }
- , { "plug-in-destripe", p_plug_in_destripe_iter_ALT }
- , { "plug-in-diffraction", p_plug_in_diffraction_iter_ALT }
- , { "plug-in-displace", p_plug_in_displace_iter_ALT }
-/*, { "plug-in-ditherize", p_plug_in_ditherize_iter_ALT } */
- , { "plug-in-dog", p_plug_in_dog_iter_ALT }
- , { "plug-in-edge", p_plug_in_edge_iter_ALT }
- , { "plug-in-emboss", p_plug_in_emboss_iter_ALT }
- , { "plug-in-encript", p_plug_in_encript_iter_ALT }
- , { "plug-in-engrave", p_plug_in_engrave_iter_ALT }
- , { "plug-in-exchange", p_plug_in_exchange_iter_ALT }
-/*, { "plug-in-export-palette", p_plug_in_export_palette_iter_ALT } */
- , { "plug-in-figures", p_plug_in_figures_iter_ALT }
-/*, { "plug-in-film", p_plug_in_film_iter_ALT } */
-/*, { "plug-in-filter-pack", p_plug_in_filter_pack_iter_ALT } */
- , { "plug-in-flame", p_plug_in_flame_iter_ALT }
- , { "plug-in-flarefx", p_plug_in_flarefx_iter_ALT }
- , { "plug-in-fractal-trace", p_plug_in_fractal_trace_iter_ALT }
- , { "plug-in-gauss", p_plug_in_gauss_iter_ALT }
-/*, { "plug-in-gfig", p_plug_in_gfig_iter_ALT } */
- , { "plug-in-gflare", p_plug_in_gflare_iter_ALT }
- , { "plug-in-gimpressionist", p_plug_in_gimpressionist_iter_ALT }
- , { "plug-in-glasstile", p_plug_in_glasstile_iter_ALT }
-/*, { "plug-in-gradmap", p_plug_in_gradmap_iter_ALT } */
- , { "plug-in-grid", p_plug_in_grid_iter_ALT }
-/*, { "plug-in-guillotine", p_plug_in_guillotine_iter_ALT } */
- , { "plug-in-holes", p_plug_in_holes_iter_ALT }
-/*, { "plug-in-hot", p_plug_in_hot_iter_ALT } */
-/*, { "plug-in-ifs-compose", p_plug_in_ifs_compose_iter_ALT } */
- , { "plug-in-illusion", p_plug_in_illusion_iter_ALT }
-/*, { "plug-in-image-rot270", p_plug_in_image_rot270_iter_ALT } */
-/*, { "plug-in-image-rot90", p_plug_in_image_rot90_iter_ALT } */
-/*, { "plug-in-iwarp", p_plug_in_iwarp_iter_ALT } */
- , { "plug-in-jigsaw", p_plug_in_jigsaw_iter_ALT }
- , { "plug-in-julia", p_plug_in_julia_iter_ALT }
-/*, { "plug-in-laplace", p_plug_in_laplace_iter_ALT } */
-/*, { "plug-in-layer-rot270", p_plug_in_layer_rot270_iter_ALT } */
-/*, { "plug-in-layer-rot90", p_plug_in_layer_rot90_iter_ALT } */
-/*, { "plug-in-layers-import", p_plug_in_layers_import_iter_ALT } */
- , { "plug-in-lic", p_plug_in_lic_iter_ALT }
- , { "plug-in-lighting", p_plug_in_lighting_iter_ALT }
- , { "plug-in-magic-eye", p_plug_in_magic_eye_iter_ALT }
-/*, { "plug-in-mail-image", p_plug_in_mail_image_iter_ALT } */
- , { "plug-in-mandelbrot", p_plug_in_mandelbrot_iter_ALT }
- , { "plug-in-map-object", p_plug_in_map_object_iter_ALT }
-/*, { "plug-in-max-rgb", p_plug_in_max_rgb_iter_ALT } */
- , { "plug-in-maze", p_plug_in_maze_iter_ALT }
- , { "plug-in-mblur", p_plug_in_mblur_iter_ALT }
- , { "plug-in-mosaic", p_plug_in_mosaic_iter_ALT }
- , { "plug-in-neon", p_plug_in_neon_iter_ALT }
- , { "plug-in-newsprint", p_plug_in_newsprint_iter_ALT }
- , { "plug-in-nlfilt", p_plug_in_nlfilt_iter_ALT }
- , { "plug-in-rgb-noise", p_plug_in_noisify_iter_ALT }
-/*, { "plug-in-normalize", p_plug_in_normalize_iter_ALT } */
- , { "plug-in-nova", p_plug_in_nova_iter_ALT }
- , { "plug-in-oilify", p_plug_in_oilify_iter_ALT }
- , { "plug-in-pagecurl", p_plug_in_pagecurl_iter_ALT }
- , { "plug-in-papertile", p_plug_in_papertile_iter_ALT }
- , { "plug-in-photocopy", p_plug_in_photocopy_iter_ALT }
- , { "plug-in-pixelize", p_plug_in_pixelize_iter_ALT }
- , { "plug-in-plasma", p_plug_in_plasma_iter_ALT }
- , { "plug-in-polar-coords", p_plug_in_polar_coords_iter_ALT }
-/*, { "plug-in-qbist", p_plug_in_qbist_iter_ALT } */
- , { "plug-in-randomize", p_plug_in_randomize_iter_ALT }
- , { "plug-in-randomize-hurl", p_plug_in_randomize_hurl_iter_ALT }
- , { "plug-in-randomize-pick", p_plug_in_randomize_pick_iter_ALT }
- , { "plug-in-randomize-slur", p_plug_in_randomize_slur_iter_ALT }
- , { "plug-in-refract", p_plug_in_refract_iter_ALT }
- , { "plug-in-retinex", p_plug_in_retinex_iter_ALT }
- , { "plug-in-ripple", p_plug_in_ripple_iter_ALT }
-/*, { "plug-in-rotate", p_plug_in_rotate_iter_ALT } */
- , { "plug-in-sample-colorize", p_plug_in_sample_colorize_iter_ALT }
- , { "plug-in-hsv-noise", p_plug_in_scatter_hsv_iter_ALT }
- , { "plug-in-sel-gauss", p_plug_in_sel_gauss_iter_ALT }
-/*, { "plug-in-semiflatten", p_plug_in_semiflatten_iter_ALT } */
- , { "plug-in-sharpen", p_plug_in_sharpen_iter_ALT }
- , { "plug-in-shift", p_plug_in_shift_iter_ALT }
- , { "plug-in-sinus", p_plug_in_sinus_iter_ALT }
- , { "plug-in-small-tiles", p_plug_in_small_tiles_iter_ALT }
-/*, { "plug-in-smooth-palette", p_plug_in_smooth_palette_iter_ALT } */
- , { "plug-in-sobel", p_plug_in_sobel_iter_ALT }
- , { "plug-in-softglow", p_plug_in_softglow_iter_ALT }
- , { "plug-in-solid-noise", p_plug_in_solid_noise_iter_ALT }
- , { "plug-in-sparkle", p_plug_in_sparkle_iter_ALT }
- , { "plug-in-spread", p_plug_in_spread_iter_ALT }
- , { "plug-in-struc", p_plug_in_struc_iter_ALT }
-/*, { "plug-in-the-egg", p_plug_in_the_egg_iter_ALT } */
-/*, { "plug-in-threshold-alpha", p_plug_in_threshold_alpha_iter_ALT } */
-/*, { "plug-in-tile", p_plug_in_tile_iter_ALT } */
- , { "plug-in-tileit", p_plug_in_tileit_iter_ALT }
- , { "plug-in-universal-filter", p_plug_in_universal_filter_iter_ALT }
- , { "plug-in-unsharp-mask", p_plug_in_unsharp_mask_iter_ALT }
- , { "plug-in-video", p_plug_in_video_iter_ALT }
-/*, { "plug-in-vinvert", p_plug_in_vinvert_iter_ALT } */
- , { "plug-in-vpropagate", p_plug_in_vpropagate_iter_ALT }
- , { "plug-in-warp", p_plug_in_warp_iter_ALT }
- , { "plug-in-waves", p_plug_in_waves_iter_ALT }
- , { "plug-in-whirl-pinch", p_plug_in_whirl_pinch_iter_ALT }
- , { "plug-in-wind", p_plug_in_wind_iter_ALT }
-/*, { "plug-in-zealouscrop", p_plug_in_zealouscrop_iter_ALT } */
+ { "plug-in-alienmap2", p_plug_in_alienmap2_iter_ALT }
+ , { "plug-in-cml-explorer", p_plug_in_cml_explorer_iter_ALT }
+ , { "plug-in-CentralReflection", p_plug_in_CentralReflection_iter_ALT }
+ , { "plug-in-Twist", p_plug_in_Twist_iter_ALT }
+/*, { "plug-in-alienmap", p_plug_in_alienmap_iter_ALT } */
+/*, { "plug-in-align-layers", p_plug_in_align_layers_iter_ALT } */
+ , { "plug-in-alpha2color", p_plug_in_alpha2color_iter_ALT }
+ , { "plug-in-anamorphose", p_plug_in_anamorphose_iter_ALT }
+/*, { "plug-in-animationoptimize", p_plug_in_animationoptimize_iter_ALT } */
+/*, { "plug-in-animationplay", p_plug_in_animationplay_iter_ALT } */
+/*, { "plug-in-animationunoptimize", p_plug_in_animationunoptimize_iter_ALT } */
+ , { "plug-in-apply-canvas", p_plug_in_apply_canvas_iter_ALT }
+ , { "plug-in-applylens", p_plug_in_applylens_iter_ALT }
+/*, { "plug-in-autocrop", p_plug_in_autocrop_iter_ALT } */
+/*, { "plug-in-autostretch-hsv", p_plug_in_autostretch_hsv_iter_ALT } */
+ , { "plug-in-blinds", p_plug_in_blinds_iter_ALT }
+/*, { "plug-in-blur", p_plug_in_blur_iter_ALT } */
+ , { "plug-in-blur2", p_plug_in_blur2_iter_ALT }
+/*, { "plug-in-blur-randomize", p_plug_in_blur_randomize_iter_ALT } */
+ , { "plug-in-borderaverage", p_plug_in_borderaverage_iter_ALT }
+ , { "plug-in-bump-map", p_plug_in_bump_map_iter_ALT }
+/*, { "plug-in-c-astretch", p_plug_in_c_astretch_iter_ALT } */
+ , { "plug-in-cartoon", p_plug_in_cartoon_iter_ALT }
+ , { "plug-in-checkerboard", p_plug_in_checkerboard_iter_ALT }
+/*, { "plug-in-color-adjust", p_plug_in_color_adjust_iter_ALT } */
+ , { "plug-in-color-map", p_plug_in_color_map_iter_ALT }
+ , { "plug-in-colorify", p_plug_in_colorify_iter_ALT }
+ , { "plug-in-colortoalpha", p_plug_in_colortoalpha_iter_ALT }
+ , { "plug-in-colors-channel-mixer", p_plug_in_colors_channel_mixer_iter_ALT }
+/*, { "plug-in-compose", p_plug_in_compose_iter_ALT } */
+ , { "plug-in-convmatrix", p_plug_in_convmatrix_iter_ALT }
+ , { "plug-in-cubism", p_plug_in_cubism_iter_ALT }
+/*, { "plug-in-decompose", p_plug_in_decompose_iter_ALT } */
+/*, { "plug-in-deinterlace", p_plug_in_deinterlace_iter_ALT } */
+ , { "plug-in-depth-merge", p_plug_in_depth_merge_iter_ALT }
+ , { "plug-in-despeckle", p_plug_in_despeckle_iter_ALT }
+ , { "plug-in-destripe", p_plug_in_destripe_iter_ALT }
+ , { "plug-in-diffraction", p_plug_in_diffraction_iter_ALT }
+ , { "plug-in-displace", p_plug_in_displace_iter_ALT }
+/*, { "plug-in-ditherize", p_plug_in_ditherize_iter_ALT } */
+ , { "plug-in-dog", p_plug_in_dog_iter_ALT }
+ , { "plug-in-edge", p_plug_in_edge_iter_ALT }
+ , { "plug-in-emboss", p_plug_in_emboss_iter_ALT }
+ , { "plug-in-encript", p_plug_in_encript_iter_ALT }
+ , { "plug-in-engrave", p_plug_in_engrave_iter_ALT }
+ , { "plug-in-exchange", p_plug_in_exchange_iter_ALT }
+/*, { "plug-in-export-palette", p_plug_in_export_palette_iter_ALT } */
+ , { "plug-in-figures", p_plug_in_figures_iter_ALT }
+/*, { "plug-in-film", p_plug_in_film_iter_ALT } */
+/*, { "plug-in-filter-pack", p_plug_in_filter_pack_iter_ALT } */
+ , { "plug-in-flame", p_plug_in_flame_iter_ALT }
+ , { "plug-in-flarefx", p_plug_in_flarefx_iter_ALT }
+ , { "plug-in-fractal-trace", p_plug_in_fractal_trace_iter_ALT }
+ , { "plug-in-gauss", p_plug_in_gauss_iter_ALT }
+/*, { "plug-in-gfig", p_plug_in_gfig_iter_ALT } */
+ , { "plug-in-gflare", p_plug_in_gflare_iter_ALT }
+ , { "plug-in-gimpressionist", p_plug_in_gimpressionist_iter_ALT }
+ , { "plug-in-glasstile", p_plug_in_glasstile_iter_ALT }
+/*, { "plug-in-gradmap", p_plug_in_gradmap_iter_ALT } */
+ , { "plug-in-grid", p_plug_in_grid_iter_ALT }
+/*, { "plug-in-guillotine", p_plug_in_guillotine_iter_ALT } */
+ , { "plug-in-holes", p_plug_in_holes_iter_ALT }
+/*, { "plug-in-hot", p_plug_in_hot_iter_ALT } */
+/*, { "plug-in-ifs-compose", p_plug_in_ifs_compose_iter_ALT } */
+ , { "plug-in-illusion", p_plug_in_illusion_iter_ALT }
+/*, { "plug-in-image-rot270", p_plug_in_image_rot270_iter_ALT } */
+/*, { "plug-in-image-rot90", p_plug_in_image_rot90_iter_ALT } */
+/*, { "plug-in-iwarp", p_plug_in_iwarp_iter_ALT } */
+ , { "plug-in-jigsaw", p_plug_in_jigsaw_iter_ALT }
+ , { "plug-in-julia", p_plug_in_julia_iter_ALT }
+/*, { "plug-in-laplace", p_plug_in_laplace_iter_ALT } */
+/*, { "plug-in-layer-rot270", p_plug_in_layer_rot270_iter_ALT } */
+/*, { "plug-in-layer-rot90", p_plug_in_layer_rot90_iter_ALT } */
+/*, { "plug-in-layers-import", p_plug_in_layers_import_iter_ALT } */
+ , { "plug-in-lic", p_plug_in_lic_iter_ALT }
+ , { "plug-in-lighting", p_plug_in_lighting_iter_ALT }
+ , { "plug-in-magic-eye", p_plug_in_magic_eye_iter_ALT }
+/*, { "plug-in-mail-image", p_plug_in_mail_image_iter_ALT } */
+ , { "plug-in-mandelbrot", p_plug_in_mandelbrot_iter_ALT }
+ , { "plug-in-map-object", p_plug_in_map_object_iter_ALT }
+/*, { "plug-in-max-rgb", p_plug_in_max_rgb_iter_ALT } */
+ , { "plug-in-maze", p_plug_in_maze_iter_ALT }
+ , { "plug-in-mblur", p_plug_in_mblur_iter_ALT }
+ , { "plug-in-mosaic", p_plug_in_mosaic_iter_ALT }
+ , { "plug-in-neon", p_plug_in_neon_iter_ALT }
+ , { "plug-in-newsprint", p_plug_in_newsprint_iter_ALT }
+ , { "plug-in-nlfilt", p_plug_in_nlfilt_iter_ALT }
+ , { "plug-in-rgb-noise", p_plug_in_noisify_iter_ALT }
+/*, { "plug-in-normalize", p_plug_in_normalize_iter_ALT } */
+ , { "plug-in-nova", p_plug_in_nova_iter_ALT }
+ , { "plug-in-oilify", p_plug_in_oilify_iter_ALT }
+ , { "plug-in-pagecurl", p_plug_in_pagecurl_iter_ALT }
+ , { "plug-in-papertile", p_plug_in_papertile_iter_ALT }
+ , { "plug-in-photocopy", p_plug_in_photocopy_iter_ALT }
+ , { "plug-in-pixelize", p_plug_in_pixelize_iter_ALT }
+ , { "plug-in-plasma", p_plug_in_plasma_iter_ALT }
+ , { "plug-in-polar-coords", p_plug_in_polar_coords_iter_ALT }
+/*, { "plug-in-qbist", p_plug_in_qbist_iter_ALT } */
+ , { "plug-in-randomize", p_plug_in_randomize_iter_ALT }
+ , { "plug-in-randomize-hurl", p_plug_in_randomize_hurl_iter_ALT }
+ , { "plug-in-randomize-pick", p_plug_in_randomize_pick_iter_ALT }
+ , { "plug-in-randomize-slur", p_plug_in_randomize_slur_iter_ALT }
+ , { "plug-in-refract", p_plug_in_refract_iter_ALT }
+ , { "plug-in-retinex", p_plug_in_retinex_iter_ALT }
+ , { "plug-in-ripple", p_plug_in_ripple_iter_ALT }
+/*, { "plug-in-rotate", p_plug_in_rotate_iter_ALT } */
+ , { "plug-in-sample-colorize", p_plug_in_sample_colorize_iter_ALT }
+ , { "plug-in-hsv-noise", p_plug_in_scatter_hsv_iter_ALT }
+ , { "plug-in-sel-gauss", p_plug_in_sel_gauss_iter_ALT }
+/*, { "plug-in-semiflatten", p_plug_in_semiflatten_iter_ALT } */
+ , { "plug-in-sharpen", p_plug_in_sharpen_iter_ALT }
+ , { "plug-in-shift", p_plug_in_shift_iter_ALT }
+ , { "plug-in-sinus", p_plug_in_sinus_iter_ALT }
+ , { "plug-in-small-tiles", p_plug_in_small_tiles_iter_ALT }
+/*, { "plug-in-smooth-palette", p_plug_in_smooth_palette_iter_ALT } */
+ , { "plug-in-sobel", p_plug_in_sobel_iter_ALT }
+ , { "plug-in-softglow", p_plug_in_softglow_iter_ALT }
+ , { "plug-in-solid-noise", p_plug_in_solid_noise_iter_ALT }
+ , { "plug-in-sparkle", p_plug_in_sparkle_iter_ALT }
+ , { "plug-in-spread", p_plug_in_spread_iter_ALT }
+ , { "plug-in-struc", p_plug_in_struc_iter_ALT }
+/*, { "plug-in-the-egg", p_plug_in_the_egg_iter_ALT } */
+/*, { "plug-in-threshold-alpha", p_plug_in_threshold_alpha_iter_ALT } */
+/*, { "plug-in-tile", p_plug_in_tile_iter_ALT } */
+ , { "plug-in-tileit", p_plug_in_tileit_iter_ALT }
+ , { "plug-in-universal-filter", p_plug_in_universal_filter_iter_ALT }
+ , { "plug-in-unsharp-mask", p_plug_in_unsharp_mask_iter_ALT }
+ , { "plug-in-video", p_plug_in_video_iter_ALT }
+/*, { "plug-in-vinvert", p_plug_in_vinvert_iter_ALT } */
+ , { "plug-in-vpropagate", p_plug_in_vpropagate_iter_ALT }
+ , { "plug-in-warp", p_plug_in_warp_iter_ALT }
+ , { "plug-in-waves", p_plug_in_waves_iter_ALT }
+ , { "plug-in-whirl-pinch", p_plug_in_whirl_pinch_iter_ALT }
+ , { "plug-in-wind", p_plug_in_wind_iter_ALT }
+/*, { "plug-in-zealouscrop", p_plug_in_zealouscrop_iter_ALT } */
}; /* end g_iter_ALT_tab */
@@ -1869,16 +1869,16 @@
l_blurb_text = g_strdup_printf("This procedure calculates the modified values for one iterationstep for the call of %s", name);
gimp_install_procedure(l_iter_proc_name,
- l_blurb_text,
- "",
- "Wolfgang Hofer",
- "Wolfgang Hofer",
- "Nov. 2007",
- NULL, /* do not appear in menus */
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_iter), nreturn_vals,
- args_iter, return_vals);
+ l_blurb_text,
+ "",
+ "Wolfgang Hofer",
+ "Wolfgang Hofer",
+ "Nov. 2007",
+ NULL, /* do not appear in menus */
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_iter), nreturn_vals,
+ args_iter, return_vals);
g_free(l_iter_proc_name);
g_free(l_blurb_text);
Modified: trunk/gap/gap_filter_main.c
==============================================================================
--- trunk/gap/gap_filter_main.c (original)
+++ trunk/gap/gap_filter_main.c Sun Apr 5 06:47:07 2009
@@ -75,9 +75,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -117,7 +117,7 @@
gimp_plugin_domain_register (GETTEXT_PACKAGE, LOCALEDIR);
gimp_install_procedure(PLUG_IN_NAME_ANIMFILTER,
- "This plugin calls another plugin for each layer of an image, "
+ "This plugin calls another plugin for each layer of an image, "
"optional varying its settings (to produce animated effects). "
"The called plugin must work on a single drawable and must be "
"able to run in runmode GIMP_RUN_WITH_LAST_VALS and using gimp_set_data "
@@ -129,37 +129,37 @@
"But the selceted plug-in (in this case via parameter plugin_name) is called in "
"interactive runmode one time or two times if varying parameter is not 0. "
"Those interactive calls are done regardless what runmode is specified here.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Filter all Layers..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_foreach), nreturn_vals,
- args_foreach, return_vals);
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Filter all Layers..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_foreach), nreturn_vals,
+ args_foreach, return_vals);
/* ------------------ Common Iterator ------------------------------ */
gimp_install_procedure(GIMP_PLUGIN_GAP_COMMON_ITER,
- "This procedure calculates the modified values in the LAST_VALUES buffer named by plugin_name for one iterationstep",
- "",
- "Wolfgang Hofer",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_com_iter), nreturn_vals,
- args_com_iter, return_vals);
+ "This procedure calculates the modified values in the LAST_VALUES buffer named by plugin_name for one iterationstep",
+ "",
+ "Wolfgang Hofer",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_com_iter), nreturn_vals,
+ args_com_iter, return_vals);
/* ------------------ ALTernative Iterators ------------------------------ */
gimp_plugin_menu_register (PLUG_IN_NAME_ANIMFILTER, N_("<Image>/Filters/"));
gap_query_iterators_ALT();
-
-} /* end query */
+
+} /* end query */
static void
Modified: trunk/gap/gap_filter_pdb.c
==============================================================================
--- trunk/gap/gap_filter_pdb.c (original)
+++ trunk/gap/gap_filter_pdb.c Sun Apr 5 06:47:07 2009
@@ -105,20 +105,20 @@
/* query for plugin_name to get its argument types */
if (!gimp_procedural_db_proc_info (plugin_name,
- &l_proc_blurb,
- &l_proc_help,
- &l_proc_author,
- &l_proc_copyright,
- &l_proc_date,
- &l_proc_type,
- &l_nparams,
- &l_nreturn_vals,
- &l_params,
- &l_return_vals))
+ &l_proc_blurb,
+ &l_proc_help,
+ &l_proc_author,
+ &l_proc_copyright,
+ &l_proc_date,
+ &l_proc_type,
+ &l_nparams,
+ &l_nreturn_vals,
+ &l_params,
+ &l_return_vals))
{
printf("ERROR: Plugin not available, Name was %s\n", plugin_name);
return -1;
- }
+ }
/* construct the procedures arguments */
l_argv = g_new (GimpParam, l_nparams);
@@ -212,13 +212,13 @@
* the drawable is ignored. (we can supply a dummy value)
*/
l_params = gimp_run_procedure ("gimp_xcf_save",
- &l_retvals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_DRAWABLE, 0,
- GIMP_PDB_STRING, sav_name,
- GIMP_PDB_STRING, sav_name, /* raw name ? */
- GIMP_PDB_END);
+ &l_retvals,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_IMAGE, image_id,
+ GIMP_PDB_DRAWABLE, 0,
+ GIMP_PDB_STRING, sav_name,
+ GIMP_PDB_STRING, sav_name, /* raw name ? */
+ GIMP_PDB_END);
l_rc = -1;
if (l_params[0].data.d_status == GIMP_PDB_SUCCESS)
{
@@ -325,16 +325,16 @@
* regarding a particular procedure.
*/
if (gimp_procedural_db_proc_info (proc_name,
- &l_proc_blurb,
- &l_proc_help,
- &l_proc_author,
- &l_proc_copyright,
- &l_proc_date,
- &l_proc_type,
- &l_nparams,
- &l_nreturn_vals,
- &l_params,
- &l_return_vals))
+ &l_proc_blurb,
+ &l_proc_help,
+ &l_proc_author,
+ &l_proc_copyright,
+ &l_proc_date,
+ &l_proc_type,
+ &l_nparams,
+ &l_nreturn_vals,
+ &l_params,
+ &l_return_vals))
{
/* procedure found in PDB */
if(gap_debug)
@@ -357,9 +357,9 @@
/* check if plugin can be a typical one, that works on one drawable */
if (l_proc_type != GIMP_PLUGIN) { l_rc = -1; break; }
if (l_nparams < 3) { l_rc = -1; break; }
- if (l_params[0].type != GIMP_PDB_INT32) { l_rc = -1; break; }
- if (l_params[1].type != GIMP_PDB_IMAGE) { l_rc = -1; break; }
- if (l_params[2].type != GIMP_PDB_DRAWABLE) { l_rc = -1; break; }
+ if (l_params[0].type != GIMP_PDB_INT32) { l_rc = -1; break; }
+ if (l_params[1].type != GIMP_PDB_IMAGE) { l_rc = -1; break; }
+ if (l_params[2].type != GIMP_PDB_DRAWABLE) { l_rc = -1; break; }
break;
default:
break;
@@ -381,7 +381,7 @@
return l_rc;
-} /* end gap_filt_pdb_procedure_available */
+} /* end gap_filt_pdb_procedure_available */
/* ------------------------
@@ -531,7 +531,7 @@
g_free(canonical_name);
return (l_plugin_iterator);
-} /* end gap_filt_pdb_get_iterator_proc */
+} /* end gap_filt_pdb_get_iterator_proc */
/* ---------------------------------
@@ -566,8 +566,8 @@
case GIMP_RGB:
case GIMP_GRAY:
case GIMP_INDEXED:
- l_rc = 1;
- break;
+ l_rc = 1;
+ break;
}
return l_rc;
}
Modified: trunk/gap/gap_fmac_main.c
==============================================================================
--- trunk/gap/gap_fmac_main.c (original)
+++ trunk/gap/gap_fmac_main.c Sun Apr 5 06:47:07 2009
@@ -144,9 +144,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -191,27 +191,27 @@
lastvals);
gimp_install_procedure(GAP_FMACNAME_PLUG_IN_NAME_FMAC,
- "This plug-in can create and execute filtermacro scriptfiles",
- "This plug-in allows the user to pick one or more filters "
- "that have already been called before in the current Gimp session. "
- "The internal PDB-name of the picked filter is stored in a "
+ "This plug-in can create and execute filtermacro scriptfiles",
+ "This plug-in allows the user to pick one or more filters "
+ "that have already been called before in the current Gimp session. "
+ "The internal PDB-name of the picked filter is stored in a "
"filtermacro scriptfile, along with the parameter buffer that was "
"used at the last call.\n"
- "You can execute a filtermacro scriptfile on the Input drawable "
- "(in the current or in any further Gimp session). "
- "The non-interactive API is limited to filtermacro script execution "
- "and does not allow creation or modification of filtermacro scripts "
- "WARNING: filtermacro scriptfiles are a temporary solution. "
- "They are machine dependent. Support may be dropped in future gimp "
+ "You can execute a filtermacro scriptfile on the Input drawable "
+ "(in the current or in any further Gimp session). "
+ "The non-interactive API is limited to filtermacro script execution "
+ "and does not allow creation or modification of filtermacro scripts "
+ "WARNING: filtermacro scriptfiles are a temporary solution. "
+ "They are machine dependent. Support may be dropped in future gimp "
"versions.",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Filtermacro..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_fmac_dialog), nreturn_vals,
- args_fmac_dialog, return_vals);
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Filtermacro..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_fmac_dialog), nreturn_vals,
+ args_fmac_dialog, return_vals);
gimp_plugin_menu_register (GAP_FMACNAME_PLUG_IN_NAME_FMAC, N_("<Image>/Filters/"));
} /* end query */
@@ -263,46 +263,46 @@
}
else
{
- if (run_mode == GIMP_RUN_NONINTERACTIVE)
- {
- if(n_params == 4)
- {
- filtermacro_file = param[3].data.d_string;
- if(filtermacro_file == NULL)
- {
+ if (run_mode == GIMP_RUN_NONINTERACTIVE)
+ {
+ if(n_params == 4)
+ {
+ filtermacro_file = param[3].data.d_string;
+ if(filtermacro_file == NULL)
+ {
status = GIMP_PDB_CALLING_ERROR;
- }
- }
- else
- {
+ }
+ }
+ else
+ {
status = GIMP_PDB_CALLING_ERROR;
- }
- }
- else
- {
- gint l_len;
-
- l_len = gimp_get_data_size(GAP_FMACNAME_PLUG_IN_NAME_FMAC);
- if(l_len > 0)
- {
- filtermacro_file = g_malloc0(l_len);
- gimp_get_data(GAP_FMACNAME_PLUG_IN_NAME_FMAC, filtermacro_file);
- }
- else
- {
- filtermacro_file = g_strdup("\0");
- }
- }
+ }
+ }
+ else
+ {
+ gint l_len;
- if(status == GIMP_PDB_SUCCESS)
- {
+ l_len = gimp_get_data_size(GAP_FMACNAME_PLUG_IN_NAME_FMAC);
+ if(l_len > 0)
+ {
+ filtermacro_file = g_malloc0(l_len);
+ gimp_get_data(GAP_FMACNAME_PLUG_IN_NAME_FMAC, filtermacro_file);
+ }
+ else
+ {
+ filtermacro_file = g_strdup("\0");
+ }
+ }
+
+ if(status == GIMP_PDB_SUCCESS)
+ {
l_rc = gap_fmac_execute(run_mode, image_id, drawable_id
, filtermacro_file
, NULL /* filtermacro_file2 */
, 1.0 /* current_step */
, 1 /* total_steps */
);
- }
+ }
}
}
else
@@ -635,8 +635,8 @@
, p_fmac_pdb_constraint_proc_sel2
, &l_browser_result
, image_id
- , GAP_DB_BROWSER_FMAC_HELP_ID
- )
+ , GAP_DB_BROWSER_FMAC_HELP_ID
+ )
< 0)
{
if(gap_debug) printf("DEBUG: gap_db_browser_dialog cancelled\n");
@@ -693,7 +693,7 @@
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (gpp->dialog)->vbox),
- vbox, TRUE, TRUE, 0);
+ vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* table */
@@ -724,8 +724,8 @@
,NULL);
gtk_widget_show(entry);
g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK (p_file_entry_update_callback),
- gpp);
+ G_CALLBACK (p_file_entry_update_callback),
+ gpp);
/* Button to invoke filebrowser */
button = gtk_button_new_with_label ("...");
@@ -733,20 +733,20 @@
, _("Open filebrowser window to select a filename")
,NULL);
gtk_table_attach( GTK_TABLE(table), button, 2, 3, row, row +1,
- 0, 0, 0, 0 );
+ 0, 0, 0, 0 );
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (p_filebrowser_button_callback),
- gpp);
+ G_CALLBACK (p_filebrowser_button_callback),
+ gpp);
/* list : list in a scrolled_win */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
@@ -757,22 +757,22 @@
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (gpp->tv),
- -1, _("Nr"),
- renderer,
- "text", 1,
- NULL);
+ -1, _("Nr"),
+ renderer,
+ "text", 1,
+ NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (gpp->tv),
- -1, _("PDB Name"),
- renderer,
- "text", 2,
- NULL);
+ -1, _("PDB Name"),
+ renderer,
+ "text", 2,
+ NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (gpp->tv),
- -1, _("Menu Path"),
- renderer,
- "text", 3,
- NULL);
+ -1, _("Menu Path"),
+ renderer,
+ "text", 3,
+ NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (gpp->tv), TRUE);
gtk_widget_set_size_request (gpp->tv, 320 /*WIDTH*/, 100 /*HEIGHT*/);
@@ -804,9 +804,9 @@
{
if(gap_debug) printf("gap_fmac_dialog: RUN image_id:%d drawable_id:%d, filtermacro_file:%s\n"
,(int)image_id
- ,(int)drawable_id
- ,gpp->filtermacro_file
- );
+ ,(int)drawable_id
+ ,gpp->filtermacro_file
+ );
return(gap_fmac_execute(run_mode, image_id, drawable_id
, gpp->filtermacro_file
, NULL /* filtermacro_file2 */
@@ -871,8 +871,8 @@
{
/* get column 0 (the invisible intenal number) from the store */
gtk_tree_model_get (GTK_TREE_MODEL (gpp->store), &iter
- ,0, &numtxt
- , -1);
+ ,0, &numtxt
+ , -1);
if (gap_debug) printf("p_procedure_select_callback (3) numtxt:%s\n", numtxt);
gpp->selected_number = atoi(numtxt);
g_free (numtxt);
@@ -899,7 +899,7 @@
gpp->store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_view_set_model (GTK_TREE_VIEW (gpp->tv)
,GTK_TREE_MODEL (gpp->store)
- );
+ );
g_object_unref (gpp->store);
/* read filternames from filtermacro_file
@@ -927,23 +927,23 @@
{
gchar *numtxt;
gchar *label;
- gchar *menu_path;
+ gchar *menu_path;
menu_path = gap_db_get_plugin_menupath(pdb_name);
- if(menu_path == NULL)
- {
- menu_path = g_strdup(_("** No menu path available **"));
- }
+ if(menu_path == NULL)
+ {
+ menu_path = g_strdup(_("** No menu path available **"));
+ }
label = g_strdup_printf("%3d.", (int)count_elem +1);
numtxt = g_strdup_printf("%d", (int)count_elem);
gtk_list_store_append (gpp->store, &iter);
gtk_list_store_set (gpp->store, &iter
- ,0, numtxt /* internal invisible number starting at 0 */
- ,1, label /* visible number starting at 1 */
- ,2, pdb_name
- ,3, menu_path
- ,-1);
+ ,0, numtxt /* internal invisible number starting at 0 */
+ ,1, label /* visible number starting at 1 */
+ ,2, pdb_name
+ ,3, menu_path
+ ,-1);
g_free (numtxt);
g_free (label);
g_free (menu_path);
@@ -966,20 +966,20 @@
|| (gap_lib_file_exists(gpp->filtermacro_file) == 0 ))
{
gtk_list_store_set (gpp->store, &iter
- ,0, "-1"
- ,1, " "
- ,2, _("** Empty **")
- ,3, " "
- ,-1);
+ ,0, "-1"
+ ,1, " "
+ ,2, _("** Empty **")
+ ,3, " "
+ ,-1);
}
else
{
gtk_list_store_set (gpp->store, &iter
- ,0, "-1"
- ,1, " "
- ,2, _("** File is not a filtermacro **")
- ,3, " "
- ,-1);
+ ,0, "-1"
+ ,1, " "
+ ,2, _("** File is not a filtermacro **")
+ ,3, " "
+ ,-1);
}
}
@@ -1032,7 +1032,7 @@
,_("Delete the filtermacro scriptfile")
, NULL);
g_signal_connect (G_OBJECT (button), "clicked"
- ,G_CALLBACK (p_delete_all_callback)
+ ,G_CALLBACK (p_delete_all_callback)
,gpp
);
gtk_widget_show (button);
@@ -1045,7 +1045,7 @@
,_("Delete the selected filtercall")
, NULL);
g_signal_connect (G_OBJECT (button), "clicked"
- ,G_CALLBACK (p_delete_callback)
+ ,G_CALLBACK (p_delete_callback)
,gpp
);
gtk_widget_show (button);
@@ -1056,15 +1056,15 @@
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gimp_help_set_help_data(button
,_("Open PDB-browser window to add a new filter "
- "to the filtermacro scriptfile.\n"
- "Important:\n"
- "The PDB-browser shows only filters "
- "that have already been used in the current session "
- "and have setup the internal buffer with the "
- "parameter settings of the last call")
+ "to the filtermacro scriptfile.\n"
+ "Important:\n"
+ "The PDB-browser shows only filters "
+ "that have already been used in the current session "
+ "and have setup the internal buffer with the "
+ "parameter settings of the last call")
, NULL);
g_signal_connect (G_OBJECT (button), "clicked"
- ,G_CALLBACK (p_add_callback)
+ ,G_CALLBACK (p_add_callback)
,gpp
);
gtk_widget_show (button);
@@ -1078,7 +1078,7 @@
,_("Close window")
, NULL);
g_signal_connect (G_OBJECT (button), "clicked"
- ,G_CALLBACK (p_close_callback)
+ ,G_CALLBACK (p_close_callback)
,gpp
);
gtk_widget_show (button);
@@ -1092,7 +1092,7 @@
,_("Apply filtermacro script on current drawable and close window")
, NULL);
g_signal_connect (G_OBJECT (button), "clicked"
- ,G_CALLBACK (p_ok_callback)
+ ,G_CALLBACK (p_ok_callback)
,gpp
);
gtk_widget_show (button);
@@ -1209,47 +1209,47 @@
{
GapValTextFileLines *txf_ptr;
GapValTextFileLines *txf_ptr_root;
- gint count_elem;
+ gint count_elem;
gchar *label;
FILE *fp;
- gboolean copy_line;
+ gboolean copy_line;
- /* rewrite the filtermacro file
- * without the line that corresponds to gpp->selected_number
- */
+ /* rewrite the filtermacro file
+ * without the line that corresponds to gpp->selected_number
+ */
txf_ptr_root = gap_val_load_textfile(gpp->filtermacro_file);
- fp = g_fopen(gpp->filtermacro_file, "w");
- if(fp)
- {
- count_elem = 0;
- for(txf_ptr = txf_ptr_root; txf_ptr != NULL; txf_ptr = (GapValTextFileLines *) txf_ptr->next)
- {
- copy_line = TRUE;
+ fp = g_fopen(gpp->filtermacro_file, "w");
+ if(fp)
+ {
+ count_elem = 0;
+ for(txf_ptr = txf_ptr_root; txf_ptr != NULL; txf_ptr = (GapValTextFileLines *) txf_ptr->next)
+ {
+ copy_line = TRUE;
label = p_get_filtername(txf_ptr->line);
if(label)
- {
- if(count_elem == gpp->selected_number)
- {
- copy_line = FALSE;
- }
- g_free(label);
- count_elem++;
- }
-
- if(gap_debug) printf("%4d %s", (int)count_elem, txf_ptr->line);
-
- if(copy_line)
- {
- fprintf(fp, "%s", txf_ptr->line);
- }
- }
- fclose(fp);
- }
- if(txf_ptr_root)
- {
- gap_val_free_textfile_lines(txf_ptr_root);
- }
+ {
+ if(count_elem == gpp->selected_number)
+ {
+ copy_line = FALSE;
+ }
+ g_free(label);
+ count_elem++;
+ }
+
+ if(gap_debug) printf("%4d %s", (int)count_elem, txf_ptr->line);
+
+ if(copy_line)
+ {
+ fprintf(fp, "%s", txf_ptr->line);
+ }
+ }
+ fclose(fp);
+ }
+ if(txf_ptr_root)
+ {
+ gap_val_free_textfile_lines(txf_ptr_root);
+ }
}
}
@@ -1293,8 +1293,8 @@
if((l_rc < 0) && (errno != 0))
{
g_message(_("ERROR: Could not write filtermacro script\n"
- "filename: '%s'\n%s")
- ,gpp->filtermacro_file, g_strerror (errno));
+ "filename: '%s'\n%s")
+ ,gpp->filtermacro_file, g_strerror (errno));
}
}
p_tree_fill (gpp);
@@ -1322,25 +1322,25 @@
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_ok_callback),
- gpp);
+ gpp);
g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_close_callback),
- gpp);
+ gpp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel),
- gpp->filtermacro_file);
+ gpp->filtermacro_file);
gtk_widget_show (filesel);
/* "destroy" has to be the last signal,
* (otherwise the other callbacks are never called)
*/
g_signal_connect (G_OBJECT (filesel), "destroy",
- G_CALLBACK (p_filesel_close_callback),
- gpp);
+ G_CALLBACK (p_filesel_close_callback),
+ gpp);
}
/* ----------------------------
@@ -1349,7 +1349,7 @@
*/
static void
p_filesel_close_callback(GtkWidget *widget,
- fmac_globalparams_t *gpp)
+ fmac_globalparams_t *gpp)
{
GtkWidget *filesel;
@@ -1368,7 +1368,7 @@
*/
static void
p_filesel_ok_callback(GtkWidget *widget,
- fmac_globalparams_t *gpp)
+ fmac_globalparams_t *gpp)
{
const gchar *filename;
@@ -1390,7 +1390,7 @@
*/
static void
p_file_entry_update_callback(GtkWidget *widget,
- fmac_globalparams_t *gpp)
+ fmac_globalparams_t *gpp)
{
if(gpp)
{
Modified: trunk/gap/gap_frontends_main.c
==============================================================================
--- trunk/gap/gap_frontends_main.c (original)
+++ trunk/gap/gap_frontends_main.c Sun Apr 5 06:47:07 2009
@@ -89,9 +89,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -132,55 +132,55 @@
gimp_install_procedure(GAP_XANIM_PLUGIN_NAME,
- "This plugin calls xanim to split any video to video frames. "
- "(xanim exporting edition must be installed on your system)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("XANIM based extraction..."),
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_xanim), nreturn_vals,
- args_xanim, return_vals);
+ "This plugin calls xanim to split any video to video frames. "
+ "(xanim exporting edition must be installed on your system)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("XANIM based extraction..."),
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_xanim), nreturn_vals,
+ args_xanim, return_vals);
gimp_install_procedure(GAP_XANIM_PLUGIN_NAME_TOOLBOX,
- "This plugin calls xanim to split any video to video frames. "
- "(xanim exporting edition must be installed on your system)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("XANIM based extraction..."),
- NULL,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_xanim_ext), nreturn_vals,
- args_xanim_ext, return_vals);
+ "This plugin calls xanim to split any video to video frames. "
+ "(xanim exporting edition must be installed on your system)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("XANIM based extraction..."),
+ NULL,
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_xanim_ext), nreturn_vals,
+ args_xanim_ext, return_vals);
gimp_install_procedure(GAP_MPEG_ENCODE_PLUGIN_NAME,
- "This plugin calls mpeg_encode to convert video frames to MPEG1, or just generates a param file for mpeg_encode. (mpeg_encode must be installed on your system)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("MPEG1..."),
- "*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_mpege), nreturn_vals,
- args_mpege, return_vals);
+ "This plugin calls mpeg_encode to convert video frames to MPEG1, or just generates a param file for mpeg_encode. (mpeg_encode must be installed on your system)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("MPEG1..."),
+ "*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_mpege), nreturn_vals,
+ args_mpege, return_vals);
gimp_install_procedure(GAP_MPEG2_ENCODE_PLUGIN_NAME,
- "This plugin calls mpeg2encode to convert video frames to MPEG1 or MPEG2, or just generates a param file for mpeg2encode. (mpeg2encode must be installed on your system)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("MPEG2..."),
- "*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_mpege), nreturn_vals,
- args_mpege, return_vals);
+ "This plugin calls mpeg2encode to convert video frames to MPEG1 or MPEG2, or just generates a param file for mpeg2encode. (mpeg2encode must be installed on your system)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("MPEG2..."),
+ "*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_mpege), nreturn_vals,
+ args_mpege, return_vals);
{
/* Menu names */
@@ -203,15 +203,15 @@
gimp_plugin_menu_register (GAP_XANIM_PLUGIN_NAME_TOOLBOX, menupath_toolbox_video_split);
}
-} /* end query */
+} /* end query */
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals)
+ , GimpParam **return_vals)
{
const char *l_env;
Modified: trunk/gap/gap_image.c
==============================================================================
--- trunk/gap/gap_image.c (original)
+++ trunk/gap/gap_image.c Sun Apr 5 06:47:07 2009
@@ -140,7 +140,7 @@
gimp_image_add_layer(image_id, l_layer_id, 0);
}
-} /* end gap_image_prevent_empty_image */
+} /* end gap_image_prevent_empty_image */
Modified: trunk/gap/gap_layer_copy.c
==============================================================================
--- trunk/gap/gap_layer_copy.c (original)
+++ trunk/gap/gap_layer_copy.c Sun Apr 5 06:47:07 2009
@@ -104,7 +104,7 @@
if(gap_debug) printf("GAP gap_layer_copy_to_dest_image: ret %d\n", (int)l_ret_id);
return l_ret_id;
-} /* end gap_layer_copy_to_dest_image */
+} /* end gap_layer_copy_to_dest_image */
/* -----------------------
@@ -153,11 +153,11 @@
l_new_layer_id = gap_layer_copy_to_dest_image(dst_image_id
,src_layer_id
- ,l_src_opacity
- ,l_src_mode
- ,&l_src_offset_x
- ,&l_src_offset_y
- );
+ ,l_src_opacity
+ ,l_src_mode
+ ,&l_src_offset_x
+ ,&l_src_offset_y
+ );
if(l_new_layer_id < 0)
{
return -1;
@@ -185,7 +185,7 @@
*/
static void
p_copy_rgn_render_region (const GimpPixelRgn *srcPR
- ,const GimpPixelRgn *dstPR)
+ ,const GimpPixelRgn *dstPR)
{
guint row;
guchar* src = srcPR->data;
@@ -229,12 +229,12 @@
,(int)src_drawable->width
,(int)src_drawable->height
,(int)src_drawable->bpp
- );
+ );
printf("dst: w:%d h:%d bpp:%d\n"
,(int)dst_drawable->width
,(int)dst_drawable->height
,(int)dst_drawable->bpp
- );
+ );
gimp_drawable_detach(src_drawable);
gimp_drawable_detach(dst_drawable);
return FALSE;
@@ -242,14 +242,14 @@
gimp_pixel_rgn_init (&srcPR, src_drawable, 0, 0
, src_drawable->width, src_drawable->height
- , FALSE /* dirty */
- , FALSE /* shadow */
- );
+ , FALSE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_init (&dstPR, dst_drawable, 0, 0
, dst_drawable->width, dst_drawable->height
- , TRUE /* dirty */
- , FALSE /* shadow */
- );
+ , TRUE /* dirty */
+ , FALSE /* shadow */
+ );
for (pr = gimp_pixel_rgns_register (2, &srcPR, &dstPR);
@@ -274,9 +274,9 @@
*/
static void
p_pick_rgn_render_region (const GimpPixelRgn *srcPR
- ,const GimpPixelRgn *dstPR
- ,guint src_channel_pick
- ,guint dst_channel_pick)
+ ,const GimpPixelRgn *dstPR
+ ,guint src_channel_pick
+ ,guint dst_channel_pick)
{
guint row;
guchar* src = srcPR->data;
@@ -284,16 +284,16 @@
for (row = 0; row < dstPR->h; row++)
{
- guchar* l_src = src;
- guchar* l_dest = dest;
- guint col = dstPR->w;
+ guchar* l_src = src;
+ guchar* l_dest = dest;
+ guint col = dstPR->w;
- while (col--)
- {
+ while (col--)
+ {
l_dest[dst_channel_pick] = l_src[src_channel_pick];
- l_src += srcPR->bpp;
- l_dest += dstPR->bpp;
- }
+ l_src += srcPR->bpp;
+ l_dest += dstPR->bpp;
+ }
src += srcPR->rowstride;
dest += dstPR->rowstride;
@@ -319,7 +319,7 @@
gboolean
gap_layer_copy_picked_channel (gint32 dst_drawable_id, guint dst_channel_pick
, gint32 src_drawable_id, guint src_channel_pick
- , gboolean shadow)
+ , gboolean shadow)
{
GimpPixelRgn srcPR, dstPR;
GimpDrawable *src_drawable;
@@ -340,12 +340,12 @@
,(int)src_drawable->width
,(int)src_drawable->height
,(int)src_drawable->bpp
- );
+ );
printf("dst: w:%d h:%d bpp:%d\n"
,(int)dst_drawable->width
,(int)dst_drawable->height
,(int)dst_drawable->bpp
- );
+ );
gimp_drawable_detach(src_drawable);
gimp_drawable_detach(dst_drawable);
return FALSE;
@@ -357,14 +357,14 @@
gimp_pixel_rgn_init (&srcPR, src_drawable, x1, y1
, (x2 - x1), (y2 - y1)
- , FALSE /* dirty */
- , FALSE /* shadow */
- );
+ , FALSE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_init (&dstPR, dst_drawable, x1, y1
, (x2 - x1), (y2 - y1)
- , TRUE /* dirty */
- , shadow /* shadow */
- );
+ , TRUE /* dirty */
+ , shadow /* shadow */
+ );
if(shadow)
{
@@ -379,19 +379,19 @@
gimp_pixel_rgn_init (&origPR, dst_drawable, x1, y1
, (x2 - x1), (y2 - y1)
- , FALSE /* dirty */
- , FALSE /* shadow */
- );
+ , FALSE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_init (&shadowPR, dst_drawable, x1, y1
, (x2 - x1), (y2 - y1)
- , TRUE /* dirty */
- , TRUE /* shadow */
- );
+ , TRUE /* dirty */
+ , TRUE /* shadow */
+ );
for (pr = gimp_pixel_rgns_register (2, &origPR, &shadowPR);
- pr != NULL;
- pr = gimp_pixel_rgns_process (pr))
+ pr != NULL;
+ pr = gimp_pixel_rgns_process (pr))
{
- p_copy_rgn_render_region (&origPR, &shadowPR);
+ p_copy_rgn_render_region (&origPR, &shadowPR);
}
}
@@ -433,10 +433,10 @@
gint32
gap_layer_new_from_buffer(gint32 image_id
, gint32 width
- , gint32 height
- , gint32 bpp
- , guchar *data
- )
+ , gint32 height
+ , gint32 bpp
+ , guchar *data
+ )
{
gint32 layer_id;
GimpImageBaseType l_basetype;
@@ -459,12 +459,12 @@
layer_id = gimp_layer_new(image_id
, "dummy"
- , width
- , height
- , l_type
- , 100.0 /* full opacity */
- , 0 /* normal mode */
- );
+ , width
+ , height
+ , l_type
+ , 100.0 /* full opacity */
+ , 0 /* normal mode */
+ );
if(layer_id >= 0)
{
@@ -473,17 +473,17 @@
gimp_pixel_rgn_init (&dstPR, dst_drawable
, 0, 0 /* x1, y1 */
, width
- , height
- , TRUE /* dirty */
- , FALSE /* shadow */
- );
+ , height
+ , TRUE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_set_rect(&dstPR
,data
,0
,0
,width
- ,height
+ ,height
);
/* update the processed region */
@@ -575,19 +575,19 @@
axis = (gdouble)(gimp_drawable_width(layer_id)) / 2.0;
layer_id = gimp_drawable_transform_flip_simple(layer_id
,GIMP_ORIENTATION_HORIZONTAL
- ,TRUE /* auto_center */
- ,axis
- ,TRUE /* clip_result */
- );
+ ,TRUE /* auto_center */
+ ,axis
+ ,TRUE /* clip_result */
+ );
break;
case GAP_STB_FLIP_VER:
axis = (gdouble)(gimp_drawable_height(layer_id)) / 2.0;
layer_id = gimp_drawable_transform_flip_simple(layer_id
,GIMP_ORIENTATION_VERTICAL
- ,TRUE /* auto_center */
- ,axis
- ,TRUE /* clip_result */
- );
+ ,TRUE /* auto_center */
+ ,axis
+ ,TRUE /* clip_result */
+ );
break;
case GAP_STB_FLIP_BOTH:
center_x = gimp_drawable_width(layer_id) / 2;
@@ -595,11 +595,11 @@
layer_id = gimp_drawable_transform_rotate_simple(layer_id
,GIMP_ROTATE_180
- ,TRUE /* auto_center */
- ,center_x
- ,center_y
- ,TRUE /* clip_result */
- );
+ ,TRUE /* auto_center */
+ ,center_x
+ ,center_y
+ ,TRUE /* clip_result */
+ );
break;
default:
break;
Modified: trunk/gap/gap_layer_copy.h
==============================================================================
--- trunk/gap/gap_layer_copy.h (original)
+++ trunk/gap/gap_layer_copy.h Sun Apr 5 06:47:07 2009
@@ -57,14 +57,14 @@
gboolean gap_layer_copy_content (gint32 dst_drawable_id, gint32 src_drawable_id);
gboolean gap_layer_copy_picked_channel (gint32 dst_drawable_id, guint dst_channel_pick
, gint32 src_drawable_id, guint src_channel_pick
- , gboolean shadow);
+ , gboolean shadow);
gint32 gap_layer_new_from_buffer(gint32 dst_image_id
, gint32 width
- , gint32 height
- , gint32 bpp
- , guchar *data
- );
+ , gint32 height
+ , gint32 bpp
+ , guchar *data
+ );
void gap_layer_clear_to_color(gint32 layer_id
,gdouble red
,gdouble green
Modified: trunk/gap/gap_lib.c
==============================================================================
--- trunk/gap/gap_lib.c (original)
+++ trunk/gap/gap_lib.c Sun Apr 5 06:47:07 2009
@@ -119,7 +119,7 @@
#ifdef G_OS_WIN32
-#include <process.h> /* For _getpid() */
+#include <process.h> /* For _getpid() */
#endif
/* GAP includes */
@@ -250,12 +250,12 @@
l_name = gimp_drawable_get_name(l_matching_layer_id);
printf("p_set_active_layer_by_pos SET layer_id %d '%s' as ACTIVE\n"
, (int)l_matching_layer_id
- , l_name
- );
+ , l_name
+ );
if(l_name)
{
g_free(l_name);
- }
+ }
}
return (TRUE);
}
@@ -328,79 +328,79 @@
if(g_utf8_validate(l_layer_name, -1, NULL))
{
- const char *uni_ref_ptr;
- const char *uni_nam_ptr;
+ const char *uni_ref_ptr;
+ const char *uni_nam_ptr;
uni_ref_ptr = ref_layer_name;
- uni_nam_ptr = l_layer_name;
+ uni_nam_ptr = l_layer_name;
- /* check how many characters of the name are equal */
+ /* check how many characters of the name are equal */
l_len = g_utf8_strlen(l_layer_name, -1);
for(ii=0; ii < MIN(l_len, l_ref_len); ii++)
- {
- gunichar refname_char;
- gunichar layername_char;
-
- refname_char = g_utf8_get_char(uni_ref_ptr);
- layername_char = g_utf8_get_char(uni_nam_ptr);
-
- if(g_unichar_toupper(layername_char) == g_unichar_toupper(refname_char))
- {
- /* best score for matching character */
- l_score += 8;
- if(layername_char == refname_char)
- {
- if(ii==0)
- {
- /* prepare bonus for matching in case sensitivity */
- l_case_bonus = 4;
- }
- }
- else
- {
- /* lost the bonus for exact matching in case sensitivity */
- l_case_bonus = 0;
- }
- }
- else
- {
+ {
+ gunichar refname_char;
+ gunichar layername_char;
+
+ refname_char = g_utf8_get_char(uni_ref_ptr);
+ layername_char = g_utf8_get_char(uni_nam_ptr);
+
+ if(g_unichar_toupper(layername_char) == g_unichar_toupper(refname_char))
+ {
+ /* best score for matching character */
+ l_score += 8;
+ if(layername_char == refname_char)
+ {
+ if(ii==0)
+ {
+ /* prepare bonus for matching in case sensitivity */
+ l_case_bonus = 4;
+ }
+ }
+ else
+ {
+ /* lost the bonus for exact matching in case sensitivity */
+ l_case_bonus = 0;
+ }
+ }
+ else
+ {
break;
- }
- uni_ref_ptr = g_utf8_find_next_char(uni_ref_ptr, NULL);
- uni_nam_ptr = g_utf8_find_next_char(uni_nam_ptr, NULL);
- }
-
- l_score += l_case_bonus;
- if(l_len == l_ref_len)
- {
- /* extra score for equal length */
- l_score += 2;
- }
+ }
+ uni_ref_ptr = g_utf8_find_next_char(uni_ref_ptr, NULL);
+ uni_nam_ptr = g_utf8_find_next_char(uni_nam_ptr, NULL);
+ }
+
+ l_score += l_case_bonus;
+ if(l_len == l_ref_len)
+ {
+ /* extra score for equal length */
+ l_score += 2;
+ }
}
- g_free(l_layer_name);
+ g_free(l_layer_name);
}
if(l_score == l_max_score)
{
- /* stackposition is checked as secondary criterium
- * (score +1) in case there are more names matching
- * in the same number of characters
- */
- l_is_onion = gap_onion_base_check_is_onion_layer(l_layer_id);
- if(!l_is_onion)
- {
+ /* stackposition is checked as secondary criterium
+ * (score +1) in case there are more names matching
+ * in the same number of characters
+ */
+ l_is_onion = gap_onion_base_check_is_onion_layer(l_layer_id);
+ if(!l_is_onion)
+ {
if(l_pos == ref_layer_stackpos)
{
l_score += 1;
}
l_pos++;
- }
+ }
}
if(l_score > l_max_score)
{
l_matching_layer_id = l_layer_id;
- l_max_score = l_score;
+ l_max_score = l_score;
}
}
@@ -418,12 +418,12 @@
l_name = gimp_drawable_get_name(l_matching_layer_id);
printf("p_set_active_layer_by_name SET layer_id %d '%s' as ACTIVE\n"
, (int)l_matching_layer_id
- , l_name
- );
+ , l_name
+ );
if(l_name)
{
g_free(l_name);
- }
+ }
}
return (TRUE);
}
@@ -523,7 +523,7 @@
} /* end p_do_active_layer_tracking */
-
+
/* ============================================================================
* gap_lib_file_exists
@@ -560,7 +560,7 @@
}
return(1);
-} /* end gap_lib_file_exists */
+} /* end gap_lib_file_exists */
/* ============================================================================
* gap_lib_searchpath_for_exefile
@@ -604,15 +604,15 @@
exe_fullname = g_build_filename(dirpath, exefile, NULL);
if(g_file_test (exe_fullname, G_FILE_TEST_IS_EXECUTABLE) )
{
- /* the executable was found at exe_fullname,
- * set break flag and keep that name as return value
- */
+ /* the executable was found at exe_fullname,
+ * set break flag and keep that name as return value
+ */
break_flag = TRUE;
}
else
{
g_free(exe_fullname);
- exe_fullname = NULL;
+ exe_fullname = NULL;
}
dirpath = pp;
dirpath++; /* start of next directoryname in the path string */
@@ -663,10 +663,10 @@
int
gap_lib_file_copy(char *fname, char *fname_copy)
{
- FILE *l_fp;
+ FILE *l_fp;
char *l_buffer;
struct stat l_stat_buf;
- long l_len;
+ long l_len;
if(gap_debug) printf("gap_lib_file_copy src:%s dst:%s\n", fname, fname_copy);
@@ -687,7 +687,7 @@
}
/* load File into Buffer */
- l_fp = g_fopen(fname, "rb"); /* open read */
+ l_fp = g_fopen(fname, "rb"); /* open read */
if(l_fp == NULL)
{
fprintf (stderr, "open(read) error on '%s'\n", fname);
@@ -697,7 +697,7 @@
fread(l_buffer, 1, (size_t)l_len, l_fp);
fclose(l_fp);
- l_fp = g_fopen(fname_copy, "wb"); /* open write */
+ l_fp = g_fopen(fname_copy, "wb"); /* open write */
if(l_fp == NULL)
{
fprintf (stderr, "file_copy: open(write) error on '%s' \n", fname_copy);
@@ -713,7 +713,7 @@
fclose(l_fp);
g_free(l_buffer);
return 0; /* all done OK */
-} /* end gap_lib_file_copy */
+} /* end gap_lib_file_copy */
/* ============================================================================
@@ -1002,8 +1002,8 @@
while(l_nr_chk >= 0)
{
/* check if frame is on disk with 6-digit style framenumber
- * (we check 6-digit style first because this is the GAP default style)
- */
+ * (we check 6-digit style first because this is the GAP default style)
+ */
g_snprintf(l_fname, l_len, "%s%06ld%s", basename, l_nr_chk, extension);
if (gap_lib_file_exists(l_fname))
{
@@ -1026,10 +1026,10 @@
l_digits_used = 7;
break;
}
-
+
-
+
/* check if frame is on disk with 4-digit style framenumber */
g_snprintf(l_fname, l_len, "%s%04ld%s", basename, l_nr_chk, extension);
if (gap_lib_file_exists(l_fname))
@@ -1524,7 +1524,7 @@
ainfo_ptr->first_frame_nr = MIN(l_minnr, l_maxnr);
return 0; /* OK */
-} /* end gap_lib_dir_ainfo */
+} /* end gap_lib_dir_ainfo */
/* ============================================================================
@@ -1644,13 +1644,13 @@
{
gap_arr_msg_win(ainfo_ptr->run_mode,
_("Operation cancelled.\n"
- "Current frame was changed while dialog was open."));
+ "Current frame was changed while dialog was open."));
}
gap_lib_free_ainfo(&l_ainfo_ptr);
}
return l_rc;
-} /* end gap_lib_chk_framechange */
+} /* end gap_lib_chk_framechange */
/* ============================================================================
* gap_lib_chk_framerange
@@ -1666,14 +1666,14 @@
if(ainfo_ptr->frame_cnt == 0)
{
gap_arr_msg_win(ainfo_ptr->run_mode,
- _("Operation cancelled.\n"
+ _("Operation cancelled.\n"
"GAP video plug-ins only work with filenames\n"
"that end in numbers like _000001.xcf.\n"
"==> Rename your image, then try again."));
return -1;
}
return 0;
-} /* end gap_lib_chk_framerange */
+} /* end gap_lib_chk_framerange */
/* ============================================================================
* p_gzip
@@ -1727,7 +1727,7 @@
g_free(l_cmd);
return l_tmpname;
-} /* end p_gzip */
+} /* end p_gzip */
/* ============================================================================
* p_decide_save_as
@@ -1768,9 +1768,9 @@
l_basename = gap_lib_alloc_basename(final_sav_name, &l_number);
l_key_save_as_mode = g_strdup_printf("GIMP_GAP_SAVE_MODE_%s%s"
- ,l_basename
- ,l_extension
- );
+ ,l_basename
+ ,l_extension
+ );
gimp_get_data (l_key_save_as_mode, &l_save_as_mode);
@@ -1816,12 +1816,12 @@
if(strcmp(l_val_gimprc, "yes") == 0)
{
- l_save_as_mode = 1;
+ l_save_as_mode = 1;
l_ask = FALSE;
}
if(strcmp(l_val_gimprc, "no") == 0)
{
- l_save_as_mode = 0;
+ l_save_as_mode = 0;
l_ask = FALSE;
}
@@ -1848,17 +1848,17 @@
l_argc = 3;
l_msg = g_strdup_printf(_("You are using another file format than xcf.\n"
- "Save operations may result in loss of layer information.\n\n"
- "To configure flattening for this fileformat\n"
- "(permanent for all further sessions) please add the line:\n"
- "(%s %s)\n"
- "to your gimprc file.")
- , l_key_gimprc
- , "\"yes\""
- );
+ "Save operations may result in loss of layer information.\n\n"
+ "To configure flattening for this fileformat\n"
+ "(permanent for all further sessions) please add the line:\n"
+ "(%s %s)\n"
+ "to your gimprc file.")
+ , l_key_gimprc
+ , "\"yes\""
+ );
l_save_as_mode = gap_arr_buttons_dialog (_("Fileformat Warning")
- ,l_msg
- , l_argc, l_argv, -1);
+ ,l_msg
+ , l_argc, l_argv, -1);
g_free(l_msg);
}
@@ -1894,8 +1894,8 @@
l_sav_rc = p_lib_save_named_image_1(image_id
, sav_name
- , l_run_mode
- , FALSE /* do not enable_thumbnailsave */
+ , l_run_mode
+ , FALSE /* do not enable_thumbnailsave */
, l_basename
, l_extension
);
@@ -1905,7 +1905,7 @@
g_free(l_extension);
return l_sav_rc;
-} /* end p_decide_save_as */
+} /* end p_decide_save_as */
/* ============================================================================
* gap_lib_gap_check_save_needed
@@ -1991,12 +1991,12 @@
*/
GimpParam *l_params;
l_params = gimp_run_procedure ("file_jpeg_save",
- &l_retvals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_DRAWABLE, l_drawable_id,
- GIMP_PDB_STRING, sav_name,
- GIMP_PDB_STRING, sav_name, /* raw name ? */
+ &l_retvals,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_IMAGE, image_id,
+ GIMP_PDB_DRAWABLE, l_drawable_id,
+ GIMP_PDB_STRING, sav_name,
+ GIMP_PDB_STRING, sav_name, /* raw name ? */
GIMP_PDB_FLOAT, save_vals->quality / 100.0,
GIMP_PDB_FLOAT, save_vals->smoothing,
GIMP_PDB_INT32, save_vals->optimize,
@@ -2006,7 +2006,7 @@
GIMP_PDB_INT32, save_vals->baseline,
GIMP_PDB_INT32, save_vals->restart,
GIMP_PDB_INT32, save_vals->dct,
- GIMP_PDB_END);
+ GIMP_PDB_END);
if (l_params[0].data.d_status == GIMP_PDB_SUCCESS)
{
if(gap_debug)
@@ -2071,9 +2071,9 @@
jpg_save_vals = NULL;
l_key_save_vals_jpg = g_strdup_printf("GIMP_GAP_SAVE_VALS_JPG_%s%s"
- ,l_basename
- ,l_extension
- );
+ ,l_basename
+ ,l_extension
+ );
if(gap_debug)
{
@@ -2111,10 +2111,10 @@
l_sav_rc = p_lib_save_named_image2(image_id
, sav_name
- , run_mode
- , FALSE /* do not enable_thumbnailsave */
+ , run_mode
+ , FALSE /* do not enable_thumbnailsave */
, jpg_save_vals
- );
+ );
if (jpg_save_vals != NULL)
{
g_free(jpg_save_vals);
@@ -2206,10 +2206,10 @@
{
l_rc = gimp_file_save(run_mode,
image_id,
- l_drawable_id,
- sav_name,
- sav_name /* raw name ? */
- );
+ l_drawable_id,
+ sav_name,
+ sav_name /* raw name ? */
+ );
}
@@ -2250,7 +2250,7 @@
}
return image_id;
-} /* end p_lib_save_named_image2 */
+} /* end p_lib_save_named_image2 */
gint32
gap_lib_save_named_image(gint32 image_id, const char *sav_name, GimpRunMode run_mode)
@@ -2265,11 +2265,11 @@
l_rc = p_lib_save_named_image_1(image_id
, sav_name
- , run_mode
- , TRUE /* enable_thumbnailsave */
+ , run_mode
+ , TRUE /* enable_thumbnailsave */
, l_basename
, l_extension
- );
+ );
g_free(l_extension);
g_free(l_basename);
@@ -2368,13 +2368,13 @@
* the drawable is ignored. (we can supply a dummy value)
*/
l_params = gimp_run_procedure ("gimp_xcf_save",
- &l_retvals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_DRAWABLE, 0,
- GIMP_PDB_STRING, l_tmpname,
- GIMP_PDB_STRING, l_tmpname, /* raw name ? */
- GIMP_PDB_END);
+ &l_retvals,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_IMAGE, image_id,
+ GIMP_PDB_DRAWABLE, 0,
+ GIMP_PDB_STRING, l_tmpname,
+ GIMP_PDB_STRING, l_tmpname, /* raw name ? */
+ GIMP_PDB_END);
if(gap_debug)
{
printf("DEBUG: after xcf gap_lib_save_named_frame: '%s'\n", l_tmpname);
@@ -2437,9 +2437,9 @@
}
if(0 == gap_lib_file_copy(l_tmpname, sav_name))
- {
- g_remove(l_tmpname);
- }
+ {
+ g_remove(l_tmpname);
+ }
else
{
printf("ERROR in gap_lib_save_named_frame: can't rename %s to %s\n"
@@ -2478,7 +2478,7 @@
return l_rc;
-} /* end gap_lib_save_named_frame */
+} /* end gap_lib_save_named_frame */
/* ============================================================================
@@ -2519,7 +2519,7 @@
}
}
return 0;
-} /* end p_save_old_frame */
+} /* end p_save_old_frame */
@@ -2563,9 +2563,9 @@
if(gap_debug) printf("DEBUG: before gap_lib_load_image: '%s'\n", l_tmpname);
l_tmp_image_id = gimp_file_load(GIMP_RUN_NONINTERACTIVE,
- l_tmpname,
- l_tmpname /* raw name ? */
- );
+ l_tmpname,
+ l_tmpname /* raw name ? */
+ );
if(gap_debug) printf("DEBUG: after gap_lib_load_image: '%s' id=%d\n\n",
l_tmpname, (int)l_tmp_image_id);
@@ -2579,7 +2579,7 @@
return l_tmp_image_id;
-} /* end gap_lib_load_image */
+} /* end gap_lib_load_image */
@@ -2646,7 +2646,7 @@
printf("GAP: Error: PDB call of gimp_displays_reconnect failed\n");
return (-1);
-} /* end gap_lib_load_named_frame */
+} /* end gap_lib_load_named_frame */
@@ -2801,7 +2801,7 @@
}
return(image_id);
-} /* end gap_lib_replace_image */
+} /* end gap_lib_replace_image */
Modified: trunk/gap/gap_lock.c
==============================================================================
--- trunk/gap/gap_lock.c (original)
+++ trunk/gap/gap_lock.c Sun Apr 5 06:47:07 2009
@@ -115,7 +115,7 @@
g_free(l_locktab);
}
return(FALSE);
-} /* end gap_lock_check_for_lock */
+} /* end gap_lock_check_for_lock */
/* ============================================================================
@@ -181,7 +181,7 @@
}
g_free(l_locktab);
-} /* end gap_lock_set_lock */
+} /* end gap_lock_set_lock */
/* ============================================================================
@@ -220,4 +220,4 @@
}
g_free(l_locktab);
}
-} /* end gap_lock_remove_lock */
+} /* end gap_lock_remove_lock */
Modified: trunk/gap/gap_main.c
==============================================================================
--- trunk/gap/gap_main.c (original)
+++ trunk/gap/gap_main.c Sun Apr 5 06:47:07 2009
@@ -171,9 +171,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -275,13 +275,13 @@
{ GIMP_PDB_INT32, "src_stepmode", "0-5 derive inserted object as copy of one layer from a multilayer src_image \n"
"100-105 derive inserted object as copy of merged visible layers of a source video frame \n"
"0: Layer Loop 1: Layer Loop reverse 2: Layer Once 3: Layer Once reverse 4: Layer PingPong \n"
- "5: None (use onle the selected src_layer)\n"
+ "5: None (use onle the selected src_layer)\n"
"100: Frame Loop 101: Frame Loop reverse 102: Frame Once 103: Frame Once reverse 104: Frame PingPong \n"
- "105: Frame None (use onle the flat copy of the selected frame)\n"
- },
+ "105: Frame None (use onle the flat copy of the selected frame)\n"
+ },
{ GIMP_PDB_INT32, "src_handle", "0: handle left top 1: handle left bottom \n"
"2: handle right top 3: handle right bottom \n"
- "4: handle center"},
+ "4: handle center"},
{ GIMP_PDB_INT32, "src_paintmode", "4444: keep original paintmode of src_layer 0: GIMP_NORMAL_MODE (see GimpLayerModeEffects -- libgimp/gimpenums.h -- for more information)"},
{ GIMP_PDB_INT32, "src_force_visible", "1: Set inserted layres visible, 0: insert layers as is"},
{ GIMP_PDB_INT32, "clip_to_img", "1: Clip inserted layers to Image size of the destination video frame, 0: dont clip"},
@@ -301,7 +301,7 @@
{GIMP_PDB_INT32, "apply_bluebox", "TRUE: apply blubox filter (using bluebox param VALUES of last successful bluebox run)"},
{GIMP_PDB_INT32, "src_selmode", "0: ignore selections in all source images\n"
"1: use one selection (from the inital source image) for all handled src layers \n"
- "2: use selections in all source images (for stepmodes 0-5 there is only one source image)"},
+ "2: use selections in all source images (for stepmodes 0-5 there is only one source image)"},
/* CONTROLPOINT Arrays (the _ext API uses FLOAT arrays for more precision) */
@@ -355,13 +355,13 @@
{ GIMP_PDB_INT32, "src_stepmode", "0-5 derive inserted object as copy of one layer from a multilayer src_image \n"
"100-105 derive inserted object as copy of merged visible layers of a source video frame \n"
"0: Layer Loop 1: Layer Loop reverse 2: Layer Once 3: Layer Once reverse 4: Layer PingPong \n"
- "5: None (use onle the selected src_layer)\n"
+ "5: None (use onle the selected src_layer)\n"
"100: Frame Loop 101: Frame Loop reverse 102: Frame Once 103: Frame Once reverse 104: Frame PingPong \n"
- "105: Frame None (use onle the flat copy of the selected frame)\n"
- },
+ "105: Frame None (use onle the flat copy of the selected frame)\n"
+ },
{ GIMP_PDB_INT32, "src_handle", "0: handle left top 1: handle left bottom \n"
"2: handle right top 3: handle right bottom \n"
- "4: handle center"},
+ "4: handle center"},
{ GIMP_PDB_INT32, "src_paintmode", "4444: keep original paintmode of src_layer 0: GIMP_NORMAL_MODE (see GimpLayerModeEffects -- libgimp/gimpenums.h -- for more information)"},
{ GIMP_PDB_INT32, "src_force_visible", "1: Set inserted layres visible, 0: insert layers as is"},
{ GIMP_PDB_INT32, "clip_to_img", "1: Clip inserted layers to Image size of the destination video frame, 0: dont clip"},
@@ -567,64 +567,64 @@
{GIMP_PDB_INT32, "range_to", "frame nr to stop"},
{GIMP_PDB_INT32, "action_mode", "0:set_visible"
", 1:set_invisible"
- ", 2:set_linked"
- ", 3:set_unlinked"
- ", 4:raise"
- ", 5:lower"
- ", 6:merge_expand"
- ", 7:merge_img"
- ", 8:merge_bg"
- ", 9:apply_filter"
- ", 10:duplicate"
- ", 11:delete"
- ", 12:rename"
- ", 13:replace selection"
- ", 14:add selection"
- ", 15:sbtract selection"
- ", 16:intersect selection"
- ", 17:selection none"
- ", 18:selection all"
- ", 19:selection invert"
- ", 20:save selection to channel"
- ", 21:load selection from channel"
- ", 22:delete channel (by name)"
- ", 23:add alpha channel"
- ", 24:add white layermask (opaque)"
- ", 25:add black layermask (transparent)"
- ", 26:add alpha layermask"
- ", 27:add alpha transfer layermask"
- ", 28:add selection as layermask"
- ", 29:add bw copy as layermask"
- ", 30:delete layermask"
- ", 31:apply layermask"
- ", 32:copy layermask from layer above"
- ", 33:copy layermask from layer below"
- ", 34:invert layermask"
- ", 35:set layer mode to normal"
- ", 36:set layer mode to dissolve"
- ", 37:set layer mode to multiply"
- ", 38:set layer mode to divide"
- ", 39:set layer mode to screen"
- ", 40:set layer mode to overlay"
- ", 41:set layer mode to difference"
- ", 42:set layer mode to addition"
- ", 43:set layer mode to subtract"
- ", 44:set layer mode to darken_only"
- ", 45:set layer mode to lighten_only"
- ", 46:set layer mode to dodge"
- ", 47:set layer mode to burn"
- ", 48:set layer mode to hardlight"
- ", 49:set layer mode to softlight"
- ", 50:set layer mode to color_erase"
- ", 51:set layer mode to grain_extract_mode"
- ", 52:set layer mode to grain_merge_mode"
- ", 53:set layer mode to hue_mode"
- ", 54:set layer mode to saturation_mode"
- ", 55:set layer mode to color_mode"
- ", 56:set layer mode to value_mode"
- ", 57:apply filter on layermask"
- ", 58:set selection from alphachannel"
- },
+ ", 2:set_linked"
+ ", 3:set_unlinked"
+ ", 4:raise"
+ ", 5:lower"
+ ", 6:merge_expand"
+ ", 7:merge_img"
+ ", 8:merge_bg"
+ ", 9:apply_filter"
+ ", 10:duplicate"
+ ", 11:delete"
+ ", 12:rename"
+ ", 13:replace selection"
+ ", 14:add selection"
+ ", 15:sbtract selection"
+ ", 16:intersect selection"
+ ", 17:selection none"
+ ", 18:selection all"
+ ", 19:selection invert"
+ ", 20:save selection to channel"
+ ", 21:load selection from channel"
+ ", 22:delete channel (by name)"
+ ", 23:add alpha channel"
+ ", 24:add white layermask (opaque)"
+ ", 25:add black layermask (transparent)"
+ ", 26:add alpha layermask"
+ ", 27:add alpha transfer layermask"
+ ", 28:add selection as layermask"
+ ", 29:add bw copy as layermask"
+ ", 30:delete layermask"
+ ", 31:apply layermask"
+ ", 32:copy layermask from layer above"
+ ", 33:copy layermask from layer below"
+ ", 34:invert layermask"
+ ", 35:set layer mode to normal"
+ ", 36:set layer mode to dissolve"
+ ", 37:set layer mode to multiply"
+ ", 38:set layer mode to divide"
+ ", 39:set layer mode to screen"
+ ", 40:set layer mode to overlay"
+ ", 41:set layer mode to difference"
+ ", 42:set layer mode to addition"
+ ", 43:set layer mode to subtract"
+ ", 44:set layer mode to darken_only"
+ ", 45:set layer mode to lighten_only"
+ ", 46:set layer mode to dodge"
+ ", 47:set layer mode to burn"
+ ", 48:set layer mode to hardlight"
+ ", 49:set layer mode to softlight"
+ ", 50:set layer mode to color_erase"
+ ", 51:set layer mode to grain_extract_mode"
+ ", 52:set layer mode to grain_merge_mode"
+ ", 53:set layer mode to hue_mode"
+ ", 54:set layer mode to saturation_mode"
+ ", 55:set layer mode to color_mode"
+ ", 56:set layer mode to value_mode"
+ ", 57:apply filter on layermask"
+ ", 58:set selection from alphachannel"
+ },
{GIMP_PDB_INT32, "select_mode", "Mode how to identify a layer: 0-3 by layername 0=equal, 1=prefix, 2=suffix, 3=contains, 4=layerstack_numberslist, 5=inv_layerstack, 6=all_visible"},
{GIMP_PDB_INT32, "select_case", "0: ignore case 1: select_string is case sensitive"},
{GIMP_PDB_INT32, "select_invert", "0: select normal 1: invert (select all unselected layers)"},
@@ -650,7 +650,7 @@
{GIMP_PDB_DRAWABLE, "drawable", "Input drawable (unused)"},
{GIMP_PDB_INT32, "paste_mode", "0 .. paste at current frame (replacing current and following frames)"
"1 .. paste insert before current frame "
- "2 .. paste insert after current frame"},
+ "2 .. paste insert after current frame"},
};
static int nargs_video_paste = G_N_ELEMENTS (args_video_paste);
@@ -695,305 +695,305 @@
gimp_plugin_domain_register (GETTEXT_PACKAGE, LOCALEDIR);
gimp_install_procedure(PLUGIN_NAME_GAP_NEXT,
- "This plugin exchanges current image with (next numbered) image from disk.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Next Frame"),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_std, nreturn_std,
- args_std, return_std);
+ "This plugin exchanges current image with (next numbered) image from disk.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Next Frame"),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_std, nreturn_std,
+ args_std, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_PREV,
- "This plugin exchanges current image with (previous numbered) image from disk.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Previous Frame"),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_std, nreturn_std,
- args_std, return_std);
+ "This plugin exchanges current image with (previous numbered) image from disk.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Previous Frame"),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_std, nreturn_std,
+ args_std, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_FIRST,
- "This plugin exchanges current image with (lowest numbered) image from disk.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("First Frame"),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_std, nreturn_std,
- args_std, return_std);
+ "This plugin exchanges current image with (lowest numbered) image from disk.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("First Frame"),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_std, nreturn_std,
+ args_std, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_LAST,
- "This plugin exchanges current image with (highest numbered) image from disk.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Last Frame"),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_std, nreturn_std,
- args_std, return_std);
+ "This plugin exchanges current image with (highest numbered) image from disk.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Last Frame"),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_std, nreturn_std,
+ args_std, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_GOTO,
- "This plugin exchanges current image with requested image (nr) from disk.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Any Frame..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_goto, nreturn_std,
- args_goto, return_std);
+ "This plugin exchanges current image with requested image (nr) from disk.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Any Frame..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_goto, nreturn_std,
+ args_goto, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_DEL,
- "This plugin deletes the given number of frames from disk including the current frame.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Delete Frames..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_del, nreturn_std,
- args_del, return_std);
+ "This plugin deletes the given number of frames from disk including the current frame.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Delete Frames..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_del, nreturn_std,
+ args_del, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_DUP,
- "This plugin duplicates the current frames on disk n-times.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Duplicate Frames..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_dup, nreturn_std,
- args_dup, return_std);
+ "This plugin duplicates the current frames on disk n-times.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Duplicate Frames..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_dup, nreturn_std,
+ args_dup, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_DENSITY,
- "This plugin changes the number of frames (density) on disk to match a"
- " new target framerate that is densty_factor times higher"
- " than the origianl framerate."
- " (or 1/density_factor lower if density_grow is FALSE)"
- " changing of density results in duplicating (or deleting)"
- " of frames on disk",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Density..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_dup, nreturn_std,
- args_dup, return_std);
+ "This plugin changes the number of frames (density) on disk to match a"
+ " new target framerate that is densty_factor times higher"
+ " than the origianl framerate."
+ " (or 1/density_factor lower if density_grow is FALSE)"
+ " changing of density results in duplicating (or deleting)"
+ " of frames on disk",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Density..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_dup, nreturn_std,
+ args_dup, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_EXCHG,
- "This plugin exchanges content of the current with destination frame.",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Exchange Frame..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_exchg, nreturn_std,
- args_exchg, return_std);
+ "This plugin exchanges content of the current with destination frame.",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Exchange Frame..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_exchg, nreturn_std,
+ args_exchg, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_MOVE,
- "This plugin copies layer(s) from one sourceimage to multiple frames on disk, varying position, size and opacity.",
- "For NONINTERACTIVE PDB interfaces see also (plug_in_gap_move_path_ext, plug_in_gap_move_path_ext2)",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Move Path..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_mov), nreturn_std,
- args_mov, return_std);
+ "This plugin copies layer(s) from one sourceimage to multiple frames on disk, varying position, size and opacity.",
+ "For NONINTERACTIVE PDB interfaces see also (plug_in_gap_move_path_ext, plug_in_gap_move_path_ext2)",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Move Path..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_mov), nreturn_std,
+ args_mov, return_std);
l_help_str = g_strdup_printf(
- "This plugin inserts one layer in each frame of the selected frame range of an Animation\n"
- " (specified by the dst_image parameter).\n"
- " An Animation is a series of numbered video frame images on disk where only the current\n"
- " Frame is opened in the gimp\n"
- " The inserted layer is derived from another (multilayer)image\n"
- " or from another Animation (as merged copy of the visible layers in a source frame)\n"
- " the affected destination frame range is selected by the range_from and range_to parameters\n"
- " the src_stepmode parameter controls how to derive the layer that is to be inserted.\n"
- " With the Controlpoint Parameters you can control position (coordinates),\n"
- " size, rotation, perspective and opacity values of the inserted layer\n"
- " If you want to move an Object from position AX/AY to BX/BY in a straight line within the range of 24 frames\n"
- " you need 2 Contolpoints, if you want the object to move folowing a path\n"
- " you need some more Controlpoints to do that.\n"
- " With the rotation_follow Parameter you can force automatic calculation of the rotation for the inserted\n"
- " layer according to the path vectors it is moving along.\n"
- " A controlpoint can be fixed to a special framenumber using the keyframe_abs controlpoint-parameter.\n"
- " Restictions:\n"
- " - keyframe_abs numbers must be 0 (== not fixed) or a frame_number within the affected frame range\n"
- " - keyframes_abs must be in sequence (ascending or descending)\n"
- " - the first and last controlpoint are always implicite keyframes, and should be passed with keyframe_abs = 0\n"
- " - the number of controlpoints is limitied to a maximum of %d.\n"
+ "This plugin inserts one layer in each frame of the selected frame range of an Animation\n"
+ " (specified by the dst_image parameter).\n"
+ " An Animation is a series of numbered video frame images on disk where only the current\n"
+ " Frame is opened in the gimp\n"
+ " The inserted layer is derived from another (multilayer)image\n"
+ " or from another Animation (as merged copy of the visible layers in a source frame)\n"
+ " the affected destination frame range is selected by the range_from and range_to parameters\n"
+ " the src_stepmode parameter controls how to derive the layer that is to be inserted.\n"
+ " With the Controlpoint Parameters you can control position (coordinates),\n"
+ " size, rotation, perspective and opacity values of the inserted layer\n"
+ " If you want to move an Object from position AX/AY to BX/BY in a straight line within the range of 24 frames\n"
+ " you need 2 Contolpoints, if you want the object to move folowing a path\n"
+ " you need some more Controlpoints to do that.\n"
+ " With the rotation_follow Parameter you can force automatic calculation of the rotation for the inserted\n"
+ " layer according to the path vectors it is moving along.\n"
+ " A controlpoint can be fixed to a special framenumber using the keyframe_abs controlpoint-parameter.\n"
+ " Restictions:\n"
+ " - keyframe_abs numbers must be 0 (== not fixed) or a frame_number within the affected frame range\n"
+ " - keyframes_abs must be in sequence (ascending or descending)\n"
+ " - the first and last controlpoint are always implicite keyframes, and should be passed with keyframe_abs = 0\n"
+ " - the number of controlpoints is limitied to a maximum of %d.\n"
" the number of controlpoints must be passed in all argc_* parameters\n"
- "If the TraceLayer feature is turned on, an additional layer\n"
- " is inserted below the moving object. This Tracelayer shows all steps\n"
- " of the moving object since the 1st Frame.\n"
- "With TweenSteps you can calculate virtual Frames between 2 destination frames\n"
- " all these Steps are collected in another additional Layer.\n"
- " this Tweenlayer is added below the moving Obect in all handled destination Frames\n"
- "See also (plug_in_gap_move_path, plug_in_gap_move)",
- (int)GAP_MOV_MAX_POINT);
+ "If the TraceLayer feature is turned on, an additional layer\n"
+ " is inserted below the moving object. This Tracelayer shows all steps\n"
+ " of the moving object since the 1st Frame.\n"
+ "With TweenSteps you can calculate virtual Frames between 2 destination frames\n"
+ " all these Steps are collected in another additional Layer.\n"
+ " this Tweenlayer is added below the moving Obect in all handled destination Frames\n"
+ "See also (plug_in_gap_move_path, plug_in_gap_move)",
+ (int)GAP_MOV_MAX_POINT);
gimp_install_procedure(PLUGIN_NAME_GAP_MOVE_PATH_EXT,
- "This plugin copies layer(s) from one sourceimage or source animation to multiple frames on disk,\n"
- "with varying position, size, perspective and opacity.\n"
- ,
- l_help_str,
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_mov_path_ext, nreturn_std,
- args_mov_path_ext, return_std);
+ "This plugin copies layer(s) from one sourceimage or source animation to multiple frames on disk,\n"
+ "with varying position, size, perspective and opacity.\n"
+ ,
+ l_help_str,
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_mov_path_ext, nreturn_std,
+ args_mov_path_ext, return_std);
g_free(l_help_str);
gimp_install_procedure(PLUGIN_NAME_GAP_MOVE_PATH_EXT2,
- "This plugin copies layer(s) from one sourceimage or source animation to multiple frames on disk,\n"
- "with varying position, size, perspective and opacity.\n"
- ,
- "This plugin is just another Interface for the MovePath (plug_in_gap_move_path_ext)\n"
- " using a File to specify Controlpoints (rather than Array parameters).\n"
- " Notes:\n"
- " - you can create a controlpoint file with in the MovePath Dialog (interactive call of plug_in_gap_move)\n"
- " - for more infos about controlpoints see help of (plug_in_gap_move_path)\n"
- ,
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_mov_path_ext2, nreturn_std,
- args_mov_path_ext2, return_std);
+ "This plugin copies layer(s) from one sourceimage or source animation to multiple frames on disk,\n"
+ "with varying position, size, perspective and opacity.\n"
+ ,
+ "This plugin is just another Interface for the MovePath (plug_in_gap_move_path_ext)\n"
+ " using a File to specify Controlpoints (rather than Array parameters).\n"
+ " Notes:\n"
+ " - you can create a controlpoint file with in the MovePath Dialog (interactive call of plug_in_gap_move)\n"
+ " - for more infos about controlpoints see help of (plug_in_gap_move_path)\n"
+ ,
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_mov_path_ext2, nreturn_std,
+ args_mov_path_ext2, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_RANGE_TO_MULTILAYER,
- "This plugin creates a new image from the given range of frame-images. Each frame is converted to one layer in the new image, according to flatten_mode. (the frames on disk are not changed).",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames to Image..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_f2multi, nreturn_f2multi,
- args_f2multi, return_f2multi);
+ "This plugin creates a new image from the given range of frame-images. Each frame is converted to one layer in the new image, according to flatten_mode. (the frames on disk are not changed).",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames to Image..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_f2multi, nreturn_f2multi,
+ args_f2multi, return_f2multi);
gimp_install_procedure(PLUGIN_NAME_GAP_RANGE_FLATTEN,
- "This plugin flattens the given range of frame-images (on disk)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Flatten..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_rflatt, nreturn_std,
- args_rflatt, return_std);
+ "This plugin flattens the given range of frame-images (on disk)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Flatten..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_rflatt, nreturn_std,
+ args_rflatt, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_RANGE_LAYER_DEL,
- "This plugin deletes one layer in the given range of frame-images (on disk). exception: the last remaining layer of a frame is not deleted",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Layer Delete..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_rlayerdel, nreturn_std,
- args_rlayerdel, return_std);
+ "This plugin deletes one layer in the given range of frame-images (on disk). exception: the last remaining layer of a frame is not deleted",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Layer Delete..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_rlayerdel, nreturn_std,
+ args_rlayerdel, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_RANGE_CONVERT,
- "This plugin converts the given range of frame-images to other fileformats (on disk) depending on extension",
- "WARNING this procedure is obsolete, please use plug_in_gap_range_convert2",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_rconv, nreturn_rconv,
- args_rconv, return_rconv);
+ "This plugin converts the given range of frame-images to other fileformats (on disk) depending on extension",
+ "WARNING this procedure is obsolete, please use plug_in_gap_range_convert2",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_rconv, nreturn_rconv,
+ args_rconv, return_rconv);
gimp_install_procedure(PLUGIN_NAME_GAP_RANGE_CONVERT2,
- "This plugin converts the given range of frame-images to other fileformats (on disk) depending on extension",
- "only one of the converted frames is returned (the one with lowest handled frame number)",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Convert..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_rconv2, nreturn_rconv,
- args_rconv2, return_rconv);
+ "This plugin converts the given range of frame-images to other fileformats (on disk) depending on extension",
+ "only one of the converted frames is returned (the one with lowest handled frame number)",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Convert..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_rconv2, nreturn_rconv,
+ args_rconv2, return_rconv);
gimp_install_procedure(PLUGIN_NAME_GAP_ANIM_RESIZE,
- "This plugin resizes all video frames (images on disk) to the given new_width/new_height",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Resize..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_resize, nreturn_std,
- args_resize, return_std);
+ "This plugin resizes all video frames (images on disk) to the given new_width/new_height",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Resize..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_resize, nreturn_std,
+ args_resize, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_ANIM_CROP,
- "This plugin crops all video frames (images on disk) to the given new_width/new_height",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Crop..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_resize, nreturn_std,
- args_resize, return_std);
+ "This plugin crops all video frames (images on disk) to the given new_width/new_height",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Crop..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_resize, nreturn_std,
+ args_resize, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_ANIM_SCALE,
- "This plugin scales all video frames (images on disk) to the given new_width/new_height",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Scale..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_scale, nreturn_std,
- args_scale, return_std);
+ "This plugin scales all video frames (images on disk) to the given new_width/new_height",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Scale..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_scale, nreturn_std,
+ args_scale, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_SPLIT,
- "This plugin splits the current image to video frames (images on disk). Each layer is saved as one frame",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Split Image to Frames..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_split, nreturn_split,
- args_split, return_split);
+ "This plugin splits the current image to video frames (images on disk). Each layer is saved as one frame",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Split Image to Frames..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_split, nreturn_split,
+ args_split, return_split);
gimp_install_procedure(PLUGIN_NAME_GAP_SHIFT,
"This plugin exchanges frame numbers in the given range. (discfile frame_0001.xcf is renamed to frame_0002.xcf, 2->3, 3->4 ... n->1)",
@@ -1020,109 +1020,109 @@
args_reverse, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_RENUMBER,
- "This plugin renumbers all frames (discfiles) starting at start_frame_nr using n digits for the framenumber part)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Renumber..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_renumber, nreturn_std,
- args_renumber, return_std);
+ "This plugin renumbers all frames (discfiles) starting at start_frame_nr using n digits for the framenumber part)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Renumber..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_renumber, nreturn_std,
+ args_renumber, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_MODIFY,
- "This plugin performs a modifying action on each selected layer in each selected framerange",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- N_("Frames Modify..."),
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_modify, nreturn_std,
- args_modify, return_std);
+ "This plugin performs a modifying action on each selected layer in each selected framerange",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ N_("Frames Modify..."),
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_modify, nreturn_std,
+ args_modify, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_VIDEO_EDIT_COPY,
- "This plugin appends the selected framerange to the video paste buffer"
- "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
- "and a framefile basename configured by gimprc (video-paste-basename)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_video_copy, nreturn_nothing,
- args_video_copy, return_nothing);
+ "This plugin appends the selected framerange to the video paste buffer"
+ "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
+ "and a framefile basename configured by gimprc (video-paste-basename)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_video_copy, nreturn_nothing,
+ args_video_copy, return_nothing);
gimp_install_procedure(PLUGIN_NAME_GAP_VIDEO_EDIT_PASTE,
- "This plugin copies all frames from the video paste buffer"
- "to the current video. Depending on the paste_mode parameter"
- "the copied frames are replacing frames beginning at current frame"
- "or are inserted before or after the current frame"
- "the pasted frames are scaled to fit the current video size"
- "and converted in Imagetype (RGB,GRAY,INDEXED) if necessary"
- "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
- "and a framefile basename configured by gimprc (video-paste-basename)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_video_paste, nreturn_std,
- args_video_paste, return_std);
+ "This plugin copies all frames from the video paste buffer"
+ "to the current video. Depending on the paste_mode parameter"
+ "the copied frames are replacing frames beginning at current frame"
+ "or are inserted before or after the current frame"
+ "the pasted frames are scaled to fit the current video size"
+ "and converted in Imagetype (RGB,GRAY,INDEXED) if necessary"
+ "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
+ "and a framefile basename configured by gimprc (video-paste-basename)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_video_paste, nreturn_std,
+ args_video_paste, return_std);
gimp_install_procedure(PLUGIN_NAME_GAP_VIDEO_EDIT_CLEAR,
- "clear the video paste buffer by deleting all framefiles"
- "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
- "and a framefile basename configured by gimprc (video-paste-basename)",
- "",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* do not appear in menus */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args_video_clear),
+ "clear the video paste buffer by deleting all framefiles"
+ "the video paste buffer is a directory configured by gimprc (video-paste-dir )"
+ "and a framefile basename configured by gimprc (video-paste-basename)",
+ "",
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* do not appear in menus */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ G_N_ELEMENTS (args_video_clear),
nreturn_nothing,
- args_video_clear, return_nothing);
+ args_video_clear, return_nothing);
gimp_install_procedure(PLUGIN_NAME_GAP_GET_ANIMINFO,
- "This plugin gets animation infos about video frames."
+ "This plugin gets animation infos about video frames."
,
- "Informations about the video frames belonging to the\n"
+ "Informations about the video frames belonging to the\n"
" passed image_id are returned. (therefore the directory\n"
" is scanned and checked for video frame discfiles.\n"
" If you call this plugin on images without a Name\n"
" You will get just default values."
,
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* no menu */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_std, nreturn_ainfo,
- args_std, return_ainfo);
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* no menu */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_std, nreturn_ainfo,
+ args_std, return_ainfo);
gimp_install_procedure(PLUGIN_NAME_GAP_SET_FRAMERATE,
- "This plugin sets the framerate for video frames",
- "The framerate is stored in a video info file"
+ "This plugin sets the framerate for video frames",
+ "The framerate is stored in a video info file"
" named like the basename of the video frames"
" without a framenumber. The extension"
" of this video info file is .vin",
- "Wolfgang Hofer (hof gimp org)",
- "Wolfgang Hofer",
- GAP_VERSION_WITH_DATE,
- NULL, /* no menu */
- "RGB*, INDEXED*, GRAY*",
- GIMP_PLUGIN,
- nargs_setrate, nreturn_nothing,
- args_setrate, return_nothing);
+ "Wolfgang Hofer (hof gimp org)",
+ "Wolfgang Hofer",
+ GAP_VERSION_WITH_DATE,
+ NULL, /* no menu */
+ "RGB*, INDEXED*, GRAY*",
+ GIMP_PLUGIN,
+ nargs_setrate, nreturn_nothing,
+ args_setrate, return_nothing);
{
/* Menu names */
@@ -1156,7 +1156,7 @@
gimp_plugin_menu_register (PLUGIN_NAME_GAP_RENUMBER, menupath_image_video);
gimp_plugin_menu_register (PLUGIN_NAME_GAP_MODIFY, menupath_image_video);
}
-} /* end query */
+} /* end query */
@@ -1597,93 +1597,93 @@
if (run_mode == GIMP_RUN_NONINTERACTIVE)
{
if ( ((n_params != nargs_mov_path_ext) && (strcmp (name, PLUGIN_NAME_GAP_MOVE_PATH_EXT) == 0))
- || ((n_params != nargs_mov_path_ext2) && (strcmp (name, PLUGIN_NAME_GAP_MOVE_PATH_EXT2) == 0)))
+ || ((n_params != nargs_mov_path_ext2) && (strcmp (name, PLUGIN_NAME_GAP_MOVE_PATH_EXT2) == 0)))
{
status = GIMP_PDB_CALLING_ERROR;
}
- else
- {
- pvals->dst_range_start = param[3].data.d_int32;
- pvals->dst_range_end = param[4].data.d_int32;
- pvals->dst_layerstack = param[5].data.d_int32;
-
- pvals->src_layer_id = param[6].data.d_layer;
- pvals->src_stepmode = param[7].data.d_int32;
- pvals->src_handle = param[8].data.d_int32;
- pvals->src_paintmode = param[9].data.d_int32;
- pvals->src_force_visible = param[10].data.d_int32;
- pvals->clip_to_img = param[11].data.d_int32;
+ else
+ {
+ pvals->dst_range_start = param[3].data.d_int32;
+ pvals->dst_range_end = param[4].data.d_int32;
+ pvals->dst_layerstack = param[5].data.d_int32;
+
+ pvals->src_layer_id = param[6].data.d_layer;
+ pvals->src_stepmode = param[7].data.d_int32;
+ pvals->src_handle = param[8].data.d_int32;
+ pvals->src_paintmode = param[9].data.d_int32;
+ pvals->src_force_visible = param[10].data.d_int32;
+ pvals->clip_to_img = param[11].data.d_int32;
l_rotation_follow = param[12].data.d_int32;
l_startangle = param[13].data.d_float;
pvals->step_speed_factor = param[14].data.d_float;
- pvals->tween_steps = param[15].data.d_int32;
- pvals->tween_opacity_initial = param[16].data.d_float;
- pvals->tween_opacity_desc = param[17].data.d_float;
- pvals->tracelayer_enable = param[18].data.d_int32;
- pvals->trace_opacity_initial = param[19].data.d_float;
- pvals->trace_opacity_desc = param[20].data.d_float;
- pvals->src_apply_bluebox = param[21].data.d_int32;
- pvals->src_selmode = param[22].data.d_int32;
-
- if (strcmp (name, PLUGIN_NAME_GAP_MOVE_PATH_EXT) == 0)
- {
- /* PLUGIN_NAME_GAP_MOVE_PATH_EXT passes controlpoints as array parameters */
- l_numpoints = param[23].data.d_int32;
- if ((l_numpoints != param[25].data.d_int32)
- || (l_numpoints != param[27].data.d_int32)
- || (l_numpoints != param[29].data.d_int32)
- || (l_numpoints != param[31].data.d_int32)
- || (l_numpoints != param[33].data.d_int32)
- || (l_numpoints != param[35].data.d_int32)
- || (l_numpoints != param[37].data.d_int32)
- || (l_numpoints != param[39].data.d_int32)
- || (l_numpoints != param[41].data.d_int32)
- || (l_numpoints != param[43].data.d_int32)
- || (l_numpoints != param[45].data.d_int32)
- || (l_numpoints != param[47].data.d_int32)
- || (l_numpoints != param[49].data.d_int32)
- || (l_numpoints != param[51].data.d_int32)
- || (l_numpoints != param[53].data.d_int32))
- {
- printf("plug_in_gap_move_path_ext: CallingError: different numbers in the controlpoint array argc parameters\n");
+ pvals->tween_steps = param[15].data.d_int32;
+ pvals->tween_opacity_initial = param[16].data.d_float;
+ pvals->tween_opacity_desc = param[17].data.d_float;
+ pvals->tracelayer_enable = param[18].data.d_int32;
+ pvals->trace_opacity_initial = param[19].data.d_float;
+ pvals->trace_opacity_desc = param[20].data.d_float;
+ pvals->src_apply_bluebox = param[21].data.d_int32;
+ pvals->src_selmode = param[22].data.d_int32;
+
+ if (strcmp (name, PLUGIN_NAME_GAP_MOVE_PATH_EXT) == 0)
+ {
+ /* PLUGIN_NAME_GAP_MOVE_PATH_EXT passes controlpoints as array parameters */
+ l_numpoints = param[23].data.d_int32;
+ if ((l_numpoints != param[25].data.d_int32)
+ || (l_numpoints != param[27].data.d_int32)
+ || (l_numpoints != param[29].data.d_int32)
+ || (l_numpoints != param[31].data.d_int32)
+ || (l_numpoints != param[33].data.d_int32)
+ || (l_numpoints != param[35].data.d_int32)
+ || (l_numpoints != param[37].data.d_int32)
+ || (l_numpoints != param[39].data.d_int32)
+ || (l_numpoints != param[41].data.d_int32)
+ || (l_numpoints != param[43].data.d_int32)
+ || (l_numpoints != param[45].data.d_int32)
+ || (l_numpoints != param[47].data.d_int32)
+ || (l_numpoints != param[49].data.d_int32)
+ || (l_numpoints != param[51].data.d_int32)
+ || (l_numpoints != param[53].data.d_int32))
+ {
+ printf("plug_in_gap_move_path_ext: CallingError: different numbers in the controlpoint array argc parameters\n");
status = GIMP_PDB_CALLING_ERROR;
- }
- else
- {
- pvals->point_idx_max = l_numpoints -1;
- for(l_idx = 0; l_idx < l_numpoints; l_idx++)
- {
- pvals->point[l_idx].p_x = param[24].data.d_int32array[l_idx];
- pvals->point[l_idx].p_y = param[26].data.d_int32array[l_idx];
- pvals->point[l_idx].opacity = param[28].data.d_floatarray[l_idx];
- pvals->point[l_idx].w_resize = param[30].data.d_floatarray[l_idx];
- pvals->point[l_idx].h_resize = param[32].data.d_floatarray[l_idx];
- pvals->point[l_idx].rotation = param[34].data.d_floatarray[l_idx];
- pvals->point[l_idx].keyframe_abs = param[36].data.d_int32array[l_idx];
- /* pvals->point[l_idx].keyframe = ; */ /* relative keyframes are calculated later */
- pvals->point[l_idx].ttlx = param[38].data.d_floatarray[l_idx];
- pvals->point[l_idx].ttly = param[40].data.d_floatarray[l_idx];
- pvals->point[l_idx].ttrx = param[42].data.d_floatarray[l_idx];
- pvals->point[l_idx].ttry = param[44].data.d_floatarray[l_idx];
- pvals->point[l_idx].tblx = param[46].data.d_floatarray[l_idx];
- pvals->point[l_idx].tbly = param[48].data.d_floatarray[l_idx];
- pvals->point[l_idx].tbrx = param[50].data.d_floatarray[l_idx];
- pvals->point[l_idx].tbry = param[52].data.d_floatarray[l_idx];
- pvals->point[l_idx].sel_feather_radius = param[54].data.d_floatarray[l_idx];
- }
- }
- }
- else
- {
- /* PLUGIN_NAME_GAP_MOVE_PATH_EXT2 operates with controlpoint file */
- if(param[23].data.d_string != NULL)
- {
- pointfile = g_strdup(param[23].data.d_string);
- }
- }
- }
+ }
+ else
+ {
+ pvals->point_idx_max = l_numpoints -1;
+ for(l_idx = 0; l_idx < l_numpoints; l_idx++)
+ {
+ pvals->point[l_idx].p_x = param[24].data.d_int32array[l_idx];
+ pvals->point[l_idx].p_y = param[26].data.d_int32array[l_idx];
+ pvals->point[l_idx].opacity = param[28].data.d_floatarray[l_idx];
+ pvals->point[l_idx].w_resize = param[30].data.d_floatarray[l_idx];
+ pvals->point[l_idx].h_resize = param[32].data.d_floatarray[l_idx];
+ pvals->point[l_idx].rotation = param[34].data.d_floatarray[l_idx];
+ pvals->point[l_idx].keyframe_abs = param[36].data.d_int32array[l_idx];
+ /* pvals->point[l_idx].keyframe = ; */ /* relative keyframes are calculated later */
+ pvals->point[l_idx].ttlx = param[38].data.d_floatarray[l_idx];
+ pvals->point[l_idx].ttly = param[40].data.d_floatarray[l_idx];
+ pvals->point[l_idx].ttrx = param[42].data.d_floatarray[l_idx];
+ pvals->point[l_idx].ttry = param[44].data.d_floatarray[l_idx];
+ pvals->point[l_idx].tblx = param[46].data.d_floatarray[l_idx];
+ pvals->point[l_idx].tbly = param[48].data.d_floatarray[l_idx];
+ pvals->point[l_idx].tbrx = param[50].data.d_floatarray[l_idx];
+ pvals->point[l_idx].tbry = param[52].data.d_floatarray[l_idx];
+ pvals->point[l_idx].sel_feather_radius = param[54].data.d_floatarray[l_idx];
+ }
+ }
+ }
+ else
+ {
+ /* PLUGIN_NAME_GAP_MOVE_PATH_EXT2 operates with controlpoint file */
+ if(param[23].data.d_string != NULL)
+ {
+ pointfile = g_strdup(param[23].data.d_string);
+ }
+ }
+ }
}
@@ -1718,9 +1718,9 @@
framerate = 50;
strcpy(frame_basename, "frame");
- sel_mode = GAP_MTCH_ALL_VISIBLE;
- sel_invert = FALSE;
- sel_case = TRUE;
+ sel_mode = GAP_MTCH_ALL_VISIBLE;
+ sel_invert = FALSE;
+ sel_case = TRUE;
if ( n_params >= 9 )
{
@@ -1736,17 +1736,17 @@
sel_mode = param[9].data.d_int32;
sel_case = param[10].data.d_int32;
sel_invert = param[11].data.d_int32;
- if(param[12].data.d_string != NULL)
- {
+ if(param[12].data.d_string != NULL)
+ {
strncpy(l_sel_str, param[12].data.d_string, sizeof(l_sel_str) -1);
- l_sel_str[sizeof(l_sel_str) -1] = '\0';
- }
+ l_sel_str[sizeof(l_sel_str) -1] = '\0';
+ }
selection_mode = param[13].data.d_int32;
- }
+ }
l_rc_image = gap_range_to_multilayer(run_mode, image_id, range_from, range_to, mode, nr,
framerate, frame_basename, FRAME_BASENAME_LEN,
- sel_mode, sel_case, sel_invert, l_sel_str, selection_mode);
+ sel_mode, sel_case, sel_invert, l_sel_str, selection_mode);
}
values[1].type = GIMP_PDB_IMAGE;
@@ -1817,9 +1817,9 @@
if (n_params >= 15)
{
l_palette_ptr = param[14].data.d_string;
- palette_type = param[11].data.d_int32;
- alpha_dither = param[12].data.d_int32;
- remove_unused = param[13].data.d_int32;
+ palette_type = param[11].data.d_int32;
+ alpha_dither = param[12].data.d_int32;
+ remove_unused = param[13].data.d_int32;
}
}
}
@@ -1837,10 +1837,10 @@
l_rc_image = gap_range_conv(run_mode, image_id, range_from, range_to, nr,
dest_type, dest_colors, dest_dither,
l_basename_ptr, l_extension,
- palette_type,
- alpha_dither,
- remove_unused,
- l_palette_ptr);
+ palette_type,
+ alpha_dither,
+ remove_unused,
+ l_palette_ptr);
}
}
@@ -2041,13 +2041,13 @@
if (status == GIMP_PDB_SUCCESS)
{
if(gap_vid_edit_clear() < 0)
- {
+ {
l_rc_image = -1;
- }
- else
- {
+ }
+ else
+ {
l_rc_image = 0;
- }
+ }
}
}
else if (strcmp (name, PLUGIN_NAME_GAP_MODIFY) == 0)
@@ -2058,19 +2058,19 @@
{
status = GIMP_PDB_CALLING_ERROR;
}
- else
- {
- if(param[9].data.d_string != NULL)
- {
+ else
+ {
+ if(param[9].data.d_string != NULL)
+ {
strncpy(l_sel_str, param[9].data.d_string, sizeof(l_sel_str) -1);
- l_sel_str[sizeof(l_sel_str) -1] = '\0';
- }
- if(param[10].data.d_string != NULL)
- {
+ l_sel_str[sizeof(l_sel_str) -1] = '\0';
+ }
+ if(param[10].data.d_string != NULL)
+ {
strncpy(l_layername, param[10].data.d_string, sizeof(l_layername) -1);
- l_layername[sizeof(l_layername) -1] = '\0';
- }
- }
+ l_layername[sizeof(l_layername) -1] = '\0';
+ }
+ }
}
if (status == GIMP_PDB_SUCCESS)
Modified: trunk/gap/gap_match.c
==============================================================================
--- trunk/gap/gap_match.c (original)
+++ trunk/gap/gap_match.c Sun Apr 5 06:47:07 2009
@@ -110,33 +110,33 @@
switch(*new_layername)
{
case '[':
- if((new_layername[1] == '#') && (l_digits == 0))
- {
- l_cpy = 0;
- l_digits = 1;
- }
- break;
+ if((new_layername[1] == '#') && (l_digits == 0))
+ {
+ l_cpy = 0;
+ l_digits = 1;
+ }
+ break;
case '#':
- if(l_digits > 0)
- {
- l_cpy = 0;
- l_digits++;
- }
- break;
+ if(l_digits > 0)
+ {
+ l_cpy = 0;
+ l_digits++;
+ }
+ break;
case ']':
- if(l_digits > 0)
- {
- l_digits--;
- g_snprintf(&l_fmt_str[2], sizeof(l_fmt_str) -2, "%dd", l_digits);
- g_snprintf(&buffer[l_idx], buff_len - l_idx, l_fmt_str, (int)curr);
- l_idx += l_digits;
+ if(l_digits > 0)
+ {
+ l_digits--;
+ g_snprintf(&l_fmt_str[2], sizeof(l_fmt_str) -2, "%dd", l_digits);
+ g_snprintf(&buffer[l_idx], buff_len - l_idx, l_fmt_str, (int)curr);
+ l_idx += l_digits;
l_digits = 0;
- l_cpy = 0;
- }
- break;
- default:
- l_digits = 0;
- break;
+ l_cpy = 0;
+ }
+ break;
+ default:
+ l_digits = 0;
+ break;
}
src_ptr = new_layername;
@@ -153,11 +153,11 @@
if(l_cpy != 0)
{
while(src_ptr != new_layername)
- {
+ {
buffer[l_idx] = (*src_ptr);
- src_ptr++;
+ src_ptr++;
l_idx++;
- }
+ }
}
@@ -166,7 +166,7 @@
}
buffer[l_idx] = '\0';
-} /* end gap_match_substitute_framenr */
+} /* end gap_match_substitute_framenr */
/* ---------------------------------
@@ -283,7 +283,7 @@
} /* end while */
return(FALSE);
-} /* end gap_match_number */
+} /* end gap_match_number */
/* ---------------------------------
@@ -323,29 +323,29 @@
case GAP_MTCH_ANYWHERE:
l_llen = strlen(layername);
l_plen = strlen(pattern);
- uni_ptr = layername;
+ uni_ptr = layername;
while (l_llen >= l_plen)
- {
- /* printf("GAP_MTCH :%s: llen:%d \n", uni_ptr, (int)l_llen); */
-
+ {
+ /* printf("GAP_MTCH :%s: llen:%d \n", uni_ptr, (int)l_llen); */
+
if((l_llen == l_plen) || (mode == GAP_MTCH_ANYWHERE))
- {
- if(0 == strncmp(uni_ptr, pattern, l_plen))
+ {
+ if(0 == strncmp(uni_ptr, pattern, l_plen))
{
- return(TRUE);
+ return(TRUE);
}
- }
+ }
- if(utf8_compliant)
- {
- uni_ptr = g_utf8_find_next_char(uni_ptr, NULL);
- }
- else
- {
- uni_ptr++;
- }
+ if(utf8_compliant)
+ {
+ uni_ptr = g_utf8_find_next_char(uni_ptr, NULL);
+ }
+ else
+ {
+ uni_ptr++;
+ }
l_llen = strlen(uni_ptr);
- }
+ }
break;
default:
break;
Modified: trunk/gap/gap_morph_dialog.c
==============================================================================
--- trunk/gap/gap_morph_dialog.c (original)
+++ trunk/gap/gap_morph_dialog.c Sun Apr 5 06:47:07 2009
@@ -83,9 +83,9 @@
/* event masks for the preview widgets */
#define GAP_MORPH_PVIEW_MASK GDK_EXPOSURE_MASK | \
- GDK_BUTTON_PRESS_MASK |\
- GDK_BUTTON_RELEASE_MASK |\
- GDK_BUTTON_MOTION_MASK
+ GDK_BUTTON_PRESS_MASK |\
+ GDK_BUTTON_RELEASE_MASK |\
+ GDK_BUTTON_MOTION_MASK
/* op_mode Radio Buttons */
@@ -104,9 +104,9 @@
static void p_upd_warp_info_label(GapMorphGUIParams *mgup);
static gboolean p_pixel_check_opaque(GimpPixelFetcher *pft
, gint bpp
- , gdouble needx
- , gdouble needy
- );
+ , gdouble needx
+ , gdouble needy
+ );
static void p_find_outmost_opaque_pixel(GimpPixelFetcher *pft
,gint bpp
,gdouble alpha_rad
@@ -131,9 +131,9 @@
GapMorphWorkPoint * gap_morph_dlg_new_workpont(gdouble srcx, gdouble srcy, gdouble dstx, gdouble dsty);
static void p_delete_current_point(GapMorphSubWin *swp);
static void p_set_nearest_current_workpoint(GapMorphSubWin *swp
- , gdouble in_x
- , gdouble in_y
- );
+ , gdouble in_x
+ , gdouble in_y
+ );
static void p_set_current_workpoint_no_refresh(GapMorphSubWin *swp, GapMorphWorkPoint *wp);
static void p_set_current_workpoint(GapMorphSubWin *swp, GapMorphWorkPoint *wp);
static GapMorphWorkPoint * p_add_new_point(GapMorphSubWin *swp, gdouble in_x, gdouble in_y);
@@ -146,16 +146,16 @@
);
static gboolean p_pick_nearest_point(GapMorphSubWin *swp, gdouble l_x, gdouble l_y);
static void p_show_warp_pick_point(GapMorphGUIParams *mgup
- ,gdouble l_x
- ,gdouble l_y
- );
+ ,gdouble l_x
+ ,gdouble l_y
+ );
static void p_draw_workpoints (GapMorphSubWin *swp);
static void p_prevw_draw (GapMorphSubWin *swp);
static void p_render_zoomed_pview(GapMorphSubWin *swp);
static gint on_pview_events (GtkWidget *widget
- , GdkEvent *event
- , GapMorphSubWin *swp
- );
+ , GdkEvent *event
+ , GapMorphSubWin *swp
+ );
static void p_scale_wp_list(GapMorphGUIParams *mgup);
static void p_imglayer_menu_callback(GtkWidget *widget, GapMorphSubWin *swp);
@@ -197,9 +197,9 @@
static GtkWidget * p_create_subwin(GapMorphSubWin *swp
, const char *title
- , GapMorphGUIParams *mgup
- , GtkWidget *master_hbox
- );
+ , GapMorphGUIParams *mgup
+ , GtkWidget *master_hbox
+ );
static void gap_morph_create_dialog(GapMorphGUIParams *mgup);
@@ -219,8 +219,8 @@
p_add_4corner_workpoints(mgup);
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
+ );
p_refresh_total_points_label(mgup);
mgup->mgpp->tween_steps = 1;
mgup->num_shapepoints = 16;
@@ -270,16 +270,16 @@
{
gtk_adjustment_set_value(
GTK_ADJUSTMENT(mgup->tween_steps_spinbutton_adj)
- ,mgup->mgpp->tween_steps);
+ ,mgup->mgpp->tween_steps);
gtk_adjustment_set_value(
GTK_ADJUSTMENT(mgup->num_shapepoints_adj)
- ,mgup->num_shapepoints);
+ ,mgup->num_shapepoints);
gtk_adjustment_set_value(
GTK_ADJUSTMENT(mgup->affect_radius_spinbutton_adj)
- ,mgup->mgpp->affect_radius);
+ ,mgup->mgpp->affect_radius);
gtk_adjustment_set_value(
GTK_ADJUSTMENT(mgup->gravity_intensity_spinbutton_adj)
- ,mgup->mgpp->gravity_intensity);
+ ,mgup->mgpp->gravity_intensity);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mgup->use_quality_wp_selection_checkbutton)
, mgup->mgpp->use_quality_wp_selection);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mgup->use_gravity_checkbutton)
@@ -315,8 +315,8 @@
, (int)wp->sek_idx
, (int)wp->xy_relation
, (float)sqrt(wp->sqr_dist)
- , (float)wp->warp_weight
- );
+ , (float)wp->warp_weight
+ );
gtk_label_set_text(GTK_LABEL(mgup->warp_info_label), msg);
}
}
@@ -590,8 +590,8 @@
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
+ );
} /* end p_zoom_in */
/* -----------------------------
@@ -616,8 +616,8 @@
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
+ );
} /* end p_zoom_out */
@@ -654,17 +654,17 @@
*/
if ( width > height )
{
- /* landscape */
- pv_height = height * pv_pixelsize / width;
- pv_width = pv_pixelsize;
+ /* landscape */
+ pv_height = height * pv_pixelsize / width;
+ pv_width = pv_pixelsize;
swp->zoom = width / (gdouble)pv_width;
}
else
{
- /* portrait */
- pv_width = width * pv_pixelsize / height;
- pv_height = pv_pixelsize;
+ /* portrait */
+ pv_width = width * pv_pixelsize / height;
+ pv_height = pv_pixelsize;
swp->zoom = height / (gdouble)pv_height;
}
swp->max_zoom = swp->zoom;
@@ -672,10 +672,10 @@
if(gap_debug)
{
printf("p_fit_zoom_into_pview_size: width: %d height:%d ## ZOOM:%f\n"
- , (int)width
- , (int)height
- , (float)swp->zoom)
- ;
+ , (int)width
+ , (int)height
+ , (float)swp->zoom)
+ ;
}
@@ -692,12 +692,12 @@
if(swp->src_flag)
{
src_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
- dst_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
+ dst_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
}
else
{
src_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
- dst_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
+ dst_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
}
p_set_upd_timer_request(swp->mgup, src_request, dst_request);
}
@@ -730,39 +730,39 @@
GAP_MORPH_SWAP(gint32
,mgup->mgpp->osrc_layer_id
- ,mgup->mgpp->fdst_layer_id
- )
+ ,mgup->mgpp->fdst_layer_id
+ )
GAP_MORPH_SWAP(gint32
,mgup->src_win.offs_x
,mgup->dst_win.offs_x
- )
+ )
GAP_MORPH_SWAP(gint32
,mgup->src_win.offs_y
,mgup->dst_win.offs_y
- )
+ )
GAP_MORPH_SWAP(gdouble
,mgup->src_win.max_zoom
,mgup->dst_win.max_zoom
- )
+ )
GAP_MORPH_SWAP(gdouble
,mgup->src_win.zoom
,mgup->dst_win.zoom
- )
+ )
for(wp = mgup->mgpp->master_wp_list; wp != NULL; wp = (GapMorphWorkPoint *)wp->next)
{
GAP_MORPH_SWAP(gdouble
,wp->osrc_x
- ,wp->fdst_x
- )
+ ,wp->fdst_x
+ )
GAP_MORPH_SWAP(gdouble
,wp->osrc_y
- ,wp->fdst_y
- )
+ ,wp->fdst_y
+ )
}
if((src_layer_width != dst_layer_width)
@@ -780,7 +780,7 @@
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- );
+ );
} /* end on_swap_button_pressed_callback */
@@ -1105,15 +1105,15 @@
if(wp == mgup->src_win.curr_wp)
{
if(swp->src_flag)
- {
- delx = wp->osrc_x;
- dely = wp->osrc_y;
- }
- else
- {
- delx = wp->fdst_x;
- dely = wp->fdst_y;
- }
+ {
+ delx = wp->osrc_x;
+ dely = wp->osrc_y;
+ }
+ else
+ {
+ delx = wp->fdst_x;
+ dely = wp->fdst_y;
+ }
if(wp_prev == NULL)
{
@@ -1265,8 +1265,8 @@
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
- ,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
+ );
}
} /* end p_set_current_workpoint */
@@ -1499,9 +1499,9 @@
*/
static void
p_show_warp_pick_point(GapMorphGUIParams *mgup
- ,gdouble in_x
- ,gdouble in_y
- )
+ ,gdouble in_x
+ ,gdouble in_y
+ )
{
gdouble pick_x;
gdouble pick_y;
@@ -1529,16 +1529,16 @@
gap_morph_exec_get_warp_pick_koords(mgup->mgpp->master_wp_list
,in_x
- ,in_y
- ,scale_x
- ,scale_y
- ,mgup->mgpp->use_quality_wp_selection
- ,mgup->mgpp->use_gravity
- ,mgup->mgpp->gravity_intensity
- ,mgup->mgpp->affect_radius
- ,&pick_x
- ,&pick_y
- );
+ ,in_y
+ ,scale_x
+ ,scale_y
+ ,mgup->mgpp->use_quality_wp_selection
+ ,mgup->mgpp->use_gravity
+ ,mgup->mgpp->gravity_intensity
+ ,mgup->mgpp->affect_radius
+ ,&pick_x
+ ,&pick_y
+ );
mgup->show_in_x = in_x;
mgup->show_in_y = in_y;
mgup->show_px = pick_x;
@@ -1682,12 +1682,12 @@
/* draw vektor of workpoint movement (only in dst window) */
gdk_draw_line (swp->pv_ptr->da_widget->window
- ,swp->pv_ptr->da_widget->style->black_gc
- ,px
- ,py
- ,qx
- ,qy
- );
+ ,swp->pv_ptr->da_widget->style->black_gc
+ ,px
+ ,py
+ ,qx
+ ,qy
+ );
}
@@ -1855,11 +1855,11 @@
if(gap_debug)
{
printf("p_render_zoomed_pview: w/h: %d / %d offs_x/y: %d / %d\n"
- , (int)width
- , (int)height
- , (int)offs_x
- , (int)offs_y
- );
+ , (int)width
+ , (int)height
+ , (int)offs_x
+ , (int)offs_y
+ );
}
gimp_pixel_rgn_init (&srcPR, src_drawable
@@ -1882,14 +1882,14 @@
,offs_x
,offs_y
,width
- ,height
+ ,height
);
gimp_pixel_rgn_set_rect(&dstPR
,buf_ptr
,0
,0
,width
- ,height
+ ,height
);
g_free(buf_ptr);
@@ -1914,8 +1914,8 @@
*/
static gint
on_pview_events (GtkWidget *widget
- , GdkEvent *event
- , GapMorphSubWin *swp)
+ , GdkEvent *event
+ , GapMorphSubWin *swp)
{
GapMorphGUIParams *mgup;
GdkEventButton *bevent;
@@ -1980,68 +1980,68 @@
l_y = swp->offs_y + (cury * swp->zoom);
make_new_point = FALSE;
- /* Debug SHOW handling */
+ /* Debug SHOW handling */
if (mgup->op_mode == GAP_MORPH_OP_MODE_SHOW)
- {
- if(mouse_button == 1)
- {
- p_show_warp_pick_point(mgup, l_x, l_y);
- }
- else
- {
- GapMorphWorkPoint *wp;
- gdouble sqr_distance;
+ {
+ if(mouse_button == 1)
+ {
+ p_show_warp_pick_point(mgup, l_x, l_y);
+ }
+ else
+ {
+ GapMorphWorkPoint *wp;
+ gdouble sqr_distance;
- /* set nearest point as new current point */
- wp = p_find_nearest_point(swp, l_x, l_y, &sqr_distance);
+ /* set nearest point as new current point */
+ wp = p_find_nearest_point(swp, l_x, l_y, &sqr_distance);
p_set_current_workpoint(swp, wp);
- }
+ }
return (FALSE);
- }
+ }
- /* ZOOM handling */
+ /* ZOOM handling */
if (mgup->op_mode == GAP_MORPH_OP_MODE_ZOOM)
{
- mgup->show_in_x = -1;
- mgup->show_in_y = -1;
+ mgup->show_in_x = -1;
+ mgup->show_in_y = -1;
- if(bevent->state & GDK_CONTROL_MASK)
- {
- if(mouse_button == 1)
- {
+ if(bevent->state & GDK_CONTROL_MASK)
+ {
+ if(mouse_button == 1)
+ {
p_zoom_out(swp);
- }
- else
- {
+ }
+ else
+ {
p_zoom_in(swp, l_x, l_y);
- }
- }
- else
- {
- if(mouse_button == 1)
- {
+ }
+ }
+ else
+ {
+ if(mouse_button == 1)
+ {
p_zoom_in(swp, l_x, l_y);
- }
- else
- {
+ }
+ else
+ {
p_zoom_out(swp);
- }
- }
+ }
+ }
return (FALSE);
- }
+ }
- /* DELETE handling */
- if((mouse_button == 3)
- || (mgup->op_mode == GAP_MORPH_OP_MODE_DELETE))
- {
+ /* DELETE handling */
+ if((mouse_button == 3)
+ || (mgup->op_mode == GAP_MORPH_OP_MODE_DELETE))
+ {
if((p_pick_nearest_point(swp, l_x, l_y))
- || (mgup->op_mode == GAP_MORPH_OP_MODE_DELETE))
+ || (mgup->op_mode == GAP_MORPH_OP_MODE_DELETE))
{
p_delete_current_point(swp);
p_prevw_draw(swp);
}
return (FALSE);
- }
+ }
if(bevent->state & GDK_SHIFT_MASK)
{
@@ -2052,51 +2052,51 @@
}
else
{
- GapMorphWorkPoint *wp;
- gdouble sqr_distance;
+ GapMorphWorkPoint *wp;
+ gdouble sqr_distance;
- wp = p_find_nearest_point(swp, l_x, l_y, &sqr_distance);
- /* on ALT-click just pick current point
- * but dont drag and dont create new point
- */
- if(bevent->state & GDK_CONTROL_MASK)
- {
- drag_disabled = TRUE;
- }
+ wp = p_find_nearest_point(swp, l_x, l_y, &sqr_distance);
+ /* on ALT-click just pick current point
+ * but dont drag and dont create new point
+ */
+ if(bevent->state & GDK_CONTROL_MASK)
+ {
+ drag_disabled = TRUE;
+ }
- if(bevent->state & GDK_MOD1_MASK)
- {
+ if(bevent->state & GDK_MOD1_MASK)
+ {
p_set_current_workpoint(swp, wp);
- drag_disabled = TRUE;
- return(FALSE);
- }
+ drag_disabled = TRUE;
+ return(FALSE);
+ }
/* normal SET op_mode: try to pick near point
* create new point if nothing is near
- * MOVE op_mode: always pick nearest point,
- * dont create point on click
+ * MOVE op_mode: always pick nearest point,
+ * dont create point on click
*/
if(sqr_distance <= GAP_MORPH_PICK_SQR_NEAR_THRESHOLD)
- {
- p_set_current_workpoint(swp, wp);
- }
- else
{
- if (mgup->op_mode != GAP_MORPH_OP_MODE_MOVE)
- {
+ p_set_current_workpoint(swp, wp);
+ }
+ else
+ {
+ if (mgup->op_mode != GAP_MORPH_OP_MODE_MOVE)
+ {
make_new_point = TRUE;
- }
- else
- {
- p_set_current_workpoint(swp, wp);
- }
+ }
+ else
+ {
+ p_set_current_workpoint(swp, wp);
+ }
}
}
if(make_new_point)
{
- /* add the new point and handle refresh for both src and dst view */
+ /* add the new point and handle refresh for both src and dst view */
p_add_new_point_refresh(swp, l_x, l_y);
- return(FALSE);
+ return(FALSE);
}
}
@@ -2106,17 +2106,17 @@
|| (swp->pview_scrolling))
{
gint l_dx;
- gint l_dy;
+ gint l_dy;
gint32 src_request;
gint32 dst_request;
- l_dx = 0;
- l_dy = 0;
+ l_dx = 0;
+ l_dy = 0;
if((prevx >= 0) && (prevy >= 0))
- {
- l_dx = prevx - curx;
- l_dy = prevy - cury;
- }
+ {
+ l_dx = prevx - curx;
+ l_dy = prevy - cury;
+ }
swp->offs_x += l_dx;
swp->offs_y += l_dy;
@@ -2125,19 +2125,19 @@
if(gap_debug) printf("scrolling dx:%d dy: %d\n", (int)l_dx ,(int)l_dy);
prevx = curx;
- prevy = cury;
+ prevy = cury;
- if(swp->src_flag)
- {
+ if(swp->src_flag)
+ {
src_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
- dst_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
- }
- else
- {
+ dst_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
+ }
+ else
+ {
src_request = GAP_MORPH_DLG_UPD_REQUEST_NONE;
- dst_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
- }
- p_set_upd_timer_request(swp->mgup, src_request, dst_request);
+ dst_request = GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH;
+ }
+ p_set_upd_timer_request(swp->mgup, src_request, dst_request);
return (FALSE);
}
@@ -2148,19 +2148,19 @@
if((!drag_disabled)
& (mgup->op_mode != GAP_MORPH_OP_MODE_SHOW))
{
- *swp->wpx_ptr = swp->offs_x + (curx * swp->zoom);
- *swp->wpy_ptr = swp->offs_y + (cury * swp->zoom);
+ *swp->wpx_ptr = swp->offs_x + (curx * swp->zoom);
+ *swp->wpy_ptr = swp->offs_y + (cury * swp->zoom);
- if((swp->x_spinbutton_adj)
- &&(swp->y_spinbutton_adj))
- {
+ if((swp->x_spinbutton_adj)
+ &&(swp->y_spinbutton_adj))
+ {
/* Render the Preview and Workpoints */
p_prevw_draw(swp);
gtk_adjustment_set_value (GTK_ADJUSTMENT(swp->x_spinbutton_adj), *swp->wpx_ptr);
gtk_adjustment_set_value (GTK_ADJUSTMENT(swp->y_spinbutton_adj), *swp->wpy_ptr);
- }
+ }
}
break;
@@ -2237,23 +2237,23 @@
printf("p_scale_wp_list SRC_LAYER: %d DST_LAYER: %d\n"
, (int)mgup->mgpp->osrc_layer_id
, (int)mgup->mgpp->fdst_layer_id
- );
+ );
printf("p_scale_wp_list src_layer_width: (old:%d) %d\n"
, (int)mgup->old_src_layer_width
, (int)src_layer_width
- );
+ );
printf("p_scale_wp_list src_layer_height: (old:%d) %d\n"
, (int)mgup->old_src_layer_height
, (int)src_layer_height
- );
+ );
printf("p_scale_wp_list dst_layer_width: (old:%d) %d\n"
, (int)mgup->old_dst_layer_width
, (int)dst_layer_width
- );
+ );
printf("p_scale_wp_list dst_layer_height: (old:%d) %d\n"
, (int)mgup->old_dst_layer_height
, (int)dst_layer_height
- );
+ );
printf("p_scale_wp_list src_scale_x: %f\n", (float)src_scale_x);
printf("p_scale_wp_list src_scale_y: %f\n", (float)src_scale_y);
@@ -2403,7 +2403,7 @@
*swp->layer_id_ptr, /* the initial value to set */
G_CALLBACK (p_imglayer_menu_callback),
swp
- );
+ );
} /* end p_refresh_layer_menu */
@@ -2416,7 +2416,7 @@
*/
static void
on_pointcolor_button_changed(GimpColorButton *widget,
- GimpRGB *pcolor )
+ GimpRGB *pcolor )
{
GapMorphGUIParams *mgup;
@@ -2426,8 +2426,8 @@
gimp_color_button_get_color(widget, pcolor);
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
- ,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_REDRAW
+ );
}
@@ -2465,13 +2465,13 @@
{
gtk_label_set_text(GTK_LABEL(mgup->workpoint_file_lower_label)
,mgup->mgpp->workpoint_file_lower
- );
+ );
}
if(mgup->workpoint_file_upper_label)
{
gtk_label_set_text(GTK_LABEL(mgup->workpoint_file_upper_label)
,mgup->mgpp->workpoint_file_upper
- );
+ );
}
if(mgup->wp_filesel)
@@ -2507,9 +2507,9 @@
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (mgup->wp_filesel));
g_snprintf(mgup->workpoint_file_ptr
,GAP_MORPH_WORKPOINT_FILENAME_MAX_LENGTH
- ,"%s"
- ,filename
- );
+ ,"%s"
+ ,filename
+ );
if(mgup->wp_save_mode)
{
gboolean l_wr_permission;
@@ -2523,12 +2523,12 @@
{
if(!gap_moprh_exec_save_workpointfile(filename, mgup))
{
- l_errno = errno;
- g_message (_("Failed to write morph workpointfile\n"
+ l_errno = errno;
+ g_message (_("Failed to write morph workpointfile\n"
"filename: '%s':\n%s")
- , filename
- , g_strerror (l_errno)
- );
+ , filename
+ , g_strerror (l_errno)
+ );
}
}
}
@@ -2553,15 +2553,15 @@
{
if(l_errno != 0)
{
- g_message(_("ERROR: Could not open morph workpoints\n"
- "filename: '%s'\n%s")
- ,filename, g_strerror (errno));
+ g_message(_("ERROR: Could not open morph workpoints\n"
+ "filename: '%s'\n%s")
+ ,filename, g_strerror (errno));
}
else
{
- g_message(_("ERROR: Could not read morph workpoints\n"
- "filename: '%s'\n(Is not a valid morph workpoint file)")
- ,filename);
+ g_message(_("ERROR: Could not read morph workpoints\n"
+ "filename: '%s'\n(Is not a valid morph workpoint file)")
+ ,filename);
}
}
}
@@ -2581,7 +2581,7 @@
static void
p_create_wp_filesel (GapMorphGUIParams *mgup
,GdkEventButton *bevent
- ,gboolean save_mode)
+ ,gboolean save_mode)
{
GtkWidget *wp_button_OK;
GtkWidget *wp_button_cancel;
@@ -2637,7 +2637,7 @@
G_CALLBACK (on_wp_filesel_button_cancel_clicked),
mgup);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (mgup->wp_filesel),
- mgup->workpoint_file_ptr);
+ mgup->workpoint_file_ptr);
gtk_widget_grab_default (wp_button_cancel);
@@ -2656,8 +2656,8 @@
{
p_create_wp_filesel(mgup
,bevent
- ,TRUE /* save_mode */
- );
+ ,TRUE /* save_mode */
+ );
} /* end on_wp_save_button_clicked */
/* --------------------------------
@@ -2671,8 +2671,8 @@
{
p_create_wp_filesel(mgup
,bevent
- ,FALSE /* save_mode */
- );
+ ,FALSE /* save_mode */
+ );
} /* end on_wp_load_button_clicked */
/* --------------------------------
@@ -2683,7 +2683,7 @@
on_wp_shape_button_clicked (GtkButton *button
,GdkEventButton *bevent
,GapMorphGUIParams *mgup
- )
+ )
{
if(mgup)
{
@@ -2706,8 +2706,8 @@
p_generate_outline_shape_workpoints(mgup);
p_set_upd_timer_request(mgup
,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
- );
+ ,GAP_MORPH_DLG_UPD_REQUEST_FULL_REFRESH
+ );
p_refresh_total_points_label(mgup);
}
} /* end on_wp_shape_button_clicked */
@@ -2954,15 +2954,15 @@
, _("Click: pick and drag point at cursor"
" or create new point\n"
"SHIFT-Click: force create new point\n"
- "Alt-Click: disable drag\n"
- "Right-Click: delete point at cursor")
- , NULL);
+ "Alt-Click: disable drag\n"
+ "Right-Click: delete point at cursor")
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_op_mode_callback),
- (gpointer)GAP_MORPH_OP_MODE_SET);
+ G_CALLBACK (on_radio_op_mode_callback),
+ (gpointer)GAP_MORPH_OP_MODE_SET);
l_idx++;
@@ -2979,15 +2979,15 @@
gimp_help_set_help_data(radio_button
, _("Click: drag next point\n"
"SHIFT-Click: force create new point\n"
- "Alt-Click: disable drag\n"
- "Right-Click: delete point at cursor\n")
- , NULL);
+ "Alt-Click: disable drag\n"
+ "Right-Click: delete point at cursor\n")
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_op_mode_callback),
- (gpointer)GAP_MORPH_OP_MODE_MOVE);
+ G_CALLBACK (on_radio_op_mode_callback),
+ (gpointer)GAP_MORPH_OP_MODE_MOVE);
@@ -3004,13 +3004,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
, _("Click: delete next point")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_op_mode_callback),
- (gpointer)GAP_MORPH_OP_MODE_DELETE);
+ G_CALLBACK (on_radio_op_mode_callback),
+ (gpointer)GAP_MORPH_OP_MODE_DELETE);
l_idx++;
@@ -3026,13 +3026,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
, _("Click: zoom in,\nCTRL-click: zoom out")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_op_mode_callback),
- (gpointer)GAP_MORPH_OP_MODE_ZOOM);
+ G_CALLBACK (on_radio_op_mode_callback),
+ (gpointer)GAP_MORPH_OP_MODE_ZOOM);
l_idx++;
@@ -3049,13 +3049,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
, _("Click: show warp pick coordinates in the source window")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_op_mode_callback),
- (gpointer)GAP_MORPH_OP_MODE_SHOW);
+ G_CALLBACK (on_radio_op_mode_callback),
+ (gpointer)GAP_MORPH_OP_MODE_SHOW);
@@ -3102,13 +3102,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
, _("Render morph transition (warp forward, warp backward and cross fade)")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_render_mode_callback),
- (gpointer)GAP_MORPH_RENDER_MODE_MORPH);
+ G_CALLBACK (on_radio_render_mode_callback),
+ (gpointer)GAP_MORPH_RENDER_MODE_MORPH);
l_idx++;
@@ -3124,13 +3124,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
, _("Render forward warp transitions only")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data( G_OBJECT(radio_button), "mgup", mgup);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (on_radio_render_mode_callback),
- (gpointer)GAP_MORPH_RENDER_MODE_WARP);
+ G_CALLBACK (on_radio_render_mode_callback),
+ (gpointer)GAP_MORPH_RENDER_MODE_WARP);
} /* end p_radio_create_render_mode */
@@ -3142,9 +3142,9 @@
static GtkWidget *
p_create_subwin(GapMorphSubWin *swp
, const char *title
- , GapMorphGUIParams *mgup
- , GtkWidget *master_hbox
- )
+ , GapMorphGUIParams *mgup
+ , GtkWidget *master_hbox
+ )
{
GtkWidget *frame;
GtkWidget *vbox;
@@ -3275,15 +3275,15 @@
/* Fit Zoom Button */
button = gtk_button_new_from_stock ( _("Fit Zoom") );
gtk_table_attach( GTK_TABLE(table), button, 4, 5, row, row+1,
- GTK_FILL, 0, 8, 0 );
+ GTK_FILL, 0, 8, 0 );
gimp_help_set_help_data(button,
_("Show the whole layer."
- " (by adjusting zoom to fit into preview).")
+ " (by adjusting zoom to fit into preview).")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "pressed",
- G_CALLBACK (on_fit_zoom_pressed_callback),
- swp);
+ G_CALLBACK (on_fit_zoom_pressed_callback),
+ swp);
if(!swp->src_flag)
{
@@ -3615,16 +3615,16 @@
/* Shape Button */
button = gtk_button_new_from_stock ( _("Shape") );
gtk_table_attach( GTK_TABLE(table), button, 2, 4, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Create N workpoints following the outline shape of the layer."
- "(the shape detection is looking for non-transparent pixels)."
- "SHIFT-click: adds the new points and keeps the old points")
+ "(the shape detection is looking for non-transparent pixels)."
+ "SHIFT-click: adds the new points and keeps the old points")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (on_wp_shape_button_clicked),
- mgup);
+ G_CALLBACK (on_wp_shape_button_clicked),
+ mgup);
@@ -3636,7 +3636,7 @@
mgup->show_lines_checkbutton = checkbutton;
gtk_widget_show (checkbutton);
gtk_table_attach( GTK_TABLE(table), checkbutton, 10, 11, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (on_show_lines_toggled_callback),
mgup);
@@ -3648,14 +3648,14 @@
/* Swap Windows Button */
button = gtk_button_new_from_stock (_("Swap"));
gtk_table_attach( GTK_TABLE(table), button, 11, 12, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Exchange source and destination")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "pressed",
- G_CALLBACK (on_swap_button_pressed_callback),
- mgup);
+ G_CALLBACK (on_swap_button_pressed_callback),
+ mgup);
row++;
@@ -3685,8 +3685,8 @@
gtk_widget_set_size_request (spinbutton, 80, -1);
gimp_help_set_help_data (spinbutton, _("Deform radius in pixels."
" Each workpoint causes a move-deform operation"
- " within this affect radius.")
- , NULL);
+ " within this affect radius.")
+ , NULL);
g_signal_connect (G_OBJECT (adj), "value_changed"
, G_CALLBACK (gimp_double_adjustment_update)
, &mgup->mgpp->affect_radius);
@@ -3717,7 +3717,7 @@
gtk_widget_set_size_request (spinbutton, 80, -1);
gimp_help_set_help_data (spinbutton, _("Deform intensity.")
- , NULL);
+ , NULL);
g_signal_connect (G_OBJECT (adj), "value_changed"
, G_CALLBACK (gimp_double_adjustment_update)
, &mgup->mgpp->gravity_intensity);
@@ -3728,14 +3728,14 @@
mgup->use_gravity_checkbutton = checkbutton;
gtk_widget_show (checkbutton);
gtk_table_attach( GTK_TABLE(table), checkbutton, 8, 10, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (on_use_gravity_toggled_callback),
mgup);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mgup->mgpp->use_gravity);
gimp_help_set_help_data(checkbutton,
_("ON: Descending deform action from workpoint (full) to radius (zero). Descend by power of intensity."
- "OFF: Linear deform action inside the radius")
+ "OFF: Linear deform action inside the radius")
, NULL);
/* the use_quality_wp_selection checkbutton */
@@ -3743,40 +3743,40 @@
mgup->use_quality_wp_selection_checkbutton = checkbutton;
gtk_widget_show (checkbutton);
gtk_table_attach( GTK_TABLE(table), checkbutton, 10, 11, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (on_use_quality_wp_selection_toggled_callback),
mgup);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mgup->mgpp->use_quality_wp_selection);
gimp_help_set_help_data(checkbutton,
_("ON: Use quality workpoint selection algorithm."
- "OFF: Use fast workpoint selection algorithm.")
+ "OFF: Use fast workpoint selection algorithm.")
, NULL);
/* Load Workpoints Button */
button = gtk_button_new_from_stock (GTK_STOCK_OPEN );
gtk_table_attach( GTK_TABLE(table), button, 11, 12, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Load morph workpoints from file. SHIFT-click: define filename of Pointset B")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (on_wp_load_button_clicked),
- mgup);
+ G_CALLBACK (on_wp_load_button_clicked),
+ mgup);
/* Save Workpoints Button */
button = gtk_button_new_from_stock ( GTK_STOCK_SAVE );
gtk_table_attach( GTK_TABLE(table), button, 12, 13, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Save morph workpoints to file. SHIFT-click: define filename of Pointset B")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (on_wp_save_button_clicked),
- mgup);
+ G_CALLBACK (on_wp_save_button_clicked),
+ mgup);
row++;
@@ -3807,18 +3807,18 @@
gtk_widget_set_size_request (spinbutton, 80, -1);
gimp_help_set_help_data (spinbutton, _("Number of layers to create or modify."
" Steps refers to N layers under the destination layer."
- " Steps is ignored if render mode is warp"
- " and source and destination are different layers"
- " of the same image"), NULL);
+ " Steps is ignored if render mode is warp"
+ " and source and destination are different layers"
+ " of the same image"), NULL);
g_signal_connect (G_OBJECT (adj), "value_changed"
, G_CALLBACK (gimp_int_adjustment_update)
, &mgup->mgpp->tween_steps);
/* the pointcolor colorbutton */
color_button = gimp_color_button_new (_("Pointcolor"),
- 25, 12, /* WIDTH, HEIGHT, */
- &mgup->pointcolor,
- GIMP_COLOR_AREA_FLAT);
+ 25, 12, /* WIDTH, HEIGHT, */
+ &mgup->pointcolor,
+ GIMP_COLOR_AREA_FLAT);
gtk_table_attach(GTK_TABLE(table), color_button, 2, 3, row, row+1
, 0, 0, 4, 0);
@@ -3836,9 +3836,9 @@
/* the currentcolor colorbutton */
color_button = gimp_color_button_new (_("Current Pointcolor"),
- 25, 12, /* WIDTH, HEIGHT, */
- &mgup->curr_pointcolor,
- GIMP_COLOR_AREA_FLAT);
+ 25, 12, /* WIDTH, HEIGHT, */
+ &mgup->curr_pointcolor,
+ GIMP_COLOR_AREA_FLAT);
gtk_table_attach(GTK_TABLE(table), color_button, 3, 4, row, row+1
, 0, 0, 4, 0);
gtk_widget_show (color_button);
@@ -3868,13 +3868,13 @@
gtk_widget_show (checkbutton);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mgup->mgpp->create_tween_layers);
gtk_table_attach( GTK_TABLE(table), checkbutton, 10, 11, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (on_create_tween_layers_toggled_callback),
mgup);
gimp_help_set_help_data(checkbutton,
_("ON: Create specified number of tween layers. "
- "OFF: Operate on existing layers below the destination layer")
+ "OFF: Operate on existing layers below the destination layer")
, NULL);
/* the multiple pointsets checkbutton */
@@ -3885,17 +3885,17 @@
#endif
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mgup->mgpp->have_workpointsets);
gtk_table_attach( GTK_TABLE(table), checkbutton, 11, 13, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (on_have_workpointsets_toggled_callback),
mgup);
gimp_help_set_help_data(checkbutton,
_("ON: use 2 or more pointsets from file. "
- "Please create and save the pointsets first, "
- "using filenames with a 2-digit numberpart before the extension "
- "(points_01.txt, points_02.txt, points_03.txt) "
- "then open and SHIFT open the first and last pointset\n"
- "OFF: use current set of workpoints")
+ "Please create and save the pointsets first, "
+ "using filenames with a 2-digit numberpart before the extension "
+ "(points_01.txt, points_02.txt, points_03.txt) "
+ "then open and SHIFT open the first and last pointset\n"
+ "OFF: use current set of workpoints")
, NULL);
Modified: trunk/gap/gap_morph_exec.c
==============================================================================
--- trunk/gap/gap_morph_exec.c (original)
+++ trunk/gap/gap_morph_exec.c Sun Apr 5 06:47:07 2009
@@ -100,16 +100,16 @@
static inline gdouble p_get_tolerance(gdouble dist);
static void p_clip_gimp_pixel_fetcher_get_pixel(GimpPixelFetcher *pft
,GimpDrawable *drawable
- ,gint xi
- ,gint yi
- ,guchar *pixel
- );
+ ,gint xi
+ ,gint yi
+ ,guchar *pixel
+ );
static void p_bilinear_get_pixel(GimpPixelFetcher *pft
- , GimpDrawable *drawable
+ , GimpDrawable *drawable
, gdouble needx
, gdouble needy
, guchar *dest
- , gint dst_bpp
+ , gint dst_bpp
);
static gdouble p_linear_advance(gdouble total_steps
,gdouble current_step
@@ -120,31 +120,31 @@
static inline gint p_calc_angle_core(GapMorphWorkPoint *wp, gdouble dx, gdouble dy, gint num_sectors);
static gint p_calc_angle(GapMorphWorkPoint *wp, gint32 in_x, gint32 in_y);
static void p_pixel_warp_core(GapMorphWarpCoreAPI *wcap
- , gint32 in_x
- , gint32 in_y
- , gdouble *out_pick_x
- , gdouble *out_pick_y
- );
+ , gint32 in_x
+ , gint32 in_y
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
+ );
static void p_pixel_warp_pick(GapMorphWarpCoreAPI *wcap
, gint32 in_x
, gint32 in_y
- , gint set_idx
- , gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gint set_idx
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
);
static void p_pixel_warp_multipick(GapMorphWarpCoreAPI *wcap_1
, GapMorphWarpCoreAPI *wcap_2
- , gdouble wp_mix_factor
+ , gdouble wp_mix_factor
, gint32 in_x
, gint32 in_y
- , gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
);
GapMorphWorkPoint * p_calculate_work_point_movement(gdouble total_steps
,gdouble current_step
- ,GapMorphWorkPoint *master_list
- ,gint32 src_layer_id
- ,gint32 dst_layer_id
+ ,GapMorphWorkPoint *master_list
+ ,gint32 src_layer_id
+ ,gint32 dst_layer_id
,gint32 curr_width
,gint32 curr_height
,gboolean forward_move
@@ -191,7 +191,7 @@
factor = (dist - GAP_MORPH_NEAR_RADIUS) / GAP_MORPH_FAR_RADIUS;
return( (GAP_MORPH_TOL_FACT_NEAR * (1 -factor))
+ (GAP_MORPH_TOL_FACT_FAR * factor)
- );
+ );
} /* end p_get_tolerance */
static void
@@ -317,12 +317,12 @@
GapMorphWorkPoint *
p_load_workpointfile(const char *filename
, gint32 src_layer_id
- , gint32 dst_layer_id
- , gint32 *tween_steps
- , gdouble *affect_radius
- , gdouble *gravity_intensity
- , gboolean *use_gravity
- , gboolean *use_quality_wp_selection
+ , gint32 dst_layer_id
+ , gint32 *tween_steps
+ , gdouble *affect_radius
+ , gdouble *gravity_intensity
+ , gboolean *use_gravity
+ , gboolean *use_quality_wp_selection
, GimpRunMode run_mode
)
{
@@ -449,10 +449,10 @@
if(l_cnt >= 1)
{
*gravity_intensity = MAX(0,l_farr[0]);
- if(*gravity_intensity > 0.0)
- {
- *use_gravity = TRUE;
- }
+ if(*gravity_intensity > 0.0)
+ {
+ *use_gravity = TRUE;
+ }
}
else
{
@@ -470,11 +470,11 @@
l_cnt = gap_base_sscan_flt_numbers(l_ptr, &l_farr[0], MAX_NUMVALUES_PER_LINE);
if(l_cnt >= 1)
{
- *use_quality_wp_selection = FALSE;
+ *use_quality_wp_selection = FALSE;
if(l_farr[0] != 0)
- {
- *use_quality_wp_selection = TRUE;
- }
+ {
+ *use_quality_wp_selection = TRUE;
+ }
}
else
{
@@ -543,14 +543,14 @@
wp_list = p_load_workpointfile(filename
,mgup->mgpp->osrc_layer_id
- ,mgup->mgpp->fdst_layer_id
- ,&mgup->mgpp->tween_steps
- ,&mgup->mgpp->affect_radius
- ,&mgup->mgpp->gravity_intensity
- ,&mgup->mgpp->use_gravity
- ,&mgup->mgpp->use_quality_wp_selection
+ ,mgup->mgpp->fdst_layer_id
+ ,&mgup->mgpp->tween_steps
+ ,&mgup->mgpp->affect_radius
+ ,&mgup->mgpp->gravity_intensity
+ ,&mgup->mgpp->use_gravity
+ ,&mgup->mgpp->use_quality_wp_selection
,mgup->mgpp->run_mode
- );
+ );
return(wp_list);
} /* end gap_moprh_exec_load_workpointfile */
@@ -563,9 +563,9 @@
*/
static GapMorphWarpCoreAPI*
p_load_workpoint_set(const char *filename
- ,GapMorphGlobalParams *mgpp
- ,GapMorphExeLayerstack *mlayers
- )
+ ,GapMorphGlobalParams *mgpp
+ ,GapMorphExeLayerstack *mlayers
+ )
{
GapMorphWarpCoreAPI *wps;
gint32 tween_steps;
@@ -573,14 +573,14 @@
wps = g_new(GapMorphWarpCoreAPI ,1);
wps->wp_list = p_load_workpointfile(filename
,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
- ,&tween_steps
- ,&wps->affect_radius
- ,&wps->gravity_intensity
- ,&wps->use_gravity
- ,&wps->use_quality_wp_selection
+ ,mgpp->fdst_layer_id
+ ,&tween_steps
+ ,&wps->affect_radius
+ ,&wps->gravity_intensity
+ ,&wps->use_gravity
+ ,&wps->use_quality_wp_selection
,mgpp->run_mode
- );
+ );
if(wps->wp_list == NULL)
{
wps->wp_list = mgpp->master_wp_list;
@@ -601,7 +601,7 @@
static void
p_build_wp_set_table(GapMorphGlobalParams *mgpp
,GapMorphExeLayerstack *mlayers
- )
+ )
{
long lower_num;
long upper_num;
@@ -643,9 +643,9 @@
{
wp_filename = g_strdup_printf("%s%02d%s"
,lower_basename
- ,(int)ii
- ,lower_ext
- );
+ ,(int)ii
+ ,lower_ext
+ );
if(g_file_test(wp_filename, G_FILE_TEST_EXISTS))
{
mlayers->available_wp_sets++;
@@ -659,20 +659,20 @@
{
wp_filename = g_strdup_printf("%s%02d%s"
,lower_basename
- ,(int)ii
- ,lower_ext
- );
+ ,(int)ii
+ ,lower_ext
+ );
if(g_file_test(wp_filename, G_FILE_TEST_EXISTS))
{
if(wp_idx < mlayers->available_wp_sets)
- {
- if(gap_debug)
- {
- printf("p_build_wp_set_table: LOADING workpoint file: %s\n", wp_filename);
- }
- mlayers->tab_wp_sets[wp_idx] = p_load_workpoint_set(wp_filename, mgpp, mlayers);
- }
- wp_idx++;
+ {
+ if(gap_debug)
+ {
+ printf("p_build_wp_set_table: LOADING workpoint file: %s\n", wp_filename);
+ }
+ mlayers->tab_wp_sets[wp_idx] = p_load_workpoint_set(wp_filename, mgpp, mlayers);
+ }
+ wp_idx++;
}
g_free(wp_filename);
}
@@ -758,10 +758,10 @@
static void
p_clip_gimp_pixel_fetcher_get_pixel(GimpPixelFetcher *pft
,GimpDrawable *drawable
- ,gint xi
- ,gint yi
- ,guchar *pixel
- )
+ ,gint xi
+ ,gint yi
+ ,guchar *pixel
+ )
{
if((xi >= 0)
&& (yi >= 0)
@@ -791,10 +791,10 @@
p_bilinear_get_pixel(GimpPixelFetcher *pft
,GimpDrawable *drawable
, gdouble needx
- , gdouble needy
- , guchar *dest
- , gint dst_bpp
- )
+ , gdouble needy
+ , guchar *dest
+ , gint dst_bpp
+ )
{
guchar pixel[4][4];
guchar values[4];
@@ -1012,23 +1012,23 @@
wp->sqr_dist = (dx * dx ) + (dy * dy);
wp->dist = sqrt(wp->sqr_dist);
- adx = abs(dx);
- ady = abs(dy);
+ adx = abs(dx);
+ ady = abs(dy);
if(adx > ady)
- {
- wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
- }
- else
- {
- if(dy != 0)
- {
- wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
- }
- else
- {
- wp->xy_relation = 0;
- }
- }
+ {
+ wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
+ }
+ else
+ {
+ if(dy != 0)
+ {
+ wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
+ }
+ else
+ {
+ wp->xy_relation = 0;
+ }
+ }
return(p_calc_angle_core(wp, dx, dy, GAP_MORPH_8_SEKTORS));
}
@@ -1059,7 +1059,7 @@
, gint32 in_x
, gint32 in_y
, gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gdouble *out_pick_y
)
{
register GapMorphWorkPoint *wp;
@@ -1119,52 +1119,52 @@
{
if(wp->sqr_dist < 1)
{
- new_vektor_x = (wp->src_x - wp->dst_x);
- new_vektor_y = (wp->src_y - wp->dst_y);
+ new_vektor_x = (wp->src_x - wp->dst_x);
+ new_vektor_y = (wp->src_y - wp->dst_y);
- if(direct_hit_flag)
- {
+ if(direct_hit_flag)
+ {
vektor_x = (new_vektor_x + vektor_x) / 2.0;
vektor_y = (new_vektor_y + vektor_y) / 2.0;
- }
- else
- {
+ }
+ else
+ {
vektor_x = new_vektor_x;
vektor_y = new_vektor_y;
- }
- direct_hit_flag = TRUE;
+ }
+ direct_hit_flag = TRUE;
}
else
{
wp->is_alive = TRUE;
- /* sektor index 8 sectors */
+ /* sektor index 8 sectors */
sek_idx = p_calc_sector(wp, dx, dy);
- wp->sek_idx = sek_idx;
+ wp->sek_idx = sek_idx;
- if((wp_sek = wp_sektor_tab[sek_idx]) != NULL)
- {
- /* there is already a workpoint for this sektor */
- if(wp->sqr_dist <= wp_sek->sqr_dist)
- {
- /* set current workpoint as the new nearest point for this sektor */
- wp_sektor_tab[sek_idx] = wp;
- }
- else
- {
- continue;
- }
- }
- else
- {
- /* found 1.st workpint for this sektor */
- wp_sektor_tab[sek_idx] = wp;
- }
- wp->next_sek = NULL; /* init empty sektors list */
+ if((wp_sek = wp_sektor_tab[sek_idx]) != NULL)
+ {
+ /* there is already a workpoint for this sektor */
+ if(wp->sqr_dist <= wp_sek->sqr_dist)
+ {
+ /* set current workpoint as the new nearest point for this sektor */
+ wp_sektor_tab[sek_idx] = wp;
+ }
+ else
+ {
+ continue;
+ }
+ }
+ else
+ {
+ /* found 1.st workpint for this sektor */
+ wp_sektor_tab[sek_idx] = wp;
+ }
+ wp->next_sek = NULL; /* init empty sektors list */
if(wp->sqr_dist < min_sqr_dist)
- {
+ {
min_sqr_dist = wp->sqr_dist;
- }
+ }
}
}
@@ -1194,70 +1194,70 @@
for(sek_idx = 0; sek_idx < GAP_MORPH_8_SEKTORS; sek_idx++)
{
- wp_sek = wp_sektor_tab[sek_idx];
+ wp_sek = wp_sektor_tab[sek_idx];
- if(wp_sek)
- {
- GapMorphWorkPoint *wp_l_sek; /* left neigbour sektor */
- GapMorphWorkPoint *wp_r_sek; /* right neigbour sektor */
+ if(wp_sek)
+ {
+ GapMorphWorkPoint *wp_l_sek; /* left neigbour sektor */
+ GapMorphWorkPoint *wp_r_sek; /* right neigbour sektor */
gdouble l_tol;
gdouble r_tol;
/* xy_relation is the representation of the angle
- * (is used to compare for similar angle in steps 10tiems finer than the 8 sektors.
- * and is faster to calculate than the real angle)
- */
- adx = abs(in_x - wp_sek->dst_x);
- ady = abs(in_y - wp_sek->dst_y);
+ * (is used to compare for similar angle in steps 10tiems finer than the 8 sektors.
+ * and is faster to calculate than the real angle)
+ */
+ adx = abs(in_x - wp_sek->dst_x);
+ ady = abs(in_y - wp_sek->dst_y);
if(adx > ady)
- {
- wp_sek->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
- }
- else
- {
- if(ady != 0)
- {
- wp_sek->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
- }
- else
- {
- wp_sek->xy_relation = 0;
- }
- }
-
- wp_l_sek = wp_sektor_tab[tab_l1_idx[sek_idx]];
- wp_r_sek = wp_sektor_tab[tab_r1_idx[sek_idx]];
- if(wp_l_sek == NULL)
- {
- wp_l_sek = wp_sektor_tab[tab_l2_idx[sek_idx]];
- }
- if(wp_r_sek == NULL)
- {
+ {
+ wp_sek->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
+ }
+ else
+ {
+ if(ady != 0)
+ {
+ wp_sek->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
+ }
+ else
+ {
+ wp_sek->xy_relation = 0;
+ }
+ }
+
+ wp_l_sek = wp_sektor_tab[tab_l1_idx[sek_idx]];
+ wp_r_sek = wp_sektor_tab[tab_r1_idx[sek_idx]];
+ if(wp_l_sek == NULL)
+ {
+ wp_l_sek = wp_sektor_tab[tab_l2_idx[sek_idx]];
+ }
+ if(wp_r_sek == NULL)
+ {
wp_r_sek = wp_sektor_tab[tab_r2_idx[sek_idx]];
- }
+ }
- if(wp_l_sek)
- {
+ if(wp_l_sek)
+ {
if(wp_r_sek)
- {
+ {
l_tol = wp_l_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR;
- r_tol = wp_r_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR;
+ r_tol = wp_r_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR;
tab_tol[sek_idx] = MIN(MAX(l_tol, r_tol), (wp_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR));
- }
- else
- {
+ }
+ else
+ {
tab_tol[sek_idx] = wp_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR;
- }
- }
- else
- {
+ }
+ }
+ else
+ {
tab_tol[sek_idx] = wp_sek->sqr_dist * GAP_MORPH_TOL_FAKTOR;
- }
- }
- else
- {
+ }
+ }
+ else
+ {
tab_tol[sek_idx] = limit_sqr_dist;
- }
+ }
}
}
@@ -1275,67 +1275,67 @@
{
sek_idx = CLAMP(wp->sek_idx, 0, (GAP_MORPH_8_SEKTORS -1));
- if(wp->sqr_dist <= tab_tol[sek_idx])
- {
- gboolean sel_flag;
-
- sel_flag = TRUE;
-
+ if(wp->sqr_dist <= tab_tol[sek_idx])
+ {
+ gboolean sel_flag;
+
+ sel_flag = TRUE;
+
/* xy_relation is the representation of the angle
- * (is used to compare for similar angle in steps 10tiems finer than the 8 sektors.
- * and is faster to calculate than the real angle)
- */
- adx = abs(in_x - wp->dst_x);
- ady = abs(in_y - wp->dst_y);
+ * (is used to compare for similar angle in steps 10tiems finer than the 8 sektors.
+ * and is faster to calculate than the real angle)
+ */
+ adx = abs(in_x - wp->dst_x);
+ ady = abs(in_y - wp->dst_y);
if(adx > ady)
- {
- wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
- }
- else
- {
- if(ady != 0)
- {
- wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
- }
- else
- {
- wp->xy_relation = 0;
- }
- }
-
-
- for(wp_sek = wp_sektor_tab[sek_idx]; wp_sek != NULL; wp_sek = (GapMorphWorkPoint *)wp_sek->next_sek)
- {
- if(wp_sek == wp)
- {
- sel_flag = FALSE; /* dont add the same point twice to the sektors list */
- continue;
- }
- if((wp_sek->is_alive)
- && (wp->xy_relation == wp_sek->xy_relation)) /* check for (nearly) same angle */
- {
- if(wp->sqr_dist < wp_sek->sqr_dist)
- {
- /* discard the (farer) point from the sektor list by flag
- * (is faster than remove the list element)
- */
+ {
+ wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (ady / adx)));
+ }
+ else
+ {
+ if(ady != 0)
+ {
+ wp->xy_relation = (gint)(0.5 + (GAP_MORPH_XY_REL_FAKTOR * (adx / ady)));
+ }
+ else
+ {
+ wp->xy_relation = 0;
+ }
+ }
+
+
+ for(wp_sek = wp_sektor_tab[sek_idx]; wp_sek != NULL; wp_sek = (GapMorphWorkPoint *)wp_sek->next_sek)
+ {
+ if(wp_sek == wp)
+ {
+ sel_flag = FALSE; /* dont add the same point twice to the sektors list */
+ continue;
+ }
+ if((wp_sek->is_alive)
+ && (wp->xy_relation == wp_sek->xy_relation)) /* check for (nearly) same angle */
+ {
+ if(wp->sqr_dist < wp_sek->sqr_dist)
+ {
+ /* discard the (farer) point from the sektor list by flag
+ * (is faster than remove the list element)
+ */
wp_sek->is_alive = FALSE;
- }
- else
- {
- sel_flag = FALSE;
- }
- break;
- }
- }
-
- if(sel_flag)
- {
- /* add wp to the sektor list */
- wp->next_sek = wp_sektor_tab[sek_idx];
- wp_sektor_tab[sek_idx] = wp;
- }
- }
+ }
+ else
+ {
+ sel_flag = FALSE;
+ }
+ break;
+ }
+ }
+
+ if(sel_flag)
+ {
+ /* add wp to the sektor list */
+ wp->next_sek = wp_sektor_tab[sek_idx];
+ wp_sektor_tab[sek_idx] = wp;
+ }
+ }
}
}
@@ -1348,28 +1348,28 @@
for(wp=wp_sektor_tab[sek_idx]; wp != NULL; wp = (GapMorphWorkPoint *)wp->next_sek)
{
if((wp->is_alive)
- && (wp->sqr_dist <= tab_tol[sek_idx]))
- {
- wp->dist = sqrt(wp->sqr_dist);
+ && (wp->sqr_dist <= tab_tol[sek_idx]))
+ {
+ wp->dist = sqrt(wp->sqr_dist);
if(wcap->printf_flag)
- {
- /* this is a debug feature for tuning the warp algorithm */
- printf("sek: %02d, ang: %.2f, dist:%.3f, sqr_dist: %.3f TAB_TOL:%.3f SELECTED\n"
- ,(int)sek_idx
- ,(float)wp->angle_deg
- ,(float)wp->dist
- ,(float)wp->sqr_dist
- ,(float)tab_tol[sek_idx]
- );
- }
-
- /* add point to selection list */
- wp->next_selected = wp_selected_list;
- wp_selected_list = wp;
+ {
+ /* this is a debug feature for tuning the warp algorithm */
+ printf("sek: %02d, ang: %.2f, dist:%.3f, sqr_dist: %.3f TAB_TOL:%.3f SELECTED\n"
+ ,(int)sek_idx
+ ,(float)wp->angle_deg
+ ,(float)wp->dist
+ ,(float)wp->sqr_dist
+ ,(float)tab_tol[sek_idx]
+ );
+ }
+
+ /* add point to selection list */
+ wp->next_selected = wp_selected_list;
+ wp_selected_list = wp;
wp->inv_dist = 1.0 / wp->dist;
sum_inv_dist += wp->inv_dist;
- }
+ }
}
} /* end for(sek_idx..) */
@@ -1380,7 +1380,7 @@
wp->gravity = 1.0;
if(wcap->use_gravity)
{
- wp->gravity -= pow((MIN(wp->sqr_dist,wcap->sqr_affect_radius) / wcap->sqr_affect_radius) , wcap->gravity_intensity);
+ wp->gravity -= pow((MIN(wp->sqr_dist,wcap->sqr_affect_radius) / wcap->sqr_affect_radius) , wcap->gravity_intensity);
}
new_vektor_x = (wp->src_x - wp->dst_x);
@@ -1394,12 +1394,12 @@
{
wp->warp_weight = weight;
printf("wp->src_x/y: %.3f / %.3f wp->dst_x/y: %.3f / %.3f sek_idx: %d xy_rel:%d dist:%.3f weight: %.7f vek: %.3f / %.3f \n"
- , (float)wp->src_x
+ , (float)wp->src_x
, (float)wp->src_y
, (float)wp->dst_x
, (float)wp->dst_y
- , (int) wp->sek_idx
- , (int) wp->xy_relation
+ , (int) wp->sek_idx
+ , (int) wp->xy_relation
, (float)wp->dist
, (float)weight
, (float)vektor_x
@@ -1433,14 +1433,14 @@
gap_morph_exec_get_warp_pick_koords(GapMorphWorkPoint *wp_list
, gint32 in_x
, gint32 in_y
- , gdouble scale_x
- , gdouble scale_y
- , gboolean use_quality_wp_selection
- , gboolean use_gravity
- , gdouble gravity_intensity
- , gdouble affect_radius
- , gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gdouble scale_x
+ , gdouble scale_y
+ , gboolean use_quality_wp_selection
+ , gboolean use_gravity
+ , gdouble gravity_intensity
+ , gdouble affect_radius
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
)
{
GapMorphWarpCoreAPI wcap_struct;
@@ -1493,7 +1493,7 @@
,in_y
,&pick_x
,&pick_y
- );
+ );
#else
@@ -1507,10 +1507,10 @@
,yy
,&pick_x
,&pick_y
- );
- sum_pick_x += pick_x;
+ );
+ sum_pick_x += pick_x;
sum_pick_y += pick_y;
- nn++;
+ nn++;
}
}
@@ -1524,7 +1524,7 @@
,in_y
,out_pick_x
,out_pick_y
- );
+ );
#endif
@@ -1550,9 +1550,9 @@
p_pixel_warp_pick(GapMorphWarpCoreAPI *wcap
, gint32 in_x
, gint32 in_y
- , gint set_idx
- , gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gint set_idx
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
)
{
gdouble pick_x;
@@ -1570,7 +1570,7 @@
,in_y
,out_pick_x
,out_pick_y
- );
+ );
#else
/* the implementation of the p_pixel_warp_core
@@ -1584,8 +1584,8 @@
* number of p_pixel_warp_core calls
*/
nn = 0;
- sum_pick_x = 0;
- sum_pick_y = 0;
+ sum_pick_x = 0;
+ sum_pick_y = 0;
for(xx=MAX(0,in_x -3); xx <= in_x +3; xx+=3)
{
for(yy=MAX(0,in_y -3); yy <= in_y +3; yy+=3)
@@ -1596,15 +1596,15 @@
{
pcp = &gloabl_pick_cache[ii][set_idx];
if ((pcp->valid)
- && (pcp->xx == xx)
- && (pcp->yy == yy))
- {
- pick_x = pcp->pick_x;
- pick_y = pcp->pick_y;
-
- /* printf("** CACHE HIT\n"); */
- break;
- }
+ && (pcp->xx == xx)
+ && (pcp->yy == yy))
+ {
+ pick_x = pcp->pick_x;
+ pick_y = pcp->pick_y;
+
+ /* printf("** CACHE HIT\n"); */
+ break;
+ }
}
if(ii == GAP_MORPH_PCK_CACHE_SIZE)
{
@@ -1614,24 +1614,24 @@
,yy
,&pick_x
,&pick_y
- );
+ );
/* save pick koords in cache table */
pcp = &gloabl_pick_cache[gloabl_pick_cache_idx[set_idx]][set_idx];
- pcp->xx = xx;
- pcp->yy = yy;
- pcp->pick_x = pick_x;
- pcp->pick_y = pick_y;
- pcp->valid = TRUE;
- gloabl_pick_cache_idx[set_idx]++;
- if(gloabl_pick_cache_idx[set_idx] >= GAP_MORPH_PCK_CACHE_SIZE)
- {
- gloabl_pick_cache_idx[set_idx] = 0;
- }
+ pcp->xx = xx;
+ pcp->yy = yy;
+ pcp->pick_x = pick_x;
+ pcp->pick_y = pick_y;
+ pcp->valid = TRUE;
+ gloabl_pick_cache_idx[set_idx]++;
+ if(gloabl_pick_cache_idx[set_idx] >= GAP_MORPH_PCK_CACHE_SIZE)
+ {
+ gloabl_pick_cache_idx[set_idx] = 0;
+ }
}
sum_pick_x += (pick_x - ((in_x - xx) * wcap->scale_x));
sum_pick_y += (pick_y - ((in_y - yy) * wcap->scale_y));
- nn++;
+ nn++;
}
}
*out_pick_x = sum_pick_x / (gdouble)nn;
@@ -1648,11 +1648,11 @@
static void
p_pixel_warp_multipick(GapMorphWarpCoreAPI *wcap_1
,GapMorphWarpCoreAPI *wcap_2
- ,gdouble wp_mix_factor
+ ,gdouble wp_mix_factor
, gint32 in_x
, gint32 in_y
- , gdouble *out_pick_x
- , gdouble *out_pick_y
+ , gdouble *out_pick_x
+ , gdouble *out_pick_y
)
{
gdouble pick_x_1;
@@ -1668,22 +1668,22 @@
if(wp_mix_factor != 0.0)
{
p_pixel_warp_pick(wcap_1
- , in_x
- , in_y
- , 0 /* set_idx */
- , &pick_x_1
- , &pick_y_1
+ , in_x
+ , in_y
+ , 0 /* set_idx */
+ , &pick_x_1
+ , &pick_y_1
);
}
if(wp_mix_factor != 1.0)
{
p_pixel_warp_pick(wcap_1
- , in_x
- , in_y
- , 1 /* set_idx */
- , &pick_x_2
- , &pick_y_2
+ , in_x
+ , in_y
+ , 1 /* set_idx */
+ , &pick_x_2
+ , &pick_y_2
);
}
@@ -1717,9 +1717,9 @@
GapMorphWorkPoint *
p_calculate_work_point_movement(gdouble total_steps
,gdouble current_step
- ,GapMorphWorkPoint *master_list
- ,gint32 src_layer_id
- ,gint32 dst_layer_id
+ ,GapMorphWorkPoint *master_list
+ ,gint32 src_layer_id
+ ,gint32 dst_layer_id
,gint32 curr_width
,gint32 curr_height
,gboolean forward_move
@@ -1834,10 +1834,10 @@
,GapMorphWorkPoint *wp_list_2
, gint32 src_layer_id
, gint32 dst_layer_id
- , GapMorphGlobalParams *mgpp
- , GapMorphWarpCoreAPI *p1
- , GapMorphWarpCoreAPI *p2
- , gdouble wp_mix_factor
+ , GapMorphGlobalParams *mgpp
+ , GapMorphWarpCoreAPI *p1
+ , GapMorphWarpCoreAPI *p2
+ , gdouble wp_mix_factor
)
{
GapMorphWarpCoreAPI wcap_struct_1;
@@ -1954,45 +1954,45 @@
for (y = 0; y < dstPR.h; y++)
{
pixel_ptr = dest;
- l_row = dstPR.y + y;
-
+ l_row = dstPR.y + y;
+
for (x = 0; x < dstPR.w; x++)
- {
+ {
gdouble pick_x;
gdouble pick_y;
-
- l_col = dstPR.x + x;
- if(mgpp->have_workpointsets)
- {
- /* pick based on 2 sets of workpoints */
+
+ l_col = dstPR.x + x;
+ if(mgpp->have_workpointsets)
+ {
+ /* pick based on 2 sets of workpoints */
p_pixel_warp_multipick(wcap_1 /// XXXXX list1
- , wcap_2 /// XXXXX list2
- , wp_mix_factor
- , l_col
- , l_row
- , &pick_x
- , &pick_y
+ , wcap_2 /// XXXXX list2
+ , wp_mix_factor
+ , l_col
+ , l_row
+ , &pick_x
+ , &pick_y
);
- }
- else
- {
- /* pick based on a single set of workpoints */
+ }
+ else
+ {
+ /* pick based on a single set of workpoints */
p_pixel_warp_pick(wcap_1
- , l_col
- , l_row
- , 0 /* set_idx */
- , &pick_x
- , &pick_y
+ , l_col
+ , l_row
+ , 0 /* set_idx */
+ , &pick_x
+ , &pick_y
);
- }
+ }
p_bilinear_get_pixel (src_pixfet
- ,src_drawable
- ,pick_x
- ,pick_y
- ,pixel_ptr
- ,dst_drawable->bpp);
+ ,src_drawable
+ ,pick_x
+ ,pick_y
+ ,pixel_ptr
+ ,dst_drawable->bpp);
pixel_ptr += dstPR.bpp;
- }
+ }
dest += dstPR.rowstride;
}
@@ -2044,8 +2044,8 @@
,gint32 bg_layer_id
,gint32 top_layer_id
,gint32 curr_width
- ,gint32 curr_height
- ,gdouble curr_mix_factor /* 0.0 <= mix <= 1.0 */
+ ,gint32 curr_height
+ ,gdouble curr_mix_factor /* 0.0 <= mix <= 1.0 */
)
{
gint32 dst_layer_id;
@@ -2158,18 +2158,18 @@
pixel_ptr = dest;
top_ptr = top;
bg_ptr = bg;
-
+
for (x = 0; x < dstPR.rowstride ; x++)
- {
- gdouble val;
-
- val = MIX_VALUE(curr_mix_factor, (gdouble)(*bg_ptr), (gdouble)(*top_ptr));
- *pixel_ptr = (guchar)val;
-
+ {
+ gdouble val;
+
+ val = MIX_VALUE(curr_mix_factor, (gdouble)(*bg_ptr), (gdouble)(*top_ptr));
+ *pixel_ptr = (guchar)val;
+
pixel_ptr++;
top_ptr++;
bg_ptr++;
- }
+ }
dest += dstPR.rowstride;
top += topPR.rowstride;
bg += bgPR.rowstride;
@@ -2202,7 +2202,7 @@
p_create_morph_tween_frame(gint32 total_steps
,gint32 current_step
,GapMorphGlobalParams *mgpp
- ,GapMorphExeLayerstack *mlayers
+ ,GapMorphExeLayerstack *mlayers
)
{
GimpDrawable *dst_drawable;
@@ -2374,8 +2374,8 @@
curr_wp_list_1 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,wp_set_1->wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2384,8 +2384,8 @@
curr_wp_list_2 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,wp_set_2->wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2394,13 +2394,13 @@
/* warp the BG layer */
p_layer_warp_move ( curr_wp_list_1
, curr_wp_list_2
- , src_layer_id
- , bg_layer_id
- , mgpp
- , wp_set_1
- , wp_set_2
- , wp_mix_factor
- );
+ , src_layer_id
+ , bg_layer_id
+ , mgpp
+ , wp_set_1
+ , wp_set_2
+ , wp_mix_factor
+ );
gap_morph_exec_free_workpoint_list(&curr_wp_list_1);
gap_morph_exec_free_workpoint_list(&curr_wp_list_2);
}
@@ -2410,8 +2410,8 @@
curr_wp_list_1 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,mgpp->master_wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2420,13 +2420,13 @@
/* warp the BG layer */
p_layer_warp_move ( curr_wp_list_1
, NULL
- , src_layer_id
- , bg_layer_id
- , mgpp
- , NULL
- , NULL
- , wp_mix_factor
- );
+ , src_layer_id
+ , bg_layer_id
+ , mgpp
+ , NULL
+ , NULL
+ , wp_mix_factor
+ );
gap_morph_exec_free_workpoint_list(&curr_wp_list_1);
}
@@ -2440,8 +2440,8 @@
curr_wp_list_1 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,wp_set_1->wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2450,8 +2450,8 @@
curr_wp_list_2 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,wp_set_2->wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2462,10 +2462,10 @@
, curr_wp_list_2
, dst_layer_id
, top_layer_id
- , mgpp
- , wp_set_1
- , wp_set_2
- , wp_mix_factor
+ , mgpp
+ , wp_set_1
+ , wp_set_2
+ , wp_mix_factor
);
gap_morph_exec_free_workpoint_list(&curr_wp_list_1);
@@ -2477,8 +2477,8 @@
curr_wp_list_1 = p_calculate_work_point_movement((gdouble)total_steps
,(gdouble)current_step
,mgpp->master_wp_list
- ,mgpp->osrc_layer_id
- ,mgpp->fdst_layer_id
+ ,mgpp->osrc_layer_id
+ ,mgpp->fdst_layer_id
,curr_width
,curr_height
,forward_move
@@ -2489,10 +2489,10 @@
, NULL
, dst_layer_id
, top_layer_id
- , mgpp
- , NULL
- , NULL
- , wp_mix_factor
+ , mgpp
+ , NULL
+ , NULL
+ , wp_mix_factor
);
gap_morph_exec_free_workpoint_list(&curr_wp_list_1);
@@ -2513,11 +2513,11 @@
merged_layer_id =
p_mix_layers(curr_image_id
,bg_layer_id
- ,top_layer_id
- ,curr_width
- ,curr_height
- ,(gdouble)(curr_opacity / 100.0)
- );
+ ,top_layer_id
+ ,curr_width
+ ,curr_height
+ ,(gdouble)(curr_opacity / 100.0)
+ );
/* DEBUG code: show duplicate of the temporary tween image */
if(FALSE)
@@ -2575,7 +2575,7 @@
mlayers->src_layers = gimp_image_get_layers (src_image_id
,&mlayers->src_nlayers
- );
+ );
for(ii=0; ii < mlayers->src_nlayers; ii++)
{
if(gap_debug)
@@ -2586,7 +2586,7 @@
{
mlayers->src1_idx = ii; /* src at 1.st step */
mlayers->src2_idx = ii; /* src at last step */
- break;
+ break;
}
}
}
@@ -2598,7 +2598,7 @@
dst_image_id = gimp_drawable_get_image(mgpp->fdst_layer_id);
mlayers->dst_layers = gimp_image_get_layers (dst_image_id
,&mlayers->dst_nlayers
- );
+ );
for(ii=0; ii < mlayers->dst_nlayers; ii++)
{
@@ -2607,7 +2607,7 @@
if(mlayers->dst_layers[ii] == mgpp->fdst_layer_id)
{
mlayers->dst2_idx = ii; /* dst at last step */
- break;
+ break;
}
}
}
@@ -2632,16 +2632,16 @@
{
gint32 tmp;
/* source layer is above the destination layer
- * in this case swap src with dst layer
- */
- tmp = mgpp->fdst_layer_id;
- mgpp->fdst_layer_id = mgpp->osrc_layer_id;
- mgpp->osrc_layer_id = tmp;
-
- tmp = mlayers->dst2_idx;
- mlayers->dst2_idx = mlayers->src1_idx;
- mlayers->src1_idx = tmp;
- mlayers->src2_idx = tmp;
+ * in this case swap src with dst layer
+ */
+ tmp = mgpp->fdst_layer_id;
+ mgpp->fdst_layer_id = mgpp->osrc_layer_id;
+ mgpp->osrc_layer_id = tmp;
+
+ tmp = mlayers->dst2_idx;
+ mlayers->dst2_idx = mlayers->src1_idx;
+ mlayers->src1_idx = tmp;
+ mlayers->src2_idx = tmp;
}
tween_steps = 1 + (mlayers->src1_idx - mlayers->dst2_idx );
}
@@ -2750,7 +2750,7 @@
if(l_layers_list[ii] == mgpp->fdst_layer_id)
{
dst_stack_position = ii +1;
- break;
+ break;
}
}
if(l_layers_list)
@@ -2784,7 +2784,7 @@
new_layer_id = p_create_morph_tween_frame(total_steps
,current_step
,mgpp
- ,mlayers
+ ,mlayers
);
if(new_layer_id < 0)
{
@@ -2798,14 +2798,14 @@
if(mgpp->create_tween_layers)
{
- cp_layer_id = gap_layer_copy_to_dest_image(dst_image_id
+ cp_layer_id = gap_layer_copy_to_dest_image(dst_image_id
,new_layer_id
,100.0 /* Opacity */
,0 /* NORMAL */
,&l_src_offset_x
,&l_src_offset_y
);
- gimp_image_add_layer(dst_image_id
+ gimp_image_add_layer(dst_image_id
, cp_layer_id
, dst_stack_position
);
@@ -2816,7 +2816,7 @@
/* replace content of current dst_layer[ii] by content of new_layer_id */
ii = mlayers->dst1_idx - (current_step -1);
- gap_layer_copy_content(mlayers->dst_layers[ii], new_layer_id);
+ gap_layer_copy_content(mlayers->dst_layers[ii], new_layer_id);
}
tween_image_id = gimp_drawable_get_image(new_layer_id);
gimp_image_delete(tween_image_id);
@@ -2917,11 +2917,11 @@
merged_layer_id =
p_mix_layers(curr_image_id
,bg_layer_id
- ,top_layer_id
- ,curr_width
- ,curr_height
- ,(gdouble)(curr_opacity / 100.0)
- );
+ ,top_layer_id
+ ,curr_width
+ ,curr_height
+ ,(gdouble)(curr_opacity / 100.0)
+ );
mgpp->master_progress += mgpp->layer_progress_step;
@@ -3010,7 +3010,7 @@
new_layer_id = p_create_morph_tween_frame(total_steps
,current_step
,mgpp
- ,mlayers
+ ,mlayers
);
}
return (gap_image_merge_to_specified_layer(new_layer_id, GIMP_CLIP_TO_IMAGE));
Modified: trunk/gap/gap_morph_exec.h
==============================================================================
--- trunk/gap/gap_morph_exec.h (original)
+++ trunk/gap/gap_morph_exec.h Sun Apr 5 06:47:07 2009
@@ -40,19 +40,19 @@
GapMorphWorkPoint * gap_moprh_exec_load_workpointfile(const char *filename
, GapMorphGUIParams *mgup
);
-
+
gint32 gap_morph_exec_find_dst_drawable(gint32 image_id, gint32 layer_id);
void gap_morph_exec_get_warp_pick_koords(GapMorphWorkPoint *wp_list
, gint32 in_x
, gint32 in_y
- , gdouble scale_x
- , gdouble scale_y
- , gboolean use_quality_wp_selection
- , gboolean use_gravity
- , gdouble gravity_intensity
- , gdouble affect_radius
- , gdouble *pick_x
- , gdouble *pick_y
+ , gdouble scale_x
+ , gdouble scale_y
+ , gboolean use_quality_wp_selection
+ , gboolean use_gravity
+ , gdouble gravity_intensity
+ , gdouble affect_radius
+ , gdouble *pick_x
+ , gdouble *pick_y
);
gint32 gap_morph_execute(GapMorphGlobalParams *mgpp);
gint32 gap_morph_render_one_tween(GapMorphGlobalParams *mgpp);
Modified: trunk/gap/gap_morph_main.c
==============================================================================
--- trunk/gap/gap_morph_main.c (original)
+++ trunk/gap/gap_morph_main.c Sun Apr 5 06:47:07 2009
@@ -117,10 +117,10 @@
{ GIMP_PDB_INT32, "render_mode", "0: Do Morph transformation, 1: do only Warp transformation"},
{ GIMP_PDB_INT32, "create_tween_layers", "TRUE: Do create tween layers, FALSE: operate on existing layers"},
{ GIMP_PDB_STRING, "workpoint_file_1", "Name of a Morph/Warp workpointfile"
- "(create such file(s) with the save button in the GUI at INTERACTIVE runmode)"},
+ "(create such file(s) with the save button in the GUI at INTERACTIVE runmode)"},
{ GIMP_PDB_STRING, "workpoint_file_2", "Name of an optional 2nd Morph/Warp workpointfile."
- " (pass an empty string or the same name as the 1st file"
- " if you want to operate with one workpoint file)"},
+ " (pass an empty string or the same name as the 1st file"
+ " if you want to operate with one workpoint file)"},
};
@@ -132,7 +132,7 @@
{ GIMP_PDB_INT32, "overwrite", "0 == do not overwrite, 1 == overrite existing frames"},
{ GIMP_PDB_INT32, "do_simple_fade", "0 == use morph algorithm, 1 == use simple fade operation (ignore the workpoint_file) "},
{ GIMP_PDB_STRING, "workpoint_file", "Name of a Morph/Warp workpointfile"
- "(create such file(s) with the save button in the GUI "
+ "(create such file(s) with the save button in the GUI "
"of the plug_in_gap_morph_layers, or specify an emty string"
"that starts with 0x00 to operate as simple video fade)"},
};
@@ -150,7 +150,7 @@
"other value deliver a mix according to morph algortihm" },
{ GIMP_PDB_INT32, "do_simple_fade", "0 == use morph algorithm, 1 == use simple fade operation (ignore the workpoint_file) "},
{ GIMP_PDB_STRING, "workpoint_file", "Name of a Morph/Warp workpointfile"
- "(create such file(s) with the save button in the GUI "
+ "(create such file(s) with the save button in the GUI "
"of the plug_in_gap_morph_layers, or specify an emty string"
"that starts with 0x00 to operate as simple video fade)"},
};
@@ -169,19 +169,19 @@
"Image Layer Morphing",
"This plug-in creates new layers by transforming the src_drawable to dst_drawable, "
"the transformation type depends on the render_mode parameter. "
- "for MORPH render_mode (0) it is a combination of 2 warp deformation actions "
- "and cross-blending, commonly known as morphing."
+ "for MORPH render_mode (0) it is a combination of 2 warp deformation actions "
+ "and cross-blending, commonly known as morphing."
"The tween_steps parameter controls how much new layers to create. "
- "(or how much layers to modify depending on the create_tween_layers parameter) "
+ "(or how much layers to modify depending on the create_tween_layers parameter) "
"source and destination may differ in size and can be in different images. "
- "for WARP render_mode (1) there will be just Move Deformation. "
- "Deformation is controled by workpoints. Workpoints are created and edited with the help "
- "of the INTERACTIVE GUI and saved to file(s). "
- "For the NON-INTERACTIVE runmode you must provide the filename of such a file. "
- "Provide 2 filenames if you want to operate with multiple workpoint sets. "
- "In that case your workpoint files can have a 2 digit numberpart. "
- "This will implicite select all filenames with numbers inbetween as well."
- ,
+ "for WARP render_mode (1) there will be just Move Deformation. "
+ "Deformation is controled by workpoints. Workpoints are created and edited with the help "
+ "of the INTERACTIVE GUI and saved to file(s). "
+ "For the NON-INTERACTIVE runmode you must provide the filename of such a file. "
+ "Provide 2 filenames if you want to operate with multiple workpoint sets. "
+ "In that case your workpoint files can have a 2 digit numberpart. "
+ "This will implicite select all filenames with numbers inbetween as well."
+ ,
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
GAP_VERSION_WITH_DATE,
@@ -199,12 +199,12 @@
"Render tween frames via morhing",
"This plug-in creates and saves image frames that are a mix of the specified image frame and the frame with to_frame_nr, "
"The typical usage is to create the frame images of missing frame numbers in a series of anim frame images. "
- "the overwrite flag allows overwriting of already existing frames between the start frame image "
+ "the overwrite flag allows overwriting of already existing frames between the start frame image "
"and the frame with to_frame_nr"
- "Morphing is controled by workpoints. A Workpoint file can be created and edited with the help "
- "of the Morph feature in the Video menu. "
- "Note: without workpoints the resulting tween is calculated as simple fade operation. "
- ,
+ "Morphing is controled by workpoints. A Workpoint file can be created and edited with the help "
+ "of the Morph feature in the Video menu. "
+ "Note: without workpoints the resulting tween is calculated as simple fade operation. "
+ ,
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
GAP_VERSION_WITH_DATE,
@@ -223,12 +223,12 @@
"Render one tween via morhing",
"This plug-in creates a new image that is a mix of the specified src_drawable and dst_drawable, "
"the mixing is done based on a morphing transformation where the tween_mix_factor "
- "determines how much the result looks like source or destination. "
+ "determines how much the result looks like source or destination. "
"source and destination may differ in size and can be in different images. "
- "Morphing is controled by workpoints. A Workpoint file can be created and edited with the help "
- "of the Morph feature in the Video menu. "
- "Note: without workpoints the resulting tween is calculated as simple fade operation. "
- ,
+ "Morphing is controled by workpoints. A Workpoint file can be created and edited with the help "
+ "of the Morph feature in the Video menu. "
+ "Note: without workpoints the resulting tween is calculated as simple fade operation. "
+ ,
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
GAP_VERSION_WITH_DATE,
@@ -415,151 +415,151 @@
&& (strcmp(name, PLUG_IN_NAME) == 0))
{
mgpp->have_workpointsets = TRUE; /* use pointset(s) from file */
-
- /* set defaults for params that may be specified in the workpointfiles
- * (the defaults will take effect only if the file does not contain such settings)
- */
- mgpp->use_quality_wp_selection = FALSE;
- mgpp->use_gravity = FALSE;
- mgpp->gravity_intensity = 2.0;
- mgpp->affect_radius = 100.0;
-
+
+ /* set defaults for params that may be specified in the workpointfiles
+ * (the defaults will take effect only if the file does not contain such settings)
+ */
+ mgpp->use_quality_wp_selection = FALSE;
+ mgpp->use_gravity = FALSE;
+ mgpp->gravity_intensity = 2.0;
+ mgpp->affect_radius = 100.0;
+
mgpp->osrc_layer_id = param[2].data.d_drawable;
mgpp->fdst_layer_id = param[3].data.d_drawable;
mgpp->tween_steps = param[4].data.d_int32;
mgpp->render_mode = param[5].data.d_int32;
mgpp->create_tween_layers = param[6].data.d_int32;
- if(param[7].data.d_string != NULL)
- {
- if(param[7].data.d_string[0] != '\0')
- {
- g_snprintf(mgpp->workpoint_file_lower
- , sizeof(mgpp->workpoint_file_lower)
- , "%s", param[7].data.d_string);
- g_snprintf(mgpp->workpoint_file_upper
- , sizeof(mgpp->workpoint_file_upper)
- , "%s", param[7].data.d_string);
- }
- else
- {
+ if(param[7].data.d_string != NULL)
+ {
+ if(param[7].data.d_string[0] != '\0')
+ {
+ g_snprintf(mgpp->workpoint_file_lower
+ , sizeof(mgpp->workpoint_file_lower)
+ , "%s", param[7].data.d_string);
+ g_snprintf(mgpp->workpoint_file_upper
+ , sizeof(mgpp->workpoint_file_upper)
+ , "%s", param[7].data.d_string);
+ }
+ else
+ {
printf("%s: noninteractive call requires a not-empty workpoint_file_1 parameter\n"
- , PLUG_IN_NAME
- );
+ , PLUG_IN_NAME
+ );
status = GIMP_PDB_CALLING_ERROR;
- }
- }
- else
- {
+ }
+ }
+ else
+ {
printf("%s: noninteractive call requires a not-NULL workpoint_file_1 parameter\n"
- , PLUG_IN_NAME
- );
+ , PLUG_IN_NAME
+ );
status = GIMP_PDB_CALLING_ERROR;
- }
-
- if(param[8].data.d_string != NULL)
- {
- if(param[8].data.d_string[0] != '\0')
- {
- g_snprintf(mgpp->workpoint_file_upper
- , sizeof(mgpp->workpoint_file_upper)
- , "%s", param[8].data.d_string);
- }
- }
-
- run_flag = TRUE;
+ }
+
+ if(param[8].data.d_string != NULL)
+ {
+ if(param[8].data.d_string[0] != '\0')
+ {
+ g_snprintf(mgpp->workpoint_file_upper
+ , sizeof(mgpp->workpoint_file_upper)
+ , "%s", param[8].data.d_string);
+ }
+ }
+
+ run_flag = TRUE;
}
else if ((nparams == G_N_ELEMENTS (in_one_tween_args))
&& (strcmp(name, PLUG_IN_NAME_ONE_TWEEN) == 0))
{
- /* set defaults for params that may be specified in the workpointfiles
- * (the defaults will take effect only if the file does not contain such settings)
- */
- mgpp->use_quality_wp_selection = FALSE;
+ /* set defaults for params that may be specified in the workpointfiles
+ * (the defaults will take effect only if the file does not contain such settings)
+ */
+ mgpp->use_quality_wp_selection = FALSE;
mgpp->have_workpointsets = FALSE; /* operate with a single workpointfile */
- mgpp->use_gravity = FALSE;
- mgpp->gravity_intensity = 2.0;
- mgpp->affect_radius = 100.0;
+ mgpp->use_gravity = FALSE;
+ mgpp->gravity_intensity = 2.0;
+ mgpp->affect_radius = 100.0;
mgpp->tween_steps = 1; /* (in this mode always render only one tween) */
mgpp->render_mode = GAP_MORPH_RENDER_MODE_MORPH;
mgpp->create_tween_layers = TRUE;
-
+
mgpp->osrc_layer_id = param[2].data.d_drawable;
mgpp->fdst_layer_id = param[3].data.d_drawable;
mgpp->tween_mix_factor = param[4].data.d_float;
mgpp->do_simple_fade = (param[5].data.d_int32 != 0);
- if(param[6].data.d_string != NULL)
- {
- if(param[6].data.d_string[0] != '\0')
- {
- g_snprintf(mgpp->workpoint_file_lower
- , sizeof(mgpp->workpoint_file_lower)
- , "%s", param[6].data.d_string);
- g_snprintf(mgpp->workpoint_file_upper
- , sizeof(mgpp->workpoint_file_upper)
- , "%s", param[6].data.d_string);
- }
- else
- {
+ if(param[6].data.d_string != NULL)
+ {
+ if(param[6].data.d_string[0] != '\0')
+ {
+ g_snprintf(mgpp->workpoint_file_lower
+ , sizeof(mgpp->workpoint_file_lower)
+ , "%s", param[6].data.d_string);
+ g_snprintf(mgpp->workpoint_file_upper
+ , sizeof(mgpp->workpoint_file_upper)
+ , "%s", param[6].data.d_string);
+ }
+ else
+ {
mgpp->have_workpointsets = FALSE; /* no pointset file available */
}
- run_flag = TRUE;
- }
- else
- {
+ run_flag = TRUE;
+ }
+ else
+ {
printf("%s: noninteractive call requires a not-NULL workpoint_file parameter\n"
- , PLUG_IN_NAME_ONE_TWEEN
- );
+ , PLUG_IN_NAME_ONE_TWEEN
+ );
status = GIMP_PDB_CALLING_ERROR;
- }
-
-
+ }
+
+
}
else if ((nparams == G_N_ELEMENTS (in_one_tween_args))
&& (strcmp(name, PLUG_IN_NAME_TWEEN) == 0))
{
- /* set defaults for params that may be specified in the workpointfiles
- * (the defaults will take effect only if the file does not contain such settings)
- */
- mgpp->use_quality_wp_selection = FALSE;
+ /* set defaults for params that may be specified in the workpointfiles
+ * (the defaults will take effect only if the file does not contain such settings)
+ */
+ mgpp->use_quality_wp_selection = FALSE;
mgpp->have_workpointsets = FALSE; /* operate with a single workpointfile */
- mgpp->use_gravity = FALSE;
- mgpp->gravity_intensity = 2.0;
- mgpp->affect_radius = 100.0;
+ mgpp->use_gravity = FALSE;
+ mgpp->gravity_intensity = 2.0;
+ mgpp->affect_radius = 100.0;
mgpp->tween_steps = 1; /* (will be calculated later as difference of handled frame numbers) */
mgpp->render_mode = GAP_MORPH_RENDER_MODE_MORPH;
mgpp->create_tween_layers = TRUE;
-
+
mgpp->osrc_layer_id = -1; /* is created later as merged copy of the specified image */
mgpp->fdst_layer_id = -1; /* is created later as merged copy of the frame rfered by to_frame_nr parameter */
mgpp->range_to = param[3].data.d_int32;
mgpp->overwrite_flag = (param[4].data.d_int32 != 0);
mgpp->do_simple_fade = (param[5].data.d_int32 != 0);
mgpp->tween_mix_factor = 1.0; /* not relevant here */
- if(param[6].data.d_string != NULL)
- {
- if(param[6].data.d_string[0] != '\0')
- {
- g_snprintf(mgpp->workpoint_file_lower
- , sizeof(mgpp->workpoint_file_lower)
- , "%s", param[6].data.d_string);
- g_snprintf(mgpp->workpoint_file_upper
- , sizeof(mgpp->workpoint_file_upper)
- , "%s", param[6].data.d_string);
- }
- else
- {
+ if(param[6].data.d_string != NULL)
+ {
+ if(param[6].data.d_string[0] != '\0')
+ {
+ g_snprintf(mgpp->workpoint_file_lower
+ , sizeof(mgpp->workpoint_file_lower)
+ , "%s", param[6].data.d_string);
+ g_snprintf(mgpp->workpoint_file_upper
+ , sizeof(mgpp->workpoint_file_upper)
+ , "%s", param[6].data.d_string);
+ }
+ else
+ {
mgpp->have_workpointsets = FALSE; /* no pointset file available */
- }
- run_flag = TRUE;
- }
- else
- {
+ }
+ run_flag = TRUE;
+ }
+ else
+ {
printf("%s: noninteractive call requires a not-NULL workpoint_file parameter\n"
- , PLUG_IN_NAME_TWEEN
- );
+ , PLUG_IN_NAME_TWEEN
+ );
status = GIMP_PDB_CALLING_ERROR;
- }
-
+ }
+
}
else
{
Modified: trunk/gap/gap_morph_main.h
==============================================================================
--- trunk/gap/gap_morph_main.h (original)
+++ trunk/gap/gap_morph_main.h Sun Apr 5 06:47:07 2009
@@ -87,11 +87,11 @@
gboolean create_tween_layers; /* FALSE: operate on existing layers only */
gboolean have_workpointsets; /* FALSE: use the default workpointset master_wp_list
* TRUE: use lower_wp_list and upper_wp_list
- * foreach handled frame the
- * lower and upper list are fetched from
- * best matching workpointfile.
- * (using the numberpart of the filename)
- */
+ * foreach handled frame the
+ * lower and upper list are fetched from
+ * best matching workpointfile.
+ * (using the numberpart of the filename)
+ */
gboolean use_quality_wp_selection;
gboolean use_gravity;
gdouble gravity_intensity; /* 1.0 upto 5 (gravity power) */
Modified: trunk/gap/gap_morph_tween_dialog.c
==============================================================================
--- trunk/gap/gap_morph_tween_dialog.c (original)
+++ trunk/gap/gap_morph_tween_dialog.c Sun Apr 5 06:47:07 2009
@@ -146,21 +146,21 @@
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel),
- &mgpp->workpoint_file_lower[0]);
+ &mgpp->workpoint_file_lower[0]);
gtk_widget_show (filesel);
g_signal_connect (G_OBJECT (filesel), "destroy",
- G_CALLBACK (p_filesel_close_cb),
- mtg);
+ G_CALLBACK (p_filesel_close_cb),
+ mtg);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_ok_cb),
- mtg);
+ mtg);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_close_cb),
- mtg);
+ mtg);
}
/* -----------------------------------------------------
@@ -188,13 +188,13 @@
p_morph_workpoint_entry_update_cb(GtkWidget *widget, GapMorphGlobalParams *mgpp)
{
g_snprintf(&mgpp->workpoint_file_lower[0]
- , sizeof(mgpp->workpoint_file_lower)
- , "%s"
+ , sizeof(mgpp->workpoint_file_lower)
+ , "%s"
, gtk_entry_get_text(GTK_ENTRY(widget))
);
g_snprintf(&mgpp->workpoint_file_upper[0]
- , sizeof(mgpp->workpoint_file_upper)
- , "%s"
+ , sizeof(mgpp->workpoint_file_upper)
+ , "%s"
, gtk_entry_get_text(GTK_ENTRY(widget))
);
if(gap_debug)
@@ -240,8 +240,8 @@
gtk_widget_show(entry);
g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK (p_morph_workpoint_entry_update_cb),
- mgpp);
+ G_CALLBACK (p_morph_workpoint_entry_update_cb),
+ mgpp);
/* Button to invoke filebrowser */
@@ -249,11 +249,11 @@
gtk_widget_set_size_request(button, SPIN_BUTTON_WIDTH, -1);
g_object_set_data (G_OBJECT (button), "mgpp", (gpointer)mgpp);
gtk_table_attach( GTK_TABLE(table), button, 2, 3, row, row +1,
- 0, 0, 0, 0 );
+ 0, 0, 0, 0 );
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (p_filesel_open_cb),
- mtg);
+ G_CALLBACK (p_filesel_open_cb),
+ mtg);
} /* end p_create_morph_workpoint_entry */
/* --------------------------------------
Modified: trunk/gap/gap_mov_dialog.c
==============================================================================
--- trunk/gap/gap_mov_dialog.c (original)
+++ trunk/gap/gap_mov_dialog.c Sun Apr 5 06:47:07 2009
@@ -155,18 +155,18 @@
#define RADIUS 3
-#define PREVIEW 0x1
+#define PREVIEW 0x1
#define CURSOR 0x2
#define PATH_LINE 0x4
-#define ALL 0xf
+#define ALL 0xf
#define GAP_MOV_CHECK_SIZE 8
/* event masks for the preview widget */
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
- GDK_BUTTON_PRESS_MASK |\
- GDK_BUTTON_RELEASE_MASK |\
- GDK_BUTTON_MOTION_MASK
+ GDK_BUTTON_PRESS_MASK |\
+ GDK_BUTTON_RELEASE_MASK |\
+ GDK_BUTTON_MOTION_MASK
#define POINT_INDEX_LABEL_LENGTH 256
@@ -177,11 +177,11 @@
typedef struct
{
- GimpDrawable *drawable;
- gint dwidth, dheight;
- gint bpp;
+ GimpDrawable *drawable;
+ gint dwidth, dheight;
+ gint bpp;
GapPView *pv_ptr;
- GimpPixelRgn src_rgn;
+ GimpPixelRgn src_rgn;
gint show_path;
gint show_cursor;
gint show_grid;
@@ -190,8 +190,8 @@
gint32 instant_timertag;
gint startup;
- gint pwidth, pheight;
- gint curx, cury; /* x,y of cursor in preview */
+ gint pwidth, pheight;
+ gint curx, cury; /* x,y of cursor in preview */
GtkWidget *filesel;
GtkAdjustment *x_adj;
@@ -279,7 +279,7 @@
static GimpDrawable * p_get_flattened_drawable (gint32 image_id);
static GimpDrawable * p_get_prevw_drawable (t_mov_gui_stuff *mgp);
-static gint mov_dialog ( GimpDrawable *drawable, t_mov_gui_stuff *mgp,
+static gint mov_dialog ( GimpDrawable *drawable, t_mov_gui_stuff *mgp,
gint min, gint max);
static GtkWidget * mov_modify_tab_create (t_mov_gui_stuff *mgp);
static GtkWidget * mov_trans_tab_create (t_mov_gui_stuff *mgp);
@@ -287,23 +287,23 @@
static void mov_path_prevw_create ( GimpDrawable *drawable,
t_mov_gui_stuff *mgp,
- gboolean vertical_layout);
+ gboolean vertical_layout);
static void mov_refresh_src_layer_menu(t_mov_gui_stuff *mgp);
static GtkWidget * mov_src_sel_create (t_mov_gui_stuff *mgp);
static GtkWidget * mov_advanced_tab_create(t_mov_gui_stuff *mgp);
static GtkWidget * mov_edit_button_box_create (t_mov_gui_stuff *mgp);
static GtkWidget * mov_path_framerange_box_create(t_mov_gui_stuff *mgp,
- gboolean vertical_layout
- );
-static void mov_path_prevw_preview_init ( t_mov_gui_stuff *mgp );
-static void mov_path_prevw_draw ( t_mov_gui_stuff *mgp, gint update );
-static void mov_instant_int_adjustment_update (GtkObject *obj, gpointer val);
-static void mov_instant_double_adjustment_update (GtkObject *obj, gpointer val);
-static void mov_path_colorbutton_update ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
-static void mov_path_keycolorbutton_clicked ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
-static void mov_path_keycolorbutton_changed ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
-static void mov_path_x_adjustment_update ( GtkWidget *widget, gpointer data );
-static void mov_path_y_adjustment_update ( GtkWidget *widget, gpointer data );
+ gboolean vertical_layout
+ );
+static void mov_path_prevw_preview_init ( t_mov_gui_stuff *mgp );
+static void mov_path_prevw_draw ( t_mov_gui_stuff *mgp, gint update );
+static void mov_instant_int_adjustment_update (GtkObject *obj, gpointer val);
+static void mov_instant_double_adjustment_update (GtkObject *obj, gpointer val);
+static void mov_path_colorbutton_update ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
+static void mov_path_keycolorbutton_clicked ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
+static void mov_path_keycolorbutton_changed ( GimpColorButton *widget, t_mov_gui_stuff *mgp);
+static void mov_path_x_adjustment_update ( GtkWidget *widget, gpointer data );
+static void mov_path_y_adjustment_update ( GtkWidget *widget, gpointer data );
static void mov_path_tfactor_adjustment_update( GtkWidget *widget, gdouble *val);
static void mov_path_feather_adjustment_update( GtkWidget *widget, gdouble *val );
static void mov_selmode_menu_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
@@ -311,9 +311,9 @@
static void mov_path_resize_adjustment_update( GtkObject *obj, gdouble *val);
static void mov_path_tween_steps_adjustment_update( GtkObject *obj, gint *val);
-static void mov_path_prevw_cursor_update ( t_mov_gui_stuff *mgp );
-static gint mov_path_prevw_preview_expose ( GtkWidget *widget, GdkEvent *event );
-static gint mov_path_prevw_preview_events ( GtkWidget *widget, GdkEvent *event );
+static void mov_path_prevw_cursor_update ( t_mov_gui_stuff *mgp );
+static gint mov_path_prevw_preview_expose ( GtkWidget *widget, GdkEvent *event );
+static gint mov_path_prevw_preview_events ( GtkWidget *widget, GdkEvent *event );
static gint p_chk_keyframes(t_mov_gui_stuff *mgp);
static void mov_grab_bezier_path(t_mov_gui_stuff *mgp
@@ -323,35 +323,35 @@
);
static void mov_grab_anchorpoints_path(t_mov_gui_stuff *mgp
,gint num_path_point_details
- ,gdouble *points_details
- );
+ ,gdouble *points_details
+ );
-static void mov_padd_callback (GtkWidget *widget,gpointer data);
-static void mov_pgrab_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
-static void mov_pins_callback (GtkWidget *widget,gpointer data);
-static void mov_pdel_callback (GtkWidget *widget,gpointer data);
+static void mov_padd_callback (GtkWidget *widget,gpointer data);
+static void mov_pgrab_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
+static void mov_pins_callback (GtkWidget *widget,gpointer data);
+static void mov_pdel_callback (GtkWidget *widget,gpointer data);
static void mov_follow_keyframe (t_mov_gui_stuff *mgp);
static void mov_pnext_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
static void mov_pprev_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
static void mov_pfirst_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
static void mov_plast_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
-static void mov_pdel_all_callback (GtkWidget *widget,gpointer data);
-static void mov_pclr_callback (GtkWidget *widget,gpointer data);
-static void mov_pclr_all_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
-static void mov_prot_follow_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
+static void mov_pdel_all_callback (GtkWidget *widget,gpointer data);
+static void mov_pclr_callback (GtkWidget *widget,gpointer data);
+static void mov_pclr_all_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
+static void mov_prot_follow_callback (GtkWidget *widget,GdkEventButton *bevent,gpointer data);
static void mov_pload_callback (GtkWidget *widget,gpointer data);
static void mov_psave_callback (GtkWidget *widget,gpointer data);
static void p_points_load_from_file (GtkWidget *widget,t_mov_gui_stuff *mgp);
static void p_points_save_to_file (GtkWidget *widget,t_mov_gui_stuff *mgp);
static gboolean mov_check_valid_src_layer(t_mov_gui_stuff *mgp);
-static void mov_help_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
-static void mov_close_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
-static void mov_ok_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
+static void mov_help_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
+static void mov_close_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
+static void mov_ok_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
static void mov_upvw_callback (GtkWidget *widget, t_mov_gui_stuff *mgp);
static void mov_apv_callback (GtkWidget *widget,gpointer data);
-static void p_filesel_close_cb (GtkWidget *widget, t_mov_gui_stuff *mgp);
+static void p_filesel_close_cb (GtkWidget *widget, t_mov_gui_stuff *mgp);
static gint mov_imglayer_constrain (gint32 image_id, gint32 drawable_id, gpointer data);
static void mov_imglayer_menu_callback (GtkWidget *, t_mov_gui_stuff *mgp);
@@ -402,15 +402,15 @@
static void mov_pview_size_allocate_callback(GtkWidget *widget
, GtkAllocation *allocation
- , t_mov_gui_stuff *mgp
- );
+ , t_mov_gui_stuff *mgp
+ );
static GapMovValues *pvals;
static t_mov_interface mov_int =
{
- FALSE /* run */
+ FALSE /* run */
};
@@ -619,8 +619,8 @@
gtk_window_set_title (GTK_WINDOW (dlg), _("Move Path"));
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
g_signal_connect (G_OBJECT (dlg), "destroy",
- G_CALLBACK (mov_close_callback),
- mgp);
+ G_CALLBACK (mov_close_callback),
+ mgp);
gtk_window_set_resizable(GTK_WINDOW (mgp->shell), TRUE);
/* Action area */
@@ -651,8 +651,8 @@
gtk_box_pack_start (GTK_BOX (hbbox), button, TRUE, TRUE, 0);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK(mov_close_callback),
- mgp);
+ G_CALLBACK(mov_close_callback),
+ mgp);
/* button = gtk_button_new_with_label */
button = gtk_button_new_from_stock ( GTK_STOCK_REFRESH );
@@ -663,8 +663,8 @@
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_upvw_callback),
- mgp);
+ G_CALLBACK (mov_upvw_callback),
+ mgp);
button = gtk_button_new_from_stock ( GAP_STOCK_ANIM_PREVIEW );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -674,8 +674,8 @@
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_apv_callback),
- mgp);
+ G_CALLBACK (mov_apv_callback),
+ mgp);
button = gtk_button_new_from_stock ( GTK_STOCK_OK);
@@ -684,8 +684,8 @@
gtk_widget_grab_default (button);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_ok_callback),
- mgp);
+ G_CALLBACK (mov_ok_callback),
+ mgp);
/* parameter settings */
spc_hbox = gtk_hbox_new (FALSE, 0);
@@ -721,16 +721,16 @@
label = gtk_label_new(_("Source Select"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0)
- , label
- );
+ , label
+ );
/* the advanced features frame */
advanced_frame = mov_advanced_tab_create(mgp);
gtk_container_add (GTK_CONTAINER (notebook), advanced_frame);
label = gtk_label_new(_("Advanced Settings"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1)
- , label
- );
+ , label
+ );
gtk_widget_show (notebook);
/* the path preview frame (with all the controlpoint widgets) */
@@ -796,7 +796,7 @@
if(pvals->src_layer_id < 0)
{
g_message(_("No source image was selected.\n"
- "Please open a 2nd image of the same type before opening 'Move Path'"));
+ "Please open a 2nd image of the same type before opening 'Move Path'"));
return(FALSE);
}
return(TRUE);
@@ -808,7 +808,7 @@
*/
static void
mov_help_callback (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
if(gap_debug) printf("mov_help_callback:\n");
@@ -817,7 +817,7 @@
static void
mov_close_callback (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
if(mgp)
{
@@ -831,10 +831,10 @@
mgp->shell = NULL;
/* mov_close_callback is the signal handler for the "destroy"
- * signal of the shell window.
- * the gtk_widget_destroy call will immediate reenter this procedure.
- * (for this reason the mgp->shell is set to NULL
- * before the gtk_widget_destroy call)
+ * signal of the shell window.
+ * the gtk_widget_destroy call will immediate reenter this procedure.
+ * (for this reason the mgp->shell is set to NULL
+ * before the gtk_widget_destroy call)
*/
gtk_widget_destroy (l_shell);
}
@@ -846,7 +846,7 @@
static void
mov_ok_callback (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
if(pvals != NULL)
{
@@ -882,7 +882,7 @@
*/
static void
mov_upvw_callback (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
char *l_filename;
long l_frame_nr;
@@ -902,8 +902,8 @@
{
/* dont show waiting cursor at instant_apply
* (cursor flickering is boring on fast machines,
- * and users with slow machines should not touch instant_apply at all)
- */
+ * and users with slow machines should not touch instant_apply at all)
+ */
mov_set_waiting_cursor(mgp);
}
/* replace the temporary image */
@@ -922,17 +922,17 @@
else
{
if(pvals->tmp_alt_image_id >= 0)
- {
- gimp_image_delete(pvals->tmp_alt_image_id);
- pvals->tmp_alt_image_id = -1;
- pvals->tmp_alt_framenr = -1;
- }
- /* we must load a frame for preview update */
+ {
+ gimp_image_delete(pvals->tmp_alt_image_id);
+ pvals->tmp_alt_image_id = -1;
+ pvals->tmp_alt_framenr = -1;
+ }
+ /* we must load a frame for preview update */
l_new_tmp_image_id = gap_lib_load_image(l_filename);
- /* keep a copy of the frame to speed up further (instant) updates */
+ /* keep a copy of the frame to speed up further (instant) updates */
pvals->tmp_alt_image_id = gimp_image_duplicate(l_new_tmp_image_id);
- pvals->tmp_alt_framenr = l_frame_nr;
+ pvals->tmp_alt_framenr = l_frame_nr;
}
}
gimp_image_undo_disable(l_new_tmp_image_id);
@@ -940,29 +940,29 @@
g_free(l_filename);
if (l_new_tmp_image_id >= 0)
{
- /* use the new loaded temporary image */
- l_old_tmp_image_id = pvals->tmp_image_id;
- pvals->tmp_image_id = l_new_tmp_image_id;
+ /* use the new loaded temporary image */
+ l_old_tmp_image_id = pvals->tmp_image_id;
+ pvals->tmp_image_id = l_new_tmp_image_id;
- /* flatten image, and get the (only) resulting drawable */
- mgp->drawable = p_get_prevw_drawable(mgp);
+ /* flatten image, and get the (only) resulting drawable */
+ mgp->drawable = p_get_prevw_drawable(mgp);
- /* gimp_display_new(pvals->tmp_image_id); */ /* add a display for debugging only */
+ /* gimp_display_new(pvals->tmp_image_id); */ /* add a display for debugging only */
- /* re initialize preview image */
- mov_path_prevw_preview_init(mgp);
- p_point_refresh(mgp);
+ /* re initialize preview image */
+ mov_path_prevw_preview_init(mgp);
+ p_point_refresh(mgp);
- mgp->old_preview_frame_nr = mgp->preview_frame_nr;
+ mgp->old_preview_frame_nr = mgp->preview_frame_nr;
- gtk_widget_queue_draw(mgp->pv_ptr->da_widget);
- mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
- gdk_flush();
+ gtk_widget_queue_draw(mgp->pv_ptr->da_widget);
+ mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
+ gdk_flush();
- /* destroy the old tmp image */
- gimp_image_delete(l_old_tmp_image_id);
+ /* destroy the old tmp image */
+ gimp_image_delete(l_old_tmp_image_id);
- mgp->instant_apply_request = FALSE;
+ mgp->instant_apply_request = FALSE;
}
mov_set_active_cursor(mgp);
}
@@ -971,7 +971,7 @@
static void
mov_apv_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
#define ARGC_APV 5
t_mov_gui_stuff *mgp;
@@ -985,8 +985,8 @@
static GapArrArg argv[ARGC_APV];
static char *radio_apv_mode[3] = { N_("Object on empty frames")
, N_("Object on one frame")
- , N_("Exact object on frames")
- };
+ , N_("Exact object on frames")
+ };
static int gettextize_loop = 0;
@@ -1106,7 +1106,7 @@
if(argv[3].int_ret)
{
pvals->apv_gap_paste_buff = gap_lib_get_video_paste_name();
- gap_vid_edit_clear();
+ gap_vid_edit_clear();
}
else
{
@@ -1116,12 +1116,12 @@
if(gap_debug) printf("Generating Animated Preview\n");
/* TODO: here we should start a thread for calculate and playback of the anim preview,
- * so the move_path main window is not blocked until playback exits
- */
+ * so the move_path main window is not blocked until playback exits
+ */
p_points_to_tab(mgp);
if(!p_chk_keyframes(mgp))
{
- return;
+ return;
}
mov_set_waiting_cursor(mgp);
@@ -1129,7 +1129,7 @@
l_new_image_id = gap_mov_exec_anim_preview(pvals, mgp->ainfo_ptr, mgp->preview_frame_nr);
if(l_new_image_id < 0)
{
- gap_arr_msg_win(GIMP_RUN_INTERACTIVE,
+ gap_arr_msg_win(GIMP_RUN_INTERACTIVE,
_("Generation of animated preview failed"));
}
else
@@ -1140,11 +1140,11 @@
mov_set_waiting_cursor(mgp); /* for refresh */
return_vals = gimp_run_procedure ("plug_in_animationplay",
&nreturn_vals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_IMAGE, l_new_image_id,
- GIMP_PDB_DRAWABLE, dummy_layer_id,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_IMAGE, l_new_image_id,
+ GIMP_PDB_DRAWABLE, dummy_layer_id,
GIMP_PDB_END);
- gimp_destroy_params(return_vals, nreturn_vals);
+ gimp_destroy_params(return_vals, nreturn_vals);
}
pvals->apv_mlayer_image = -1;
mov_set_active_cursor(mgp);
@@ -1245,14 +1245,14 @@
{
printf("PATH distance: %.3f, (%.4f / %.4f) X:%03d Y: %03d slope:%.3f valid:%d success:%d\n"
, (float)distance
- , (float)xdouble
- , (float)ydouble
- , (int)pvals->point[l_ii].p_x
- , (int)pvals->point[l_ii].p_y
+ , (float)xdouble
+ , (float)ydouble
+ , (int)pvals->point[l_ii].p_x
+ , (int)pvals->point[l_ii].p_y
, (float)slope
, (int)valid
, (int)success
- );
+ );
}
if((!valid) || (!success))
@@ -1282,8 +1282,8 @@
static void
mov_grab_anchorpoints_path(t_mov_gui_stuff *mgp,
gint num_path_point_details,
- gdouble *points_details
- )
+ gdouble *points_details
+ )
{
gint l_ii;
gint l_ti;
@@ -1308,9 +1308,9 @@
if(gap_debug)
{
printf("Point[%03d]: detail: %3.3f\n"
- , (int)l_ii
+ , (int)l_ii
, (float)points_details[l_ii]
- );
+ );
}
/* this implemenatation just fetches the bezier ancor points
@@ -1323,9 +1323,9 @@
*/
switch (l_ti)
{
- case GAP_BEZIER_ANCHOR_X_INDEX: point_x = (gint)points_details[l_ii]; break;
- case GAP_BEZIER_ANCHOR_Y_INDEX: point_y = (gint)points_details[l_ii]; break;
- default: break;
+ case GAP_BEZIER_ANCHOR_X_INDEX: point_x = (gint)points_details[l_ii]; break;
+ case GAP_BEZIER_ANCHOR_Y_INDEX: point_y = (gint)points_details[l_ii]; break;
+ default: break;
}
l_ti++;
@@ -1333,29 +1333,29 @@
if((l_ti >= 6) || (l_ii == num_path_point_details))
{
if(gap_debug)
- {
- printf("\n");
- }
+ {
+ printf("\n");
+ }
- l_ti=0;
+ l_ti=0;
if(gap_debug)
- {
- printf("ANCHOR x:%d y:%d\n\n"
- ,(int)point_x
- ,(int)point_y
- );
- }
+ {
+ printf("ANCHOR x:%d y:%d\n\n"
+ ,(int)point_x
+ ,(int)point_y
+ );
+ }
- pvals->point_idx_max = l_idx;
- p_clear_one_point(l_idx);
+ pvals->point_idx_max = l_idx;
+ p_clear_one_point(l_idx);
pvals->point[l_idx].p_x = point_x;
pvals->point[l_idx].p_y = point_y;
- l_idx++;
+ l_idx++;
}
if (l_ii >= num_path_point_details)
{
- break;
+ break;
}
}
@@ -1371,8 +1371,8 @@
static void
mov_pgrab_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
gint32 image_id;
@@ -1410,19 +1410,19 @@
if(gap_debug)
{
printf("num_stroke_ids:%d\n"
- , (int)num_stroke_ids
- );
+ , (int)num_stroke_ids
+ );
}
if (num_stroke_ids < 1)
{
g_message(_("No stroke ids found in path:\n"
- "'%s'\n"
- "in the Image:\n"
- "'%s'")
- ,vectorname
- ,mgp->ainfo_ptr->old_filename
- );
+ "'%s'\n"
+ "in the Image:\n"
+ "'%s'")
+ ,vectorname
+ ,mgp->ainfo_ptr->old_filename
+ );
return;
}
@@ -1445,34 +1445,34 @@
{
printf("pathtype:%d path_closed flag :%d num_points:%d num_stroke_ids:%d\n"
, (int)pathtype
- , (int)path_closed
- , (int)num_path_point_details
- , (int)num_stroke_ids
- );
+ , (int)path_closed
+ , (int)num_path_point_details
+ , (int)num_stroke_ids
+ );
}
if(pathtype != GIMP_VECTORS_STROKE_TYPE_BEZIER)
{
g_message(_("Unsupported pathtype %d found in path:\n"
- "'%s'\n"
- "in the Image:\n"
- "'%s'")
- ,(int)pathtype
- ,vectorname
- ,mgp->ainfo_ptr->old_filename
- );
+ "'%s'\n"
+ "in the Image:\n"
+ "'%s'")
+ ,(int)pathtype
+ ,vectorname
+ ,mgp->ainfo_ptr->old_filename
+ );
return;
}
if(num_path_point_details < 1)
{
g_message(_("No controlpoints found in path:\n"
- "'%s'\n"
- "in the Image:\n"
- "'%s'")
- ,vectorname
- ,mgp->ainfo_ptr->old_filename
- );
+ "'%s'\n"
+ "in the Image:\n"
+ "'%s'")
+ ,vectorname
+ ,mgp->ainfo_ptr->old_filename
+ );
return;
}
@@ -1489,8 +1489,8 @@
{
mov_grab_anchorpoints_path(mgp
,num_path_point_details
- ,points_details
- );
+ ,points_details
+ );
}
@@ -1504,9 +1504,9 @@
else
{
g_message(_("No path found in the image:\n"
- "'%s'")
- ,mgp->ainfo_ptr->old_filename
- );
+ "'%s'")
+ ,mgp->ainfo_ptr->old_filename
+ );
}
} /* end mov_pgrab_callback */
@@ -1514,7 +1514,7 @@
static void
mov_padd_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
gint l_idx;
@@ -1536,7 +1536,7 @@
static void
mov_pins_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
gint l_idx;
@@ -1562,7 +1562,7 @@
static void
mov_pdel_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
gint l_idx;
@@ -1619,14 +1619,14 @@
{
mgp->preview_frame_nr = keyframe_abs;
gtk_adjustment_set_value (mgp->preview_frame_nr_adj,
- (gdouble)keyframe_abs);
+ (gdouble)keyframe_abs);
}
}
static void
mov_pnext_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1648,8 +1648,8 @@
static void
mov_pprev_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1670,8 +1670,8 @@
static void
mov_pfirst_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1691,8 +1691,8 @@
static void
mov_plast_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1712,7 +1712,7 @@
static void
mov_pclr_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1724,7 +1724,7 @@
static void
mov_pdel_all_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
t_mov_gui_stuff *mgp = data;
@@ -1737,7 +1737,7 @@
static void
mov_pclr_all_callback (GtkWidget *widget,
GdkEventButton *bevent,
- gpointer data)
+ gpointer data)
{
gint l_idx;
gint l_ref_idx1;
@@ -1764,18 +1764,18 @@
{
for(l_idx = 1; l_idx <= pvals->point_idx_max -1; l_idx++)
{
- mix_factor = (gdouble)l_idx / (gdouble)pvals->point_idx_max;
- l_ref_idx1 = 0;
- l_ref_idx2 = pvals->point_idx_max;
+ mix_factor = (gdouble)l_idx / (gdouble)pvals->point_idx_max;
+ l_ref_idx1 = 0;
+ l_ref_idx2 = pvals->point_idx_max;
- p_mix_one_point(l_idx, l_ref_idx1, l_ref_idx2, mix_factor);
+ p_mix_one_point(l_idx, l_ref_idx1, l_ref_idx2, mix_factor);
}
}
else
{
for(l_idx = 0; l_idx <= pvals->point_idx_max; l_idx++)
{
- p_clear_one_point(l_idx);
+ p_clear_one_point(l_idx);
}
}
}
@@ -1787,8 +1787,8 @@
static void
mov_prot_follow_callback (GtkWidget *widget,
- GdkEventButton *bevent,
- gpointer data)
+ GdkEventButton *bevent,
+ gpointer data)
{
gdouble l_startangle;
int key_modifier;
@@ -1831,7 +1831,7 @@
static void
p_filesel_close_cb(GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
if(mgp->filesel == NULL) return;
@@ -1841,7 +1841,7 @@
static void
mov_pload_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
GtkWidget *filesel;
t_mov_gui_stuff *mgp = data;
@@ -1858,31 +1858,31 @@
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_points_load_from_file),
- mgp);
+ mgp);
g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_close_cb),
- mgp);
+ mgp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel),
- mgp->pointfile_name);
+ mgp->pointfile_name);
gtk_widget_show (filesel);
/* "destroy" has to be the last signal,
* (otherwise the other callbacks are never called)
*/
g_signal_connect (G_OBJECT (filesel), "destroy",
- G_CALLBACK (p_filesel_close_cb),
- mgp);
+ G_CALLBACK (p_filesel_close_cb),
+ mgp);
}
static void
mov_psave_callback (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
GtkWidget *filesel;
t_mov_gui_stuff *mgp = data;
@@ -1899,31 +1899,31 @@
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_points_save_to_file),
- mgp);
+ mgp);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (p_filesel_close_cb),
- mgp);
+ mgp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel),
- mgp->pointfile_name);
+ mgp->pointfile_name);
gtk_widget_show (filesel);
/* "destroy" has to be the last signal,
* (otherwise the other callbacks are never called)
*/
g_signal_connect (G_OBJECT (filesel), "destroy",
- G_CALLBACK (p_filesel_close_cb),
- mgp);
+ G_CALLBACK (p_filesel_close_cb),
+ mgp);
}
static void
p_points_load_from_file (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
const gchar *filename;
@@ -1950,7 +1950,7 @@
static void
p_points_save_to_file (GtkWidget *widget,
- t_mov_gui_stuff *mgp)
+ t_mov_gui_stuff *mgp)
{
const gchar *filename;
@@ -1995,40 +1995,40 @@
mgp->in_call = TRUE;
gtk_adjustment_set_value (mgp->x_adj,
- (gdouble)mgp->p_x);
+ (gdouble)mgp->p_x);
gtk_adjustment_set_value (mgp->y_adj,
- (gdouble)mgp->p_y);
+ (gdouble)mgp->p_y);
gtk_adjustment_set_value (mgp->wres_adj,
- (gdouble)mgp->w_resize);
+ (gdouble)mgp->w_resize);
gtk_adjustment_set_value (mgp->hres_adj,
- (gdouble)mgp->h_resize);
+ (gdouble)mgp->h_resize);
gtk_adjustment_set_value (mgp->opacity_adj,
- (gdouble)mgp->opacity);
+ (gdouble)mgp->opacity);
gtk_adjustment_set_value (mgp->rotation_adj,
- (gdouble)mgp->rotation);
+ (gdouble)mgp->rotation);
gtk_adjustment_set_value (mgp->keyframe_adj,
- (gdouble)mgp->keyframe_abs);
+ (gdouble)mgp->keyframe_abs);
gtk_adjustment_set_value (mgp->ttlx_adj,
- (gdouble)mgp->ttlx);
+ (gdouble)mgp->ttlx);
gtk_adjustment_set_value (mgp->ttly_adj,
- (gdouble)mgp->ttly);
+ (gdouble)mgp->ttly);
gtk_adjustment_set_value (mgp->ttrx_adj,
- (gdouble)mgp->ttrx);
+ (gdouble)mgp->ttrx);
gtk_adjustment_set_value (mgp->ttry_adj,
- (gdouble)mgp->ttry);
+ (gdouble)mgp->ttry);
gtk_adjustment_set_value (mgp->tblx_adj,
- (gdouble)mgp->tblx);
+ (gdouble)mgp->tblx);
gtk_adjustment_set_value (mgp->tbly_adj,
- (gdouble)mgp->tbly);
+ (gdouble)mgp->tbly);
gtk_adjustment_set_value (mgp->tbrx_adj,
- (gdouble)mgp->tbrx);
+ (gdouble)mgp->tbrx);
gtk_adjustment_set_value (mgp->tbry_adj,
- (gdouble)mgp->tbry);
+ (gdouble)mgp->tbry);
gtk_adjustment_set_value (mgp->sel_feather_radius_adj,
- (gdouble)mgp->sel_feather_radius);
+ (gdouble)mgp->sel_feather_radius);
mgp->in_call = FALSE;
-} /* end p_point_refresh */
+} /* end p_point_refresh */
static void
p_pick_nearest_point(gint px, gint py)
@@ -2073,7 +2073,7 @@
pvals->point_idx = l_idx_min;
pvals->point[pvals->point_idx].p_x = px;
pvals->point[pvals->point_idx].p_y = py;
-} /* end p_pick_nearest_point */
+} /* end p_pick_nearest_point */
static void
@@ -2121,8 +2121,8 @@
{
if(gap_debug) printf("GAP-DEBUG: mov_imglayer_constrain PROCEDURE image_id:%d drawable_id:%d\n"
,(int)image_id
- ,(int)drawable_id
- );
+ ,(int)drawable_id
+ );
if(drawable_id < 0)
{
@@ -2393,7 +2393,7 @@
{
mgp->instant_timertag = (gint32) g_timeout_add(INSTANT_TIMERINTERVAL_MILLISEC,
(GtkFunction)mov_instant_timer_callback
- , mgp);
+ , mgp);
}
} /* end mov_install_timer */
@@ -2559,13 +2559,13 @@
p_update_point_index_text(t_mov_gui_stuff *mgp)
{
g_snprintf (&mgp->point_index_text[0], POINT_INDEX_LABEL_LENGTH,
- _("Current Point: [ %3d ] of [ %3d ]"),
- pvals->point_idx + 1, pvals->point_idx_max +1);
+ _("Current Point: [ %3d ] of [ %3d ]"),
+ pvals->point_idx + 1, pvals->point_idx_max +1);
if (mgp->point_index_frame)
{
gtk_frame_set_label (GTK_FRAME (mgp->point_index_frame),
- &mgp->point_index_text[0]);
+ &mgp->point_index_text[0]);
}
}
@@ -2597,7 +2597,7 @@
pvals->point[idx].keyframe = 0; /* 0: controlpoint is not fixed to keyframe */
pvals->point[idx].keyframe_abs = 0; /* 0: controlpoint is not fixed to keyframe */
}
-} /* end p_clear_one_point */
+} /* end p_clear_one_point */
/* --------------------------
@@ -2639,7 +2639,7 @@
pvals->point[idx].keyframe = 0; /* 0: controlpoint is not fixed to keyframe */
pvals->point[idx].keyframe_abs = 0; /* 0: controlpoint is not fixed to keyframe */
}
-} /* end p_mix_one_point */
+} /* end p_mix_one_point */
/* ============================================================================
@@ -2654,7 +2654,7 @@
p_clear_one_point(0);
pvals->point[0].p_x = 0;
pvals->point[0].p_y = 0;
-} /* end p_reset_points */
+} /* end p_reset_points */
/* ============================================================================
* p_load_points
@@ -2681,14 +2681,14 @@
if(l_errno != 0)
{
g_message(_("ERROR: Could not open controlpoints\n"
- "filename: '%s'\n%s")
- ,filename, g_strerror (l_errno));
+ "filename: '%s'\n%s")
+ ,filename, g_strerror (l_errno));
}
else
{
g_message(_("ERROR: Could not read controlpoints\n"
- "filename: '%s'\n(Is not a valid controlpoint file)")
- ,filename);
+ "filename: '%s'\n(Is not a valid controlpoint file)")
+ ,filename);
}
}
} /* end p_load_points */
@@ -2717,12 +2717,12 @@
if(l_rc != 0)
{
- g_message (_("Failed to write controlpointfile\n"
+ g_message (_("Failed to write controlpointfile\n"
"filename: '%s':\n%s"),
- filename, g_strerror (l_errno));
+ filename, g_strerror (l_errno));
}
}
-} /* end p_save_points */
+} /* end p_save_points */
/* ============================================================================
* mov_refresh_src_layer_menu
@@ -2770,7 +2770,7 @@
combo = gimp_layer_combo_box_new (mov_imglayer_constrain, NULL);
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 0, 1,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gimp_help_set_help_data(combo,
_("Source object to insert into destination frames of the specified range")
@@ -2818,7 +2818,7 @@
G_CALLBACK (mov_paintmode_menu_callback),
mgp);
gtk_table_attach(GTK_TABLE(table), combo, 3, 4, 0, 1,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gimp_help_set_help_data(combo,
_("Paintmode")
, NULL);
@@ -2841,27 +2841,27 @@
gtk_table_set_col_spacings (GTK_TABLE (sub_table), 2);
gtk_table_attach(GTK_TABLE(table), sub_table, 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
/* StepSpeedFactor */
adj = p_mov_spinbutton_new( GTK_TABLE (sub_table), 1, 0, /* table col, row */
- _("SpeedFactor:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->step_speed_factor, /* initial value */
- (gdouble)0.0, (gdouble)50.0, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0.0, (gdouble)50.0, /* lower, upper (unconstrained) */
- _("Source and target frames step synchronized at value 1.0. "
- "A value of 0.5 will step the source half time slower. "
- "One source step is done only at every 2nd target frame."),
- NULL); /* tooltip privatetip */
+ _("SpeedFactor:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->step_speed_factor, /* initial value */
+ (gdouble)0.0, (gdouble)50.0, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0.0, (gdouble)50.0, /* lower, upper (unconstrained) */
+ _("Source and target frames step synchronized at value 1.0. "
+ "A value of 0.5 will step the source half time slower. "
+ "One source step is done only at every 2nd target frame."),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &pvals->step_speed_factor);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &pvals->step_speed_factor);
mgp->step_speed_factor_adj = GTK_ADJUSTMENT(adj);
@@ -2887,7 +2887,7 @@
mgp);
gtk_table_attach(GTK_TABLE(sub_table), combo, 0, 1, 0, 1,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gimp_help_set_help_data(combo,
_("How to fetch the next source layer at the next handled frame")
, NULL);
@@ -2915,7 +2915,7 @@
gtk_table_attach(GTK_TABLE(table), combo, 3, 4, 1, 2,
- GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gimp_help_set_help_data(combo,
_("How to place the Source layer at controlpoint coordinates")
, NULL);
@@ -2924,7 +2924,7 @@
gtk_widget_show( table );
return table;
-} /* end mov_src_sel_create */
+} /* end mov_src_sel_create */
/* ============================================================================
@@ -2941,8 +2941,8 @@
static GtkWidget *
mov_advanced_tab_create(t_mov_gui_stuff *mgp)
{
- GtkWidget *table;
- GtkWidget *check_button;
+ GtkWidget *table;
+ GtkWidget *check_button;
GtkObject *adj;
guint row;
guint col;
@@ -2960,17 +2960,17 @@
/* the bluebox widgets */
{
- GtkWidget *check_button;
- GtkWidget *label;
+ GtkWidget *check_button;
+ GtkWidget *label;
GtkWidget *color_button;
/* toggle bluebox */
check_button = gtk_check_button_new_with_label ( _("Bluebox"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- pvals->src_apply_bluebox);
+ pvals->src_apply_bluebox);
gimp_help_set_help_data(check_button,
_("Apply the bluebox filter on the moving object(s). "
- "The bluebox filter makes the keycolor transparent.")
+ "The bluebox filter makes the keycolor transparent.")
, NULL);
gtk_widget_show (check_button);
gtk_table_attach(GTK_TABLE(table), check_button, col, col+1, row, row+1
@@ -2994,9 +2994,9 @@
/* keycolor button */
color_button = gimp_color_button_new (_("Move Path Bluebox Keycolor"),
- 25, 12, /* WIDTH, HEIGHT, */
- &pvals->bbp_pv->vals.keycolor,
- GIMP_COLOR_AREA_FLAT);
+ 25, 12, /* WIDTH, HEIGHT, */
+ &pvals->bbp_pv->vals.keycolor,
+ GIMP_COLOR_AREA_FLAT);
/* dont know if it is possible to remove the signal handler for the "clicked" signal
* on the gimp_color_button.
@@ -3010,7 +3010,7 @@
gtk_widget_show (color_button);
gimp_help_set_help_data(color_button,
_("Open dialog window to set "
- "parameters and keycolor for the bluebox filter")
+ "parameters and keycolor for the bluebox filter")
, NULL);
g_signal_connect (color_button, "clicked",
@@ -3029,7 +3029,7 @@
/* toggle Tracelayer */
check_button = gtk_check_button_new_with_label ( _("Tracelayer"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- pvals->tracelayer_enable);
+ pvals->tracelayer_enable);
gimp_help_set_help_data(check_button,
_("Create an additional trace layer in all handled frames")
, NULL);
@@ -3043,37 +3043,37 @@
/* TraceOpacityInitial */
adj = p_mov_spinbutton_new( GTK_TABLE (table), col+2, row, /* table col, row */
- _("TraceOpacity1:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->trace_opacity_initial, /* initial value */
- (gdouble)0.0, (gdouble)100, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
- _("Initial opacity of the trace layer"),
- NULL); /* tooltip privatetip */
+ _("TraceOpacity1:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->trace_opacity_initial, /* initial value */
+ (gdouble)0.0, (gdouble)100, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
+ _("Initial opacity of the trace layer"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &pvals->trace_opacity_initial);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &pvals->trace_opacity_initial);
mgp->trace_opacity_initial_adj = GTK_ADJUSTMENT(adj);
/* TraceOpacityDescending */
adj = p_mov_spinbutton_new( GTK_TABLE (table), col+4, row, /* table col, row */
- _("TraceOpacity2:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->trace_opacity_desc, /* initial value */
- (gdouble)0.0, (gdouble)100, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
- _("Descending opacity of the trace layer"),
- NULL); /* tooltip privatetip */
+ _("TraceOpacity2:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->trace_opacity_desc, /* initial value */
+ (gdouble)0.0, (gdouble)100, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
+ _("Descending opacity of the trace layer"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &pvals->trace_opacity_desc);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &pvals->trace_opacity_desc);
mgp->trace_opacity_desc_adj = GTK_ADJUSTMENT(adj);
row = 1;
@@ -3081,59 +3081,59 @@
/* TweenSteps */
adj = p_mov_spinbutton_new( GTK_TABLE (table), col, row, /* table col, row */
- _("Tweensteps:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->tween_steps, /* initial value */
- (gdouble)0, (gdouble)50, /* lower, upper */
- 1, 2, /* step, page */
- 0, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)50, /* lower, upper (unconstrained) */
- _("Calculate n steps between 2 frames. "
- "The rendered tween steps are collected in a tween layer "
- "that will be added to the handled destination frames. "
- "If the tween step value is 0, no tweens are calculated "
- "and no tween layers are created"),
- NULL); /* tooltip privatetip */
+ _("Tweensteps:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->tween_steps, /* initial value */
+ (gdouble)0, (gdouble)50, /* lower, upper */
+ 1, 2, /* step, page */
+ 0, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)50, /* lower, upper (unconstrained) */
+ _("Calculate n steps between 2 frames. "
+ "The rendered tween steps are collected in a tween layer "
+ "that will be added to the handled destination frames. "
+ "If the tween step value is 0, no tweens are calculated "
+ "and no tween layers are created"),
+ NULL); /* tooltip privatetip */
mgp->tween_steps_adj = GTK_ADJUSTMENT(adj);
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tween_steps_adjustment_update),
- &pvals->tween_steps);
+ G_CALLBACK (mov_path_tween_steps_adjustment_update),
+ &pvals->tween_steps);
/* TweenOpacityInitial */
adj = p_mov_spinbutton_new( GTK_TABLE (table), col+2, row, /* table col, row */
- _("TweenOpacity1:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->tween_opacity_initial, /* initial value */
- (gdouble)0.0, (gdouble)100, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
- _("Initial opacity of the tween layer"),
- NULL); /* tooltip privatetip */
+ _("TweenOpacity1:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->tween_opacity_initial, /* initial value */
+ (gdouble)0.0, (gdouble)100, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
+ _("Initial opacity of the tween layer"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &pvals->tween_opacity_initial);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &pvals->tween_opacity_initial);
mgp->tween_opacity_initial_adj = GTK_ADJUSTMENT(adj);
/* TweenOpacityDescending */
adj = p_mov_spinbutton_new( GTK_TABLE (table), col+4, row, /* table col, row */
- _("TweenOpacity2:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->tween_opacity_desc, /* initial value */
- (gdouble)0.0, (gdouble)100, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
- _("Descending opacity of the tween layer"),
- NULL); /* tooltip privatetip */
+ _("TweenOpacity2:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->tween_opacity_desc, /* initial value */
+ (gdouble)0.0, (gdouble)100, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0.0, (gdouble)100, /* lower, upper (unconstrained) */
+ _("Descending opacity of the tween layer"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_double_adjustment_update),
- &pvals->tween_opacity_desc);
+ G_CALLBACK (gimp_double_adjustment_update),
+ &pvals->tween_opacity_desc);
mgp->tween_opacity_desc_adj = GTK_ADJUSTMENT(adj);
/* set initial sensitivity */
@@ -3143,7 +3143,7 @@
gtk_widget_show( table );
return table;
-} /* end mov_advanced_tab_create */
+} /* end mov_advanced_tab_create */
/* ============================================================================
* Create new EditCtrlPoint Frame
@@ -3152,9 +3152,9 @@
static GtkWidget *
mov_edit_button_box_create (t_mov_gui_stuff *mgp)
{
- GtkWidget *vbox;
- GtkWidget *hbox;
- GtkWidget *frame;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *frame;
GtkWidget *button_table;
GtkWidget *button;
gint row;
@@ -3180,31 +3180,31 @@
button = gtk_button_new_from_stock ( GAP_STOCK_ADD_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Add controlpoint at end. The last controlpoint is duplicated.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_padd_callback),
- mgp);
+ G_CALLBACK (mov_padd_callback),
+ mgp);
/* Grab Path (Controlpoints from current GIMP Path) */
button = gtk_button_new_from_stock ( GAP_STOCK_GRAB_POINTS );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Delete all controlpoints, and replace them with "
- "a copy of all anchorpoints of the current path "
- "from the image from which 'MovePath' was invoked. "
- "Hold down the Shift key to create controlpoints for each handled frame, "
- "following the Bezier path.")
+ "a copy of all anchorpoints of the current path "
+ "from the image from which 'MovePath' was invoked. "
+ "Hold down the Shift key to create controlpoints for each handled frame, "
+ "following the Bezier path.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_pgrab_callback),
- mgp);
+ G_CALLBACK (mov_pgrab_callback),
+ mgp);
row++;
@@ -3212,27 +3212,27 @@
button = gtk_button_new_from_stock ( GAP_STOCK_INSERT_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Insert controlpoint. The current controlpoint is duplicated.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_pins_callback),
- mgp);
+ G_CALLBACK (mov_pins_callback),
+ mgp);
/* Delete Controlpoint */
button = gtk_button_new_from_stock ( GAP_STOCK_DELETE_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Delete current controlpoint")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_pdel_callback),
- mgp);
+ G_CALLBACK (mov_pdel_callback),
+ mgp);
row++;
@@ -3240,27 +3240,27 @@
button = gtk_button_new_from_stock ( GAP_STOCK_PREV_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Show previous controlpoint. Hold down the shift key to follow keyframes.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_pprev_callback),
- mgp);
+ G_CALLBACK (mov_pprev_callback),
+ mgp);
/* Next Controlpoint */
button = gtk_button_new_from_stock ( GAP_STOCK_NEXT_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Show next controlpoint. Hold down the shift key to follow keyframes.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_pnext_callback),
- mgp);
+ G_CALLBACK (mov_pnext_callback),
+ mgp);
row++;
@@ -3268,27 +3268,27 @@
button = gtk_button_new_from_stock ( GAP_STOCK_FIRST_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Show first controlpoint. Hold down the shift key to follow keyframes.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_pfirst_callback),
- mgp);
+ G_CALLBACK (mov_pfirst_callback),
+ mgp);
/* Last Controlpoint */
button = gtk_button_new_from_stock ( GAP_STOCK_LAST_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Show last controlpoint. Hold down the shift key to follow keyframes.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_plast_callback),
- mgp);
+ G_CALLBACK (mov_plast_callback),
+ mgp);
row++;
@@ -3296,33 +3296,33 @@
button = gtk_button_new_from_stock ( GAP_STOCK_RESET_POINT );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Reset the current controlpoint to default values")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_pclr_callback),
- mgp);
+ G_CALLBACK (mov_pclr_callback),
+ mgp);
/* Reset All Controlpoints */
button = gtk_button_new_from_stock ( GAP_STOCK_RESET_ALL_POINTS );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Reset all controlpoints to default values "
- "but dont change the path (X/Y values). "
- "Hold down the shift key to copy settings "
- "of point1 into all other points. "
- "Holding down the ctrl key spreads a mix of "
- "the settings of point1 and the last point "
- "into the other points inbetween.")
+ "but dont change the path (X/Y values). "
+ "Hold down the shift key to copy settings "
+ "of point1 into all other points. "
+ "Holding down the ctrl key spreads a mix of "
+ "the settings of point1 and the last point "
+ "into the other points inbetween.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_pclr_all_callback),
- mgp);
+ G_CALLBACK (mov_pclr_all_callback),
+ mgp);
row++;
@@ -3330,29 +3330,29 @@
button = gtk_button_new_from_stock ( GAP_STOCK_ROTATE_FOLLOW );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Set rotation for all controlpoints "
- "to follow the shape of the path. "
- "Hold down the shift key to use rotation of contolpoint 1 as offset.")
+ "to follow the shape of the path. "
+ "Hold down the shift key to use rotation of contolpoint 1 as offset.")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "button_press_event",
- G_CALLBACK (mov_prot_follow_callback),
- mgp);
+ G_CALLBACK (mov_prot_follow_callback),
+ mgp);
/* Delete All Controlpoints */
button = gtk_button_new_from_stock ( GAP_STOCK_DELETE_ALL_POINTS );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Delete all controlpoints")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_pdel_all_callback),
- mgp);
+ G_CALLBACK (mov_pdel_all_callback),
+ mgp);
row++;
@@ -3361,27 +3361,27 @@
button = gtk_button_new_from_stock (GTK_STOCK_OPEN );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 0, 1, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Load controlpoints from file")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_pload_callback),
- mgp);
+ G_CALLBACK (mov_pload_callback),
+ mgp);
/* Save Controlpoints */
button = gtk_button_new_from_stock ( GTK_STOCK_SAVE );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_table_attach( GTK_TABLE(button_table), button, 1, 2, row, row+1,
- GTK_FILL, 0, 0, 0 );
+ GTK_FILL, 0, 0, 0 );
gimp_help_set_help_data(button,
_("Save controlpoints to file")
, NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (mov_psave_callback),
- mgp);
+ G_CALLBACK (mov_psave_callback),
+ mgp);
row++;
@@ -3432,8 +3432,8 @@
*/
GtkWidget *
mov_path_framerange_box_create(t_mov_gui_stuff *mgp
- ,gboolean vertical_layout
- )
+ ,gboolean vertical_layout
+ )
{
GtkWidget *vcbox;
GtkWidget *master_table;
@@ -3477,58 +3477,58 @@
/* the start frame scale_entry */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 0, /* table col, row */
- _("From Frame:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->dst_range_start, /* value */
- (gdouble)mgp->first_nr, /* lower */
- (gdouble)mgp->last_nr, /* upper */
- 1, 10, /* step, page */
- 0, /* digits */
- TRUE, /* constrain */
- (gdouble)mgp->first_nr, /* lower, (unconstrained) */
- (gdouble)mgp->last_nr, /* upper (unconstrained) */
- _("First handled destination frame"), NULL); /* tooltip privatetip */
+ _("From Frame:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->dst_range_start, /* value */
+ (gdouble)mgp->first_nr, /* lower */
+ (gdouble)mgp->last_nr, /* upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ TRUE, /* constrain */
+ (gdouble)mgp->first_nr, /* lower, (unconstrained) */
+ (gdouble)mgp->last_nr, /* upper (unconstrained) */
+ _("First handled destination frame"), NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_int_adjustment_update),
- &pvals->dst_range_start);
+ G_CALLBACK (gimp_int_adjustment_update),
+ &pvals->dst_range_start);
/* the end frame scale_entry */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 1, /* table col, row */
- _("To Frame:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->dst_range_end, /* value */
- (gdouble)mgp->first_nr, /* lower */
- (gdouble)mgp->last_nr, /* upper */
- 1, 10, /* step, page */
- 0, /* digits */
- TRUE, /* constrain */
- (gdouble)mgp->first_nr, /* lower, (unconstrained) */
- (gdouble)mgp->last_nr, /* upper (unconstrained) */
- _("Last handled destination frame"), NULL); /* tooltip privatetip */
+ _("To Frame:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->dst_range_end, /* value */
+ (gdouble)mgp->first_nr, /* lower */
+ (gdouble)mgp->last_nr, /* upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ TRUE, /* constrain */
+ (gdouble)mgp->first_nr, /* lower, (unconstrained) */
+ (gdouble)mgp->last_nr, /* upper (unconstrained) */
+ _("Last handled destination frame"), NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_int_adjustment_update),
- &pvals->dst_range_end);
+ G_CALLBACK (gimp_int_adjustment_update),
+ &pvals->dst_range_end);
/* the Layerstack scale_entry */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 2, /* table col, row */
- _("Layerstack:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)pvals->dst_layerstack, /* value */
- 0.0, 99.0, /* lower, upper */
- 1, 10, /* step, page */
- 0, /* digits */
- FALSE, /* constrain */
- 0.0, 999999.0, /* lower, upper (unconstrained) */
- _("How to insert source layer into the "
- "layerstack of the destination frames. "
- "layerstack 0 means on top i.e. in front"),
- NULL); /* tooltip privatetip */
+ _("Layerstack:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)pvals->dst_layerstack, /* value */
+ 0.0, 99.0, /* lower, upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ FALSE, /* constrain */
+ 0.0, 999999.0, /* lower, upper (unconstrained) */
+ _("How to insert source layer into the "
+ "layerstack of the destination frames. "
+ "layerstack 0 means on top i.e. in front"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_instant_int_adjustment_update),
- &pvals->dst_layerstack);
+ G_CALLBACK (mov_instant_int_adjustment_update),
+ &pvals->dst_layerstack);
/* the vbox for checkbuttons */
vcbox = gtk_vbox_new (FALSE, 3);
@@ -3538,7 +3538,7 @@
/* toggle force visibility */
check_button = gtk_check_button_new_with_label ( _("Force Visibility"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- pvals->src_force_visible);
+ pvals->src_force_visible);
gimp_help_set_help_data(check_button,
_("Force visibility for all copied source layers")
, NULL);
@@ -3552,7 +3552,7 @@
/* toggle clip_to_image */
check_button = gtk_check_button_new_with_label ( _("Clip To Frame"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- pvals->clip_to_img);
+ pvals->clip_to_img);
gimp_help_set_help_data(check_button,
_("Clip all copied source layers at destination frame boundaries")
, NULL);
@@ -3600,38 +3600,38 @@
/* Width Scale */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 0, 0, /* table col, row */
- _("Width:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->w_resize, /* value */
- (gdouble)1, (gdouble)200, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)1, (gdouble)1000, /* lower, upper (unconstrained) */
- _("Scale source layer's width in percent"),
- NULL); /* tooltip privatetip */
+ _("Width:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->w_resize, /* value */
+ (gdouble)1, (gdouble)200, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)1, (gdouble)1000, /* lower, upper (unconstrained) */
+ _("Scale source layer's width in percent"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_resize_adjustment_update),
- &mgp->w_resize);
+ G_CALLBACK (mov_path_resize_adjustment_update),
+ &mgp->w_resize);
mgp->wres_adj = GTK_ADJUSTMENT(adj);
/* Height Scale */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 0, 1, /* table col, row */
- _("Height:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->h_resize, /* value */
- (gdouble)1, (gdouble)200, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)1, (gdouble)1000, /* lower, upper (unconstrained) */
- _("Scale source layer's height in percent"),
- NULL); /* tooltip privatetip */
+ _("Height:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->h_resize, /* value */
+ (gdouble)1, (gdouble)200, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)1, (gdouble)1000, /* lower, upper (unconstrained) */
+ _("Scale source layer's height in percent"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_resize_adjustment_update),
- &mgp->h_resize);
+ G_CALLBACK (mov_path_resize_adjustment_update),
+ &mgp->h_resize);
mgp->hres_adj = GTK_ADJUSTMENT(adj);
@@ -3652,38 +3652,38 @@
/* Opacity */
adj = gimp_scale_entry_new( GTK_TABLE (table), 3, 0, /* table col, row */
- _("Opacity:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->opacity, /* value */
- (gdouble)0, (gdouble)100, /* lower, upper */
- 1, 10, /* step, page */
- 1, /* digits */
- TRUE, /* constrain */
- (gdouble)0, (gdouble)100, /* lower, upper (unconstrained) */
- _("Set the source layer's opacity in percent"),
- NULL); /* tooltip privatetip */
+ _("Opacity:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->opacity, /* value */
+ (gdouble)0, (gdouble)100, /* lower, upper */
+ 1, 10, /* step, page */
+ 1, /* digits */
+ TRUE, /* constrain */
+ (gdouble)0, (gdouble)100, /* lower, upper (unconstrained) */
+ _("Set the source layer's opacity in percent"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_instant_double_adjustment_update),
- &mgp->opacity);
+ G_CALLBACK (mov_instant_double_adjustment_update),
+ &mgp->opacity);
mgp->opacity_adj = GTK_ADJUSTMENT(adj);
/* Rotation */
adj = gimp_scale_entry_new( GTK_TABLE (table), 3, 1, /* table col, row */
- _("Rotate:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->rotation, /* value */
- (gdouble)-360, (gdouble)360, /* lower, upper */
- 1, 45, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)-3600, (gdouble)3600, /* lower, upper (unconstrained) */
- _("Rotate source layer (in degrees)"),
- NULL); /* tooltip privatetip */
+ _("Rotate:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->rotation, /* value */
+ (gdouble)-360, (gdouble)360, /* lower, upper */
+ 1, 45, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)-3600, (gdouble)3600, /* lower, upper (unconstrained) */
+ _("Rotate source layer (in degrees)"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_instant_double_adjustment_update),
- &mgp->rotation);
+ G_CALLBACK (mov_instant_double_adjustment_update),
+ &mgp->rotation);
mgp->rotation_adj = GTK_ADJUSTMENT(adj);
@@ -3705,8 +3705,8 @@
static GtkWidget *
mov_trans_tab_create (t_mov_gui_stuff *mgp)
{
- GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *vbox;
+ GtkWidget *table;
GtkObject *adj;
@@ -3724,148 +3724,148 @@
/* ttlx transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 0, 0, /* table col, row */
- _("x1:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->ttlx, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for upper left corner X coordinate"),
- NULL); /* tooltip privatetip */
+ _("x1:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->ttlx, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for upper left corner X coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->ttlx);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->ttlx);
mgp->ttlx_adj = GTK_ADJUSTMENT(adj);
/* ttly transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 2, 0, /* table col, row */
- _("y1:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->ttly, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for upper left corner Y coordinate"),
- NULL); /* tooltip privatetip */
+ _("y1:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->ttly, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for upper left corner Y coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->ttly);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->ttly);
mgp->ttly_adj = GTK_ADJUSTMENT(adj);
/* ttrx transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 4, 0, /* table col, row */
- _("x2:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->ttrx, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for upper right corner X coordinate"),
- NULL); /* tooltip privatetip */
+ _("x2:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->ttrx, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for upper right corner X coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->ttrx);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->ttrx);
mgp->ttrx_adj = GTK_ADJUSTMENT(adj);
/* ttry transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 6, 0, /* table col, row */
- _("y2:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->ttry, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for upper right corner Y coordinate"),
- NULL); /* tooltip privatetip */
+ _("y2:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->ttry, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for upper right corner Y coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->ttry);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->ttry);
mgp->ttry_adj = GTK_ADJUSTMENT(adj);
/* tblx transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 0, 1, /* table col, row */
- _("x3:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->tblx, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for lower left corner X coordinate"),
- NULL); /* tooltip privatetip */
+ _("x3:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->tblx, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for lower left corner X coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->tblx);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->tblx);
mgp->tblx_adj = GTK_ADJUSTMENT(adj);
/* tbly transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 2, 1, /* table col, row */
- _("y3:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->tbly, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for lower left corner Y coordinate"),
- NULL); /* tooltip privatetip */
+ _("y3:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->tbly, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for lower left corner Y coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->tbly);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->tbly);
mgp->tbly_adj = GTK_ADJUSTMENT(adj);
/* tbrx transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 4, 1, /* table col, row */
- _("x4:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->tbrx, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for lower right corner X coordinate"),
- NULL); /* tooltip privatetip */
+ _("x4:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->tbrx, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for lower right corner X coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->tbrx);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->tbrx);
mgp->tbrx_adj = GTK_ADJUSTMENT(adj);
/* tbry transformfactor */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 6, 1, /* table col, row */
- _("y4:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->tbry, /* initial value */
- (gdouble)0, (gdouble)10, /* lower, upper */
- 0.1, 1, /* step, page */
- 3, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
- _("Transformfactor for lower right corner Y coordinate"),
- NULL); /* tooltip privatetip */
+ _("y4:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->tbry, /* initial value */
+ (gdouble)0, (gdouble)10, /* lower, upper */
+ 0.1, 1, /* step, page */
+ 3, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)10, /* lower, upper (unconstrained) */
+ _("Transformfactor for lower right corner Y coordinate"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_tfactor_adjustment_update),
- &mgp->tbry);
+ G_CALLBACK (mov_path_tfactor_adjustment_update),
+ &mgp->tbry);
mgp->tbry_adj = GTK_ADJUSTMENT(adj);
gtk_widget_show(table);
@@ -3882,9 +3882,9 @@
static GtkWidget *
mov_selection_handling_tab_create (t_mov_gui_stuff *mgp)
{
- GtkWidget *combo;
- GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *combo;
+ GtkWidget *vbox;
+ GtkWidget *table;
GtkObject *adj;
/* the vbox */
@@ -3908,7 +3908,7 @@
G_CALLBACK (mov_selmode_menu_callback),
mgp);
gtk_table_attach(GTK_TABLE(table), combo, 0, 3, 0, 1,
- 0, 0, 0, 0);
+ 0, 0, 0, 0);
gimp_help_set_help_data(combo,
_("How to handle selections in the source image")
, NULL);
@@ -3916,20 +3916,20 @@
/* ttlx transformfactor */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 1, /* table col, row */
- _("Selection Feather Radius:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->sel_feather_radius, /* initial value */
- (gdouble)0, (gdouble)100, /* lower, upper */
- 1.0, 10.0, /* step, page */
- 1, /* digits */
- FALSE, /* constrain */
- (gdouble)0, (gdouble)1000, /* lower, upper (unconstrained) */
- _("Feather radius in pixels (for smoothing selection(s))"),
- NULL); /* tooltip privatetip */
+ _("Selection Feather Radius:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->sel_feather_radius, /* initial value */
+ (gdouble)0, (gdouble)100, /* lower, upper */
+ 1.0, 10.0, /* step, page */
+ 1, /* digits */
+ FALSE, /* constrain */
+ (gdouble)0, (gdouble)1000, /* lower, upper (unconstrained) */
+ _("Feather radius in pixels (for smoothing selection(s))"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_feather_adjustment_update),
- &mgp->sel_feather_radius);
+ G_CALLBACK (mov_path_feather_adjustment_update),
+ &mgp->sel_feather_radius);
mgp->sel_feather_radius_adj = GTK_ADJUSTMENT(adj);
/* for initial sensitivity */
@@ -3960,27 +3960,27 @@
static void
mov_path_prevw_create ( GimpDrawable *drawable, t_mov_gui_stuff *mgp, gboolean vertical_layout)
{
- GtkWidget *cpt_frame;
- GtkWidget *pv_frame;
+ GtkWidget *cpt_frame;
+ GtkWidget *pv_frame;
GtkWidget *wrap_box;
- GtkWidget *vbox;
- GtkWidget *hbox;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
GtkWidget *notebook;
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *aspect_frame;
- GtkWidget *da_widget;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *aspect_frame;
+ GtkWidget *da_widget;
GtkWidget *pv_table;
GtkWidget *pv_sub_table;
GtkWidget *check_button;
GtkObject *adj;
- GtkWidget *framerange_table;
+ GtkWidget *framerange_table;
GtkWidget *edit_buttons;
mgp->drawable = drawable;
mgp->dwidth = gimp_drawable_width(drawable->drawable_id );
mgp->dheight = gimp_drawable_height(drawable->drawable_id );
- mgp->bpp = gimp_drawable_bpp(drawable->drawable_id);
+ mgp->bpp = gimp_drawable_bpp(drawable->drawable_id);
if ( gimp_drawable_has_alpha(drawable->drawable_id) )
mgp->bpp--;
mgp->curx = 0;
@@ -4018,55 +4018,55 @@
/* X */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 0, /* table col, row */
- _("X:"), /* label text */
- SCALE_WIDTH, SPINBUTTON_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->p_x, /* value */
- (gdouble)0, (gdouble)mgp->dwidth, /* lower, upper */
- 1, 10, /* step, page */
- 0, /* digits */
- FALSE, /* constrain */
- (gdouble)(-GIMP_MAX_IMAGE_SIZE),
- (gdouble)GIMP_MAX_IMAGE_SIZE, /* lower, upper (unconstrained) */
- _("X coordinate"),
- NULL); /* tooltip privatetip */
+ _("X:"), /* label text */
+ SCALE_WIDTH, SPINBUTTON_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->p_x, /* value */
+ (gdouble)0, (gdouble)mgp->dwidth, /* lower, upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ FALSE, /* constrain */
+ (gdouble)(-GIMP_MAX_IMAGE_SIZE),
+ (gdouble)GIMP_MAX_IMAGE_SIZE, /* lower, upper (unconstrained) */
+ _("X coordinate"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_x_adjustment_update),
- mgp);
+ G_CALLBACK (mov_path_x_adjustment_update),
+ mgp);
mgp->x_adj = GTK_ADJUSTMENT(adj);
/* Y */
adj = gimp_scale_entry_new( GTK_TABLE (table), 0, 1, /* table col, row */
- _("Y:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->p_y, /* value */
- (gdouble)0, (gdouble)mgp->dheight, /* lower, upper */
- 1, 10, /* step, page */
- 0, /* digits */
- FALSE, /* constrain */
- (gdouble)(-GIMP_MAX_IMAGE_SIZE),
- (gdouble)GIMP_MAX_IMAGE_SIZE, /* lower, upper (unconstrained) */
- _("Y coordinate"),
- NULL); /* tooltip privatetip */
+ _("Y:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->p_y, /* value */
+ (gdouble)0, (gdouble)mgp->dheight, /* lower, upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ FALSE, /* constrain */
+ (gdouble)(-GIMP_MAX_IMAGE_SIZE),
+ (gdouble)GIMP_MAX_IMAGE_SIZE, /* lower, upper (unconstrained) */
+ _("Y coordinate"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_path_y_adjustment_update),
- mgp);
+ G_CALLBACK (mov_path_y_adjustment_update),
+ mgp);
mgp->y_adj = GTK_ADJUSTMENT(adj);
/* Keyframe */
adj = p_mov_spinbutton_new( GTK_TABLE (table), 1, 2, /* table col, row */
- _("Keyframe:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->keyframe_abs, /* value */
- (gdouble)0, (gdouble)mgp->max_frame, /* lower, upper */
- 1, 10, /* step, page */
- 0, /* digits */
- TRUE, /* constrain */
- (gdouble)0, (gdouble)mgp->max_frame, /* lower, upper (unconstrained) */
- _("Fix controlpoint to keyframe number where 0 == no keyframe"),
- NULL); /* tooltip privatetip */
+ _("Keyframe:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->keyframe_abs, /* value */
+ (gdouble)0, (gdouble)mgp->max_frame, /* lower, upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ TRUE, /* constrain */
+ (gdouble)0, (gdouble)mgp->max_frame, /* lower, upper (unconstrained) */
+ _("Fix controlpoint to keyframe number where 0 == no keyframe"),
+ NULL); /* tooltip privatetip */
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (gimp_int_adjustment_update),
- &mgp->keyframe_abs);
+ G_CALLBACK (gimp_int_adjustment_update),
+ &mgp->keyframe_abs);
mgp->keyframe_adj = GTK_ADJUSTMENT(adj);
@@ -4091,25 +4091,25 @@
label = gtk_label_new(_("Scale and Modify"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0)
- , label
- );
+ , label
+ );
gtk_container_add (GTK_CONTAINER (notebook), transform_table);
label = gtk_label_new(_("Perspective"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1)
- , label
- );
+ , label
+ );
gtk_container_add (GTK_CONTAINER (notebook), selhandling_table);
label = gtk_label_new(_("Selection Handling"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2)
- , label
- );
+ , label
+ );
}
gtk_table_attach(GTK_TABLE(table), notebook, 3, 4 /* column */
, 0, 3 /* all rows */
- , 0, 0, 0, 0);
+ , 0, 0, 0, 0);
gtk_widget_show (notebook);
gtk_widget_show( table );
@@ -4181,7 +4181,7 @@
gtk_table_attach (GTK_TABLE (table11), aspect_frame, ix, ix+1, iy, iy+1,
(GtkAttachOptions) (GTK_FILL | GTK_SHRINK | GTK_EXPAND),
(GtkAttachOptions) (GTK_FILL | GTK_SHRINK | GTK_EXPAND),
- 0, 0);
+ 0, 0);
}
else
{
@@ -4191,7 +4191,7 @@
gtk_table_attach (GTK_TABLE (table11), dummy, ix, ix+1, iy, iy+1,
(GtkAttachOptions) (GTK_FILL | GTK_SHRINK | GTK_EXPAND),
(GtkAttachOptions) (GTK_FILL | GTK_SHRINK | GTK_EXPAND),
- 0, 0);
+ 0, 0);
}
}
}
@@ -4221,14 +4221,14 @@
gimp_rgb_set(&mgp->pathcolor, 1.0, 0.1, 0.1); /* startup with RED pathline color */
gimp_rgb_set_alpha(&mgp->pathcolor, 1.0);
color_button = gimp_color_button_new (_("Pathline Color Picker"),
- 25, 12, /* WIDTH, HEIGHT, */
- &mgp->pathcolor,
- GIMP_COLOR_AREA_FLAT);
+ 25, 12, /* WIDTH, HEIGHT, */
+ &mgp->pathcolor,
+ GIMP_COLOR_AREA_FLAT);
gtk_box_pack_start (GTK_BOX (hbox_show), color_button, TRUE, TRUE, 4);
gtk_widget_show (color_button);
gimp_help_set_help_data(color_button,
_("Select the color that is used to "
- "draw pathlines in the preview")
+ "draw pathlines in the preview")
, NULL);
g_signal_connect (color_button, "color_changed",
@@ -4241,7 +4241,7 @@
/* toggle Show path */
check_button = gtk_check_button_new_with_label ( _("Path"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- mgp->show_path);
+ mgp->show_path);
gimp_help_set_help_data(check_button,
_("Show path lines and enable "
"pick/drag with left button "
@@ -4259,7 +4259,7 @@
/* toggle Show cursor */
check_button = gtk_check_button_new_with_label ( _("Cursor"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- mgp->show_cursor);
+ mgp->show_cursor);
gimp_help_set_help_data(check_button,
_("Show cursor crosslines")
, NULL);
@@ -4274,7 +4274,7 @@
/* toggle Show Grid */
check_button = gtk_check_button_new_with_label ( _("Grid"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- mgp->show_grid);
+ mgp->show_grid);
gimp_help_set_help_data(check_button,
_("Show source layer as gridlines")
, NULL);
@@ -4288,7 +4288,7 @@
/* toggle Instant Apply */
check_button = gtk_check_button_new_with_label ( _("Instant Apply"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- mgp->instant_apply);
+ mgp->instant_apply);
gimp_help_set_help_data(check_button,
_("Update the preview automatically")
, NULL);
@@ -4309,27 +4309,27 @@
/* the Preview Frame Number */
adj = gimp_scale_entry_new( GTK_TABLE (pv_sub_table), 0, 1, /* table col, row */
- _("Frame:"), /* label text */
- SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
- (gdouble)mgp->preview_frame_nr, /* value */
- (gdouble)mgp->first_nr, /* lower */
- (gdouble)mgp->last_nr, /* upper */
- 1, 10, /* step, page */
- 0, /* digits */
- TRUE, /* constrain */
- (gdouble)mgp->first_nr, /* lower (unconstrained)*/
- (gdouble)mgp->last_nr, /* upper (unconstrained)*/
- _("Frame to show when 'Refresh' button is pressed"),
- NULL); /* tooltip privatetip */
+ _("Frame:"), /* label text */
+ SCALE_WIDTH, ENTRY_WIDTH, /* scalesize spinsize */
+ (gdouble)mgp->preview_frame_nr, /* value */
+ (gdouble)mgp->first_nr, /* lower */
+ (gdouble)mgp->last_nr, /* upper */
+ 1, 10, /* step, page */
+ 0, /* digits */
+ TRUE, /* constrain */
+ (gdouble)mgp->first_nr, /* lower (unconstrained)*/
+ (gdouble)mgp->last_nr, /* upper (unconstrained)*/
+ _("Frame to show when 'Refresh' button is pressed"),
+ NULL); /* tooltip privatetip */
g_object_set_data(G_OBJECT(adj), "mgp", mgp);
g_signal_connect (G_OBJECT (adj), "value_changed",
- G_CALLBACK (mov_instant_int_adjustment_update),
- &mgp->preview_frame_nr);
+ G_CALLBACK (mov_instant_int_adjustment_update),
+ &mgp->preview_frame_nr);
mgp->preview_frame_nr_adj = GTK_ADJUSTMENT(adj);
gtk_table_attach( GTK_TABLE(pv_table), pv_sub_table, 0, 1, 2, 3,
- GTK_FILL|GTK_EXPAND, 0, 0, 0 );
+ GTK_FILL|GTK_EXPAND, 0, 0, 0 );
gtk_widget_show (pv_sub_table);
@@ -4344,11 +4344,11 @@
g_object_set_data( G_OBJECT(da_widget), "mgp", mgp);
gtk_widget_set_events( GTK_WIDGET(da_widget), PREVIEW_MASK );
g_signal_connect_after( G_OBJECT(da_widget), "expose_event",
- G_CALLBACK (mov_path_prevw_preview_expose),
- mgp );
+ G_CALLBACK (mov_path_prevw_preview_expose),
+ mgp );
g_signal_connect( G_OBJECT(da_widget), "event",
- G_CALLBACK (mov_path_prevw_preview_events),
- mgp );
+ G_CALLBACK (mov_path_prevw_preview_events),
+ mgp );
gtk_container_add( GTK_CONTAINER( aspect_frame ), da_widget);
gtk_widget_show(da_widget);
gtk_widget_show(aspect_frame);
@@ -4413,13 +4413,13 @@
{
if(gap_debug) printf ("mov_path_prevw_preview_init:"
" before gap_pview_render_from_image drawable_id:%d\n"
- , (int)mgp->drawable->drawable_id);
+ , (int)mgp->drawable->drawable_id);
image_id = gimp_drawable_get_image(mgp->drawable->drawable_id);
if(gap_debug) printf ("mov_path_prevw_preview_init:"
" after gap_pview_render_from_image drawable_id:%d image_id:%d\n"
- , (int)mgp->drawable->drawable_id
- , (int)image_id
- );
+ , (int)mgp->drawable->drawable_id
+ , (int)image_id
+ );
gap_pview_render_from_image(mgp->pv_ptr, image_id);
}
}
@@ -4489,24 +4489,24 @@
for(l_idx = 0; l_idx < pvals->point_idx_max; l_idx++)
{
/* draw the path line(s) */
- gdk_draw_line (mgp->pv_ptr->da_widget->window,
- mgp->pv_ptr->da_widget->style->black_gc,
- (pvals->point[l_idx].p_x * mgp->pwidth) / mgp->dwidth,
- (pvals->point[l_idx].p_y * mgp->pheight) / mgp->dheight,
- (pvals->point[l_idx +1].p_x * mgp->pwidth) / mgp->dwidth,
- (pvals->point[l_idx +1].p_y * mgp->pheight) / mgp->dheight
- );
+ gdk_draw_line (mgp->pv_ptr->da_widget->window,
+ mgp->pv_ptr->da_widget->style->black_gc,
+ (pvals->point[l_idx].p_x * mgp->pwidth) / mgp->dwidth,
+ (pvals->point[l_idx].p_y * mgp->pheight) / mgp->dheight,
+ (pvals->point[l_idx +1].p_x * mgp->pwidth) / mgp->dwidth,
+ (pvals->point[l_idx +1].p_y * mgp->pheight) / mgp->dheight
+ );
/* draw the path point(s) */
- gdk_draw_arc (mgp->pv_ptr->da_widget->window, mgp->pv_ptr->da_widget->style->black_gc, TRUE,
- (pvals->point[l_idx +1].p_x * mgp->pwidth / mgp->dwidth) -RADIUS,
- (pvals->point[l_idx +1].p_y * mgp->pheight / mgp->dheight) -RADIUS,
- RADIUS * 2, RADIUS * 2, 0, 23040);
+ gdk_draw_arc (mgp->pv_ptr->da_widget->window, mgp->pv_ptr->da_widget->style->black_gc, TRUE,
+ (pvals->point[l_idx +1].p_x * mgp->pwidth / mgp->dwidth) -RADIUS,
+ (pvals->point[l_idx +1].p_y * mgp->pheight / mgp->dheight) -RADIUS,
+ RADIUS * 2, RADIUS * 2, 0, 23040);
}
/* draw the start point */
- gdk_draw_arc (mgp->pv_ptr->da_widget->window, mgp->pv_ptr->da_widget->style->black_gc, TRUE,
- (pvals->point[0].p_x * mgp->pwidth / mgp->dwidth) -RADIUS,
- (pvals->point[0].p_y * mgp->pheight / mgp->dheight) -RADIUS,
- RADIUS * 2, RADIUS * 2, 0, 23040);
+ gdk_draw_arc (mgp->pv_ptr->da_widget->window, mgp->pv_ptr->da_widget->style->black_gc, TRUE,
+ (pvals->point[0].p_x * mgp->pwidth / mgp->dwidth) -RADIUS,
+ (pvals->point[0].p_y * mgp->pheight / mgp->dheight) -RADIUS,
+ RADIUS * 2, RADIUS * 2, 0, 23040);
/* restore black gc */
fg.red = 0;
@@ -4534,11 +4534,11 @@
gdk_gc_set_function ( mgp->pv_ptr->da_widget->style->black_gc, GDK_INVERT);
gdk_draw_line ( mgp->pv_ptr->da_widget->window,
- mgp->pv_ptr->da_widget->style->black_gc,
- mgp->curx, 1, mgp->curx, mgp->pheight-1 );
+ mgp->pv_ptr->da_widget->style->black_gc,
+ mgp->curx, 1, mgp->curx, mgp->pheight-1 );
gdk_draw_line ( mgp->pv_ptr->da_widget->window,
- mgp->pv_ptr->da_widget->style->black_gc,
- 1, mgp->cury, mgp->pwidth-1, mgp->cury );
+ mgp->pv_ptr->da_widget->style->black_gc,
+ 1, mgp->cury, mgp->pwidth-1, mgp->cury );
/* current position of cursor is updated */
gdk_gc_set_function ( mgp->pv_ptr->da_widget->style->black_gc, GDK_COPY);
}
@@ -4572,7 +4572,7 @@
static void
mov_path_colorbutton_update( GimpColorButton *widget,
- t_mov_gui_stuff *mgp )
+ t_mov_gui_stuff *mgp )
{
if(mgp)
{
@@ -4584,7 +4584,7 @@
static void
mov_path_keycolorbutton_clicked( GimpColorButton *widget,
- t_mov_gui_stuff *mgp )
+ t_mov_gui_stuff *mgp )
{
if(widget->dialog)
{
@@ -4626,27 +4626,27 @@
if(mgp->shell == NULL)
{
/* the MovePath Main Window was closed
- * quit gtk main loop and return immediate
- * without touching any data structures and widgets
- * (could be freed or invalid at this point)
- * the only task that is left to do is to destroy
- * the bluebox dialog shell if it is still there
+ * quit gtk main loop and return immediate
+ * without touching any data structures and widgets
+ * (could be freed or invalid at this point)
+ * the only task that is left to do is to destroy
+ * the bluebox dialog shell if it is still there
*/
if(pvals->bbp_pv->shell)
{
- gtk_widget_destroy(pvals->bbp_pv->shell);
+ gtk_widget_destroy(pvals->bbp_pv->shell);
}
- gtk_main_quit();
+ gtk_main_quit();
return;
}
if(pvals->bbp == NULL)
{
pvals->bbp = gap_bluebox_bbp_new(-1);
- if(pvals->bbp == NULL)
- {
- return;
- }
+ if(pvals->bbp == NULL)
+ {
+ return;
+ }
}
/* if Blubox dialog was left with OK button get values for rendering */
@@ -4665,7 +4665,7 @@
static void
mov_path_keycolorbutton_changed( GimpColorButton *widget,
- t_mov_gui_stuff *mgp )
+ t_mov_gui_stuff *mgp )
{
if(mgp)
{
@@ -4676,7 +4676,7 @@
pvals->bbp = gap_bluebox_bbp_new(-1);
if(pvals->bbp == NULL)
{
- return;
+ return;
}
}
@@ -4691,7 +4691,7 @@
static void
mov_path_x_adjustment_update( GtkWidget *widget,
- gpointer data )
+ gpointer data )
{
t_mov_gui_stuff *mgp;
gint old_val;
@@ -4705,8 +4705,8 @@
{
if( !mgp->in_call )
{
- mov_path_prevw_cursor_update( mgp );
- mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
+ mov_path_prevw_cursor_update( mgp );
+ mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
mov_set_instant_apply_request(mgp);
}
}
@@ -4714,7 +4714,7 @@
static void
mov_path_y_adjustment_update( GtkWidget *widget,
- gpointer data )
+ gpointer data )
{
t_mov_gui_stuff *mgp;
gint old_val;
@@ -4728,8 +4728,8 @@
{
if( !mgp->in_call )
{
- mov_path_prevw_cursor_update( mgp );
- mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
+ mov_path_prevw_cursor_update( mgp );
+ mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
mov_set_instant_apply_request(mgp);
}
}
@@ -4737,7 +4737,7 @@
static void
mov_path_tfactor_adjustment_update( GtkWidget *widget,
- gdouble *val )
+ gdouble *val )
{
gdouble old_val;
t_mov_gui_stuff *mgp;
@@ -4752,16 +4752,16 @@
mov_set_instant_apply_request(mgp);
if( !mgp->in_call )
{
- mov_path_prevw_cursor_update( mgp );
- mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
- //XXX check if we need an additional GRID flag for the preview
+ mov_path_prevw_cursor_update( mgp );
+ mov_path_prevw_draw ( mgp, CURSOR | PATH_LINE );
+ //XXX check if we need an additional GRID flag for the preview
}
}
} /* end mov_path_tfactor_adjustment_update */
static void
mov_path_feather_adjustment_update( GtkWidget *widget,
- gdouble *val )
+ gdouble *val )
{
gdouble old_val;
t_mov_gui_stuff *mgp;
@@ -4870,9 +4870,9 @@
mgp->curx = mgp->p_x * mgp->pwidth / mgp->dwidth;
mgp->cury = mgp->p_y * mgp->pheight / mgp->dheight;
- if( mgp->curx < 0 ) mgp->curx = 0;
+ if( mgp->curx < 0 ) mgp->curx = 0;
else if( mgp->curx >= mgp->pwidth ) mgp->curx = mgp->pwidth-1;
- if( mgp->cury < 0 ) mgp->cury = 0;
+ if( mgp->cury < 0 ) mgp->cury = 0;
else if( mgp->cury >= mgp->pheight) mgp->cury = mgp->pheight-1;
}
@@ -4882,7 +4882,7 @@
*/
static gint
mov_path_prevw_preview_expose( GtkWidget *widget,
- GdkEvent *event )
+ GdkEvent *event )
{
t_mov_gui_stuff *mgp;
@@ -4912,7 +4912,7 @@
static gint
mov_path_prevw_preview_events ( GtkWidget *widget,
- GdkEvent *event )
+ GdkEvent *event )
{
t_mov_gui_stuff *mgp;
GdkEventButton *bevent;
@@ -4990,9 +4990,9 @@
mov_path_prevw_draw( mgp, upd_flag);
mgp->in_call = TRUE;
gtk_adjustment_set_value (mgp->x_adj,
- (gfloat)mgp->p_x);
+ (gfloat)mgp->p_x);
gtk_adjustment_set_value (mgp->y_adj,
- (gfloat)mgp->p_y);
+ (gfloat)mgp->p_y);
mgp->in_call = FALSE;
break;
@@ -5026,8 +5026,8 @@
{
g_message(_("Can't operate with current controlpoint\n"
"or keyframe settings.\n\n"
- "Error List:\n"
- "%s")
+ "Error List:\n"
+ "%s")
,l_err_lbltext );
g_free(l_err_lbltext);
return(FALSE);
@@ -5035,7 +5035,7 @@
}
g_free(l_err_lbltext);
return(TRUE);
-} /* end p_chk_keyframes */
+} /* end p_chk_keyframes */
/* ============================================================================
* p_get_flattened_drawable
@@ -5050,7 +5050,7 @@
l_drawable_ptr = gimp_drawable_get (gap_image_merge_visible_layers(image_id, GIMP_CLIP_TO_IMAGE));
return l_drawable_ptr;
-} /* end p_get_flattened_drawable */
+} /* end p_get_flattened_drawable */
@@ -5152,7 +5152,7 @@
/* flatten image, and get the (only) resulting drawable */
return(p_get_flattened_drawable(pvals->tmp_image_id));
-} /* end p_get_prevw_drawable */
+} /* end p_get_prevw_drawable */
/* ---------------------------------
@@ -5230,23 +5230,23 @@
{
GtkObject *adj;
GtkWidget *spinbutton;
- GtkWidget *label;
+ GtkWidget *label;
label = gtk_label_new (label_text);
gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE(table), label, col, col+1, row, row+1,
- GTK_FILL, 0, 4, 0 );
+ GTK_FILL, 0, 4, 0 );
gtk_widget_show(label);
spinbutton = gimp_spin_button_new (&adj /* return value */
- , initial_val
- , umin
- , umax
- , sstep
- , pagestep
- , 0.0 /* page_size */
- , 1.0 /* climb_rate */
- , digits
+ , initial_val
+ , umin
+ , umax
+ , sstep
+ , pagestep
+ , 0.0 /* page_size */
+ , 1.0 /* climb_rate */
+ , digits
);
gtk_widget_set_size_request(spinbutton, spinbutton_width, -1);
gtk_widget_show (spinbutton);
@@ -5329,8 +5329,8 @@
static void
mov_pview_size_allocate_callback(GtkWidget *widget
, GtkAllocation *allocation
- , t_mov_gui_stuff *mgp
- )
+ , t_mov_gui_stuff *mgp
+ )
{
gint actual_check_size;
gint pwidth;
@@ -5401,13 +5401,13 @@
{
printf("allocation w:%d h:%d pwidth:%d pheight:%d preview: w:%d h:%d psize MAX:%d\n"
, (int)allocation->width
- , (int)allocation->height
+ , (int)allocation->height
, (int)pwidth
- , (int)pheight
+ , (int)pheight
, (int)mgp->pwidth
- , (int)mgp->pheight
- , (int)psize
- );
+ , (int)mgp->pheight
+ , (int)psize
+ );
}
if(((pheight / 6) == (mgp->pheight / 6))
Modified: trunk/gap/gap_mov_dialog.h
==============================================================================
--- trunk/gap/gap_mov_dialog.h (original)
+++ trunk/gap/gap_mov_dialog.h Sun Apr 5 06:47:07 2009
@@ -85,57 +85,57 @@
} GapMovSelMode;
typedef struct {
- long dst_frame_nr; /* current destination frame_nr */
- long src_layer_idx; /* index of current layer (used for multilayer stepmodes) */
- long src_frame_idx; /* current frame number (used for source frame stepmodes) */
- gdouble src_layer_idx_dbl;
- gdouble src_frame_idx_dbl;
- gint32 *src_layers; /* array of source images layer id's (used for multilayer stepmodes) */
- long src_last_layer; /* index of last layer 0 upto n-1 (used for multilayer stepmodes) */
- gdouble currX, currY;
+ long dst_frame_nr; /* current destination frame_nr */
+ long src_layer_idx; /* index of current layer (used for multilayer stepmodes) */
+ long src_frame_idx; /* current frame number (used for source frame stepmodes) */
+ gdouble src_layer_idx_dbl;
+ gdouble src_frame_idx_dbl;
+ gint32 *src_layers; /* array of source images layer id's (used for multilayer stepmodes) */
+ long src_last_layer; /* index of last layer 0 upto n-1 (used for multilayer stepmodes) */
+ gdouble currX, currY;
gint l_handleX;
gint l_handleY;
- gdouble currOpacity;
- gdouble currWidth;
- gdouble currHeight;
- gdouble currRotation;
-
- gdouble currTTLX; /* transform x top left */
- gdouble currTTLY; /* transform y top left */
- gdouble currTTRX; /* transform x top right */
- gdouble currTTRY; /* transform y top right */
- gdouble currTBLX; /* transform x bot left */
- gdouble currTBLY; /* transform y bot left */
- gdouble currTBRX; /* transform x bot right */
- gdouble currTBRY; /* transform y bot right */
-
- gdouble currSelFeatherRadius;
+ gdouble currOpacity;
+ gdouble currWidth;
+ gdouble currHeight;
+ gdouble currRotation;
+
+ gdouble currTTLX; /* transform x top left */
+ gdouble currTTLY; /* transform y top left */
+ gdouble currTTRX; /* transform x top right */
+ gdouble currTTRY; /* transform y top right */
+ gdouble currTBLX; /* transform x bot left */
+ gdouble currTBLY; /* transform y bot left */
+ gdouble currTBRX; /* transform x bot right */
+ gdouble currTBRY; /* transform y bot right */
+
+ gdouble currSelFeatherRadius;
} GapMovCurrent;
typedef struct {
- gint p_x, p_y; /* +- path koordinates */
- gdouble opacity; /* 0.0 upto 100.0% */
- gdouble w_resize; /* width resize 10 upto 300% */
- gdouble h_resize; /* height resize 10 upto 300% */
- gdouble rotation; /* rotatation +- degrees */
-
- gint keyframe_abs;
- gint keyframe;
-
- /* 4-point transform distortion (perspective) */
- gdouble ttlx; /* 0.0 upto 10.0 transform x top left */
- gdouble ttly; /* 0.0 upto 10.0 transform y top left */
- gdouble ttrx; /* 0.0 upto 10.0 transform x top right */
- gdouble ttry; /* 0.0 upto 10.0 transform y top right */
- gdouble tblx; /* 0.0 upto 10.0 transform x bot left */
- gdouble tbly; /* 0.0 upto 10.0 transform y bot left */
- gdouble tbrx; /* 0.0 upto 10.0 transform x bot right */
- gdouble tbry; /* 0.0 upto 10.0 transform y bot right */
+ gint p_x, p_y; /* +- path koordinates */
+ gdouble opacity; /* 0.0 upto 100.0% */
+ gdouble w_resize; /* width resize 10 upto 300% */
+ gdouble h_resize; /* height resize 10 upto 300% */
+ gdouble rotation; /* rotatation +- degrees */
+
+ gint keyframe_abs;
+ gint keyframe;
+
+ /* 4-point transform distortion (perspective) */
+ gdouble ttlx; /* 0.0 upto 10.0 transform x top left */
+ gdouble ttly; /* 0.0 upto 10.0 transform y top left */
+ gdouble ttrx; /* 0.0 upto 10.0 transform x top right */
+ gdouble ttry; /* 0.0 upto 10.0 transform y top right */
+ gdouble tblx; /* 0.0 upto 10.0 transform x bot left */
+ gdouble tbly; /* 0.0 upto 10.0 transform y bot left */
+ gdouble tbrx; /* 0.0 upto 10.0 transform x bot right */
+ gdouble tbry; /* 0.0 upto 10.0 transform y bot right */
- /* 4-point transform distortion (perspective) */
- gdouble sel_feather_radius;
+ /* 4-point transform distortion (perspective) */
+ gdouble sel_feather_radius;
} GapMovPoint;
#define GAP_MOV_MAX_POINT 1024
@@ -147,9 +147,9 @@
*/
typedef struct {
- gint32 src_image_id; /* source image */
- gint32 src_layer_id; /* id of layer (to begin with) */
- GapMovHandle src_handle;
+ gint32 src_image_id; /* source image */
+ gint32 src_layer_id; /* id of layer (to begin with) */
+ GapMovHandle src_handle;
GapMovStepMode src_stepmode;
GapMovSelMode src_selmode;
int src_paintmode;
@@ -157,8 +157,8 @@
gint src_apply_bluebox; /* TRUE FALSE */
gint clip_to_img; /* TRUE FALSE */
- gint32 tmpsel_image_id; /* a temporary image to save the selection of the source image or frame */
- gint32 tmpsel_channel_id; /* the selection */
+ gint32 tmpsel_image_id; /* a temporary image to save the selection of the source image or frame */
+ gint32 tmpsel_channel_id; /* the selection */
gdouble step_speed_factor;
gdouble tween_opacity_initial;
@@ -168,33 +168,33 @@
gint tracelayer_enable;
gint tween_steps; /* 0 == no virtual tweens between frames */
- gint point_idx; /* 0 upto MAX_POINT -1 */
- gint point_idx_max; /* 0 upto MAX_POINT -1 */
- GapMovPoint point[GAP_MOV_MAX_POINT];
-
- gint dst_range_start; /* use current frame as default */
- gint dst_range_end;
- gint dst_layerstack;
-
- /* for dialog only */
- gint32 dst_image_id; /* frame image */
- gint32 tmp_image_id; /* temp. flattened preview image */
- gint32 tmp_alt_image_id; /* temp. preview image (preloaded preview frame) */
- gint32 tmp_alt_framenr; /* framenr of the tmp_alt_image_id */
+ gint point_idx; /* 0 upto MAX_POINT -1 */
+ gint point_idx_max; /* 0 upto MAX_POINT -1 */
+ GapMovPoint point[GAP_MOV_MAX_POINT];
+
+ gint dst_range_start; /* use current frame as default */
+ gint dst_range_end;
+ gint dst_layerstack;
+
+ /* for dialog only */
+ gint32 dst_image_id; /* frame image */
+ gint32 tmp_image_id; /* temp. flattened preview image */
+ gint32 tmp_alt_image_id; /* temp. preview image (preloaded preview frame) */
+ gint32 tmp_alt_framenr; /* framenr of the tmp_alt_image_id */
/* for generating animated preview only */
- GapMovApvMode apv_mode;
+ GapMovApvMode apv_mode;
gint32 apv_src_frame; /* image_id of the (already scaled) baseframe
* or -1 in exact mode.
- * (exact mode uses unscaled original frames)
- */
+ * (exact mode uses unscaled original frames)
+ */
gint32 apv_mlayer_image; /* destination image_id for the animated preview
* -1 if we are not in anim_preview mode
- */
+ */
gchar *apv_gap_paste_buff; /* Optional PasteBuffer (to store preview frames)
- * "/tmp/gimp_video_paste_buffer/gap_pasteframe_"
- * NULL if we do not copy frames to a paste_buffer
- */
+ * "/tmp/gimp_video_paste_buffer/gap_pasteframe_"
+ * NULL if we do not copy frames to a paste_buffer
+ */
gdouble apv_framerate;
gdouble apv_scalex;
@@ -215,14 +215,14 @@
gint twix; /* current tweenindex, 0 is used for the real frame, processing order: tween_steps .... 2, 1, 0 */
/* for the bluebox filter */
- GapBlueboxGlobalParams *bbp;
- GapBlueboxGlobalParams *bbp_pv;
+ GapBlueboxGlobalParams *bbp;
+ GapBlueboxGlobalParams *bbp_pv;
} GapMovValues;
typedef struct {
- GapAnimInfo *dst_ainfo_ptr; /* destination frames */
- GapMovValues *val_ptr;
+ GapAnimInfo *dst_ainfo_ptr; /* destination frames */
+ GapMovValues *val_ptr;
} GapMovData;
long gap_mov_dlg_move_dialog (GapMovData *mov_ptr);
Modified: trunk/gap/gap_mov_exec.c
==============================================================================
--- trunk/gap/gap_mov_exec.c (original)
+++ trunk/gap/gap_mov_exec.c Sun Apr 5 06:47:07 2009
@@ -285,8 +285,8 @@
/* ------------------------------------------------------ */
if(ainfo_ptr->new_filename != NULL) g_free(ainfo_ptr->new_filename);
ainfo_ptr->new_filename = gap_lib_alloc_fname(ainfo_ptr->basename,
- cur_ptr->dst_frame_nr,
- ainfo_ptr->extension);
+ cur_ptr->dst_frame_nr,
+ ainfo_ptr->extension);
if(ainfo_ptr->new_filename == NULL)
return -1;
@@ -308,7 +308,7 @@
/* if OK: save the rendered frame back to disk */
if(gap_lib_save_named_frame(l_tmp_image_id, ainfo_ptr->new_filename) < 0)
- l_rc = -1;
+ l_rc = -1;
}
else l_rc = -1;
}
@@ -327,17 +327,17 @@
/* anim preview exact mode uses original frames */
if(ainfo_ptr->new_filename != NULL) g_free(ainfo_ptr->new_filename);
ainfo_ptr->new_filename = gap_lib_alloc_fname(ainfo_ptr->basename,
- cur_ptr->dst_frame_nr,
- ainfo_ptr->extension);
+ cur_ptr->dst_frame_nr,
+ ainfo_ptr->extension);
l_tmp_image_id = gap_lib_load_image(ainfo_ptr->new_filename);
if(l_tmp_image_id < 0)
- return -1;
+ return -1;
gimp_image_undo_disable (l_tmp_image_id);
if((mov_ptr->val_ptr->apv_scalex != 100.0) || (mov_ptr->val_ptr->apv_scaley != 100.0))
{
- gint32 l_size_x, l_size_y;
+ gint32 l_size_x, l_size_y;
l_size_x = (gimp_image_width(l_tmp_image_id) * mov_ptr->val_ptr->apv_scalex) / 100;
l_size_y = (gimp_image_height(l_tmp_image_id) * mov_ptr->val_ptr->apv_scaley) / 100;
@@ -369,18 +369,18 @@
{
if(gap_debug) printf("p_mov_call_render: flattened layer_id:%d\n", (int)l_layer_id);
/* hof:
- * if invisible layers are flattened on an empty image
- * we do not get a resulting layer (returned l_layer_id == -1)
- *
- * I'm not sure if is this a bug, but here is a workaround:
- *
- * In that case I add a dummy layer 1x1 pixel (at offest -1,-1)
- * and flatten again, and it works (tested with gimp-1.1.19)
- */
+ * if invisible layers are flattened on an empty image
+ * we do not get a resulting layer (returned l_layer_id == -1)
+ *
+ * I'm not sure if is this a bug, but here is a workaround:
+ *
+ * In that case I add a dummy layer 1x1 pixel (at offest -1,-1)
+ * and flatten again, and it works (tested with gimp-1.1.19)
+ */
l_layer_id = gimp_layer_new(l_tmp_image_id, "dummy",
1,
- 1,
- ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
+ 1,
+ ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
gimp_image_add_layer(l_tmp_image_id, l_layer_id, 0);
@@ -393,7 +393,7 @@
{
printf("p_mov_call_render: flattened layer_id:%d\n", (int)l_layer_id);
printf("p_mov_call_render: tmp_image_id:%d apv_mlayer_image:%d\n",
- (int)l_tmp_image_id, (int)mov_ptr->val_ptr->apv_mlayer_image);
+ (int)l_tmp_image_id, (int)mov_ptr->val_ptr->apv_mlayer_image);
}
/* set layername (including delay for the framerate) */
@@ -429,7 +429,7 @@
gimp_image_delete(l_tmp_image_id);
return l_rc;
-} /* end p_mov_call_render */
+} /* end p_mov_call_render */
@@ -460,7 +460,7 @@
(int)cur_ptr->src_last_layer,
(int)cur_ptr->src_layer_idx,
(float)cur_ptr->src_layer_idx_dbl,
- (float)l_step_speed_factor
+ (float)l_step_speed_factor
);
/* note: top layer has index 0
@@ -525,7 +525,7 @@
}
cur_ptr->src_layer_idx = MAX((long)(cur_ptr->src_layer_idx_dbl + l_round), 0);
}
-} /* end p_advance_src_layer */
+} /* end p_advance_src_layer */
@@ -569,8 +569,8 @@
(int)pvals->cache_ainfo_ptr->first_frame_nr,
(int)pvals->cache_ainfo_ptr->last_frame_nr,
(int)cur_ptr->src_frame_idx,
- (float)cur_ptr->src_frame_idx_dbl,
- (float)l_step_speed_factor
+ (float)cur_ptr->src_frame_idx_dbl,
+ (float)l_step_speed_factor
);
if((pvals->cache_ainfo_ptr->frame_cnt > 1 ) && (pvals->src_stepmode != GAP_STEP_FRAME_NONE))
@@ -631,11 +631,11 @@
}
cur_ptr->src_frame_idx = CLAMP((long)(cur_ptr->src_frame_idx_dbl + l_round)
,pvals->cache_ainfo_ptr->first_frame_nr
- ,pvals->cache_ainfo_ptr->last_frame_nr
- );
+ ,pvals->cache_ainfo_ptr->last_frame_nr
+ );
gap_mov_render_fetch_src_frame(pvals, cur_ptr->src_frame_idx);
}
-} /* end p_advance_src_frame */
+} /* end p_advance_src_frame */
/* ============================================================================
@@ -686,7 +686,7 @@
{
gap_arr_msg_win(mov_ptr->dst_ainfo_ptr->run_mode,
_("No source image was selected.\n"
- "Please open a 2nd image of the same type before opening 'Move Path'."));
+ "Please open a 2nd image of the same type before opening 'Move Path'."));
return -1;
}
@@ -849,14 +849,14 @@
/* findout index of src_layer_id */
for(cur_ptr->src_layer_idx = 0;
- cur_ptr->src_layer_idx < l_nlayers;
- cur_ptr->src_layer_idx++)
+ cur_ptr->src_layer_idx < l_nlayers;
+ cur_ptr->src_layer_idx++)
{
- if(cur_ptr->src_layers[cur_ptr->src_layer_idx] == val_ptr->src_layer_id)
- {
- cur_ptr->src_layer_idx_dbl = (gdouble)cur_ptr->src_layer_idx;
+ if(cur_ptr->src_layers[cur_ptr->src_layer_idx] == val_ptr->src_layer_id)
+ {
+ cur_ptr->src_layer_idx_dbl = (gdouble)cur_ptr->src_layer_idx;
break;
- }
+ }
}
cur_ptr->src_last_layer = l_nlayers -1; /* index of last layer */
}
@@ -963,28 +963,28 @@
for(l_idk = l_ptidx; l_idk < l_points; l_idk++)
{
if(l_idk == l_points -1)
- {
- /* last point is always an implicite keyframe */
+ {
+ /* last point is always an implicite keyframe */
l_fpl = ((gdouble)((l_frames -1) - l_prev_keyframe)) / ((gdouble)((l_idk - l_ptidx) +1));
l_prev_keyframe = l_frames -1;
l_prev_keyptidx = l_idk;
if(gap_debug) printf("p_mov_execute: last point is implicite keyframe l_fpl=%f\n", l_fpl);
break;
- }
- else
- {
- if (val_ptr->point[l_idk].keyframe > 0)
- {
- /* found a keyframe, have to recalculate frames_per_line */
+ }
+ else
+ {
+ if (val_ptr->point[l_idk].keyframe > 0)
+ {
+ /* found a keyframe, have to recalculate frames_per_line */
l_fpl = ((gdouble)(val_ptr->point[l_idk].keyframe - l_prev_keyframe)) / ((gdouble)((l_idk - l_ptidx) +1));
l_prev_keyframe = val_ptr->point[l_idk].keyframe;
l_prev_keyptidx = l_idk;
if(gap_debug) printf("p_mov_execute: keyframe l_fpl=%f\n", l_fpl);
break;
- }
- }
+ }
+ }
}
}
l_flt_count += l_fpl;
@@ -992,8 +992,8 @@
if(l_fpl < 1.0)
{
- printf("p_mov_execute: ** Error frames per line at point[%d] = %f (is less than 1.0 !!)\n",
- (int)l_ptidx, (float)l_fpl);
+ printf("p_mov_execute: ** Error frames per line at point[%d] = %f (is less than 1.0 !!)\n",
+ (int)l_ptidx, (float)l_fpl);
}
}
@@ -1027,19 +1027,19 @@
if((gdouble)l_fridx > l_flt_timing[l_ptidx])
{
/* change deltas for next line of the move path */
- if(l_ptidx < l_points-1)
- {
+ if(l_ptidx < l_points-1)
+ {
l_ptidx++;
- if(gap_debug)
- {
- printf("p_mov_execute: advance to controlpoint l_ptidx=%d, l_flt_timing[l_ptidx]=%f\n"
- , (int)l_ptidx, (float)l_flt_timing[l_ptidx]);
- }
- }
- else
- {
- if(gap_debug) printf("p_mov_execute: ** ERROR overflow l_ptidx=%d\n", (int)l_ptidx);
- }
+ if(gap_debug)
+ {
+ printf("p_mov_execute: advance to controlpoint l_ptidx=%d, l_flt_timing[l_ptidx]=%f\n"
+ , (int)l_ptidx, (float)l_flt_timing[l_ptidx]);
+ }
+ }
+ else
+ {
+ if(gap_debug) printf("p_mov_execute: ** ERROR overflow l_ptidx=%d\n", (int)l_ptidx);
+ }
}
l_fpl = (l_flt_timing[l_ptidx] - l_flt_timing[l_ptidx -1]); /* float frames per line */
@@ -1091,7 +1091,7 @@
printf("ROTATE [%02d] %f [%02d] %f MIX: %f\n"
, (int)l_ptidx-1, (float)val_ptr->point[l_ptidx -1].rotation
, (int)l_ptidx, (float)val_ptr->point[l_ptidx].rotation
- , (float)cur_ptr->currRotation);
+ , (float)cur_ptr->currRotation);
}
if(val_ptr->src_stepmode < GAP_STEP_FRAME )
@@ -1108,11 +1108,11 @@
if(l_frame_step < 0)
{
/* if we step down, we have to insert the layer
- * as lowest layer in the existing layerstack
- * of the animated preview multilayer image.
- * (if we step up, we always use 0 as l_apv_layerstack,
- * that means always insert on top of the layerstack)
- */
+ * as lowest layer in the existing layerstack
+ * of the animated preview multilayer image.
+ * (if we step up, we always use 0 as l_apv_layerstack,
+ * that means always insert on top of the layerstack)
+ */
l_apv_layerstack++;
}
/* RENDER add current src_layer to current frame */
@@ -1159,7 +1159,7 @@
return l_rc;
-} /* end p_mov_execute */
+} /* end p_mov_execute */
/* ============================================================================
@@ -1239,43 +1239,43 @@
l_src_layers = gimp_image_get_layers (pvals_orig->src_image_id, &l_nlayers);
if(l_src_layers == NULL)
{
- printf("ERROR: gap_mov_exec_anim_preview GOT no src_layers (original image_id %d)\n",
- (int)pvals_orig->src_image_id);
+ printf("ERROR: gap_mov_exec_anim_preview GOT no src_layers (original image_id %d)\n",
+ (int)pvals_orig->src_image_id);
}
else
{
- for(l_stackpos = 0;
- l_stackpos < l_nlayers;
- l_stackpos++)
- {
- if(l_src_layers[l_stackpos] == pvals_orig->src_layer_id)
+ for(l_stackpos = 0;
+ l_stackpos < l_nlayers;
+ l_stackpos++)
+ {
+ if(l_src_layers[l_stackpos] == pvals_orig->src_layer_id)
break;
- }
- g_free(l_src_layers);
+ }
+ g_free(l_src_layers);
- l_src_layers = gimp_image_get_layers (l_tmp_image_id, &l_nlayers);
- if(l_src_layers == NULL)
- {
+ l_src_layers = gimp_image_get_layers (l_tmp_image_id, &l_nlayers);
+ if(l_src_layers == NULL)
+ {
printf("ERROR: gap_mov_exec_anim_preview GOT no src_layers (scaled copy image_id %d)\n",
- (int)l_tmp_image_id);
- }
- else
- {
+ (int)l_tmp_image_id);
+ }
+ else
+ {
l_pvals->src_layer_id = l_src_layers[l_stackpos];
g_free(l_src_layers);
- }
+ }
}
if(gap_debug)
{
- printf("gap_mov_exec_anim_preview: orig src_image_id:%d src_layer:%d, stackpos:%d\n"
+ printf("gap_mov_exec_anim_preview: orig src_image_id:%d src_layer:%d, stackpos:%d\n"
,(int)pvals_orig->src_image_id
- ,(int)pvals_orig->src_layer_id
- ,(int)l_stackpos);
- printf(" Scaled src_image_id:%d scaled_src_layer:%d\n"
+ ,(int)pvals_orig->src_layer_id
+ ,(int)l_stackpos);
+ printf(" Scaled src_image_id:%d scaled_src_layer:%d\n"
,(int)l_tmp_image_id
- ,(int)l_pvals->src_layer_id );
+ ,(int)l_pvals->src_layer_id );
}
}
} /* end if Scaledown needed */
@@ -1285,7 +1285,7 @@
{
printf("gap_mov_exec_anim_preview: src_image_id %d (orig:%d)\n"
, (int) l_pvals->src_image_id
- , (int) pvals_orig->src_image_id);
+ , (int) pvals_orig->src_image_id);
}
/* create the animated preview multilayer image in (scaled) framesize */
@@ -1328,9 +1328,9 @@
gimp_image_undo_disable (l_tmp_frame_id);
if((l_pvals->apv_scalex != 100.0) || (l_pvals->apv_scaley != 100.0))
{
- l_size_x = (gimp_image_width(l_tmp_frame_id) * l_pvals->apv_scalex) / 100;
- l_size_y = (gimp_image_height(l_tmp_frame_id) * l_pvals->apv_scaley) / 100;
- gimp_image_scale(l_tmp_frame_id, l_size_x, l_size_y);
+ l_size_x = (gimp_image_width(l_tmp_frame_id) * l_pvals->apv_scalex) / 100;
+ l_size_y = (gimp_image_height(l_tmp_frame_id) * l_pvals->apv_scaley) / 100;
+ gimp_image_scale(l_tmp_frame_id, l_size_x, l_size_y);
}
g_free(l_filename);
break;
@@ -1356,8 +1356,8 @@
{
if(gap_debug)
{
- printf("gap_mov_exec_anim_preview: DELETE cache_tmp_image_id:%d\n",
- (int)l_pvals->cache_tmp_image_id);
+ printf("gap_mov_exec_anim_preview: DELETE cache_tmp_image_id:%d\n",
+ (int)l_pvals->cache_tmp_image_id);
}
/* destroy the cached frame image */
gimp_image_delete(l_pvals->cache_tmp_image_id);
@@ -1386,7 +1386,7 @@
}
return(l_mlayer_image_id);
-} /* end gap_mov_exec_anim_preview */
+} /* end gap_mov_exec_anim_preview */
/* ============================================================================
* p_con_keyframe
@@ -1467,7 +1467,7 @@
&& (l_idx < pvals->point_idx_max)
&& ((int)pvals->point[l_idx].keyframe > 0))
{
- num_optional_params++;
+ num_optional_params++;
}
fprintf(l_fp, " %02d ", (int)num_optional_params);
@@ -1493,7 +1493,7 @@
&& (l_idx < pvals->point_idx_max)
&& ((int)pvals->point[l_idx].keyframe > 0))
{
- fprintf(l_fp, " %d"
+ fprintf(l_fp, " %d"
, (int)gap_mov_exec_conv_keyframe_to_rel(pvals->point[l_idx].keyframe_abs, pvals)
);
}
@@ -1547,8 +1547,8 @@
if((*l_ptr != '#') && (*l_ptr != '\n') && (*l_ptr != '\0'))
{
l_cnt = gap_base_sscan_flt_numbers(l_ptr, &l_farr[0], MAX_NUMVALUES_PER_LINE);
- l_i1 = (gint)l_farr[0];
- l_i2 = (gint)l_farr[1];
+ l_i1 = (gint)l_farr[0];
+ l_i2 = (gint)l_farr[1];
if(l_idx == -1)
{
if((l_cnt < 2) || (l_i2 > GAP_MOV_MAX_POINT) || (l_i1 > l_i2))
@@ -1561,21 +1561,21 @@
}
else
{
- gdouble num_optional_params;
- gint key_idx;
+ gdouble num_optional_params;
+ gint key_idx;
/* the older format used in GAP.1.2 has 6 or 7 integer numbers per line
* and should be compatible and readable by this code.
*
* the new format has 2 integer values (p_x, p_y)
* and 5 float values (w_resize, h_resize, opacity, rotation, feather_radius)
- * and 1 int value num_optional_params (telling how much will follow)
+ * and 1 int value num_optional_params (telling how much will follow)
* the rest of the line is optional
* 8 additional float values (transformation factors) 7th upto 14th parameter
* 1 integer values (keyframe) as 7th parameter
* or as 15th parameter (if transformation factors are present too)
*/
if((l_cnt != 6) && (l_cnt != 7) /* for compatibility to old format */
- && (l_cnt != 8) && (l_cnt != 9) && (l_cnt != 16) && (l_cnt != 17))
+ && (l_cnt != 8) && (l_cnt != 9) && (l_cnt != 16) && (l_cnt != 17))
{
/* invalid pointline format detected */
l_rc = -2; /* have to call p_reset_points() when called from dialog window */
@@ -1599,12 +1599,12 @@
pvals->point[l_idx].rotation = l_farr[5];
pvals->point[l_idx].sel_feather_radius = 0.0;
if(l_cnt >= 8)
- {
+ {
pvals->point[l_idx].sel_feather_radius = l_farr[6];
- num_optional_params = l_farr[7];
- }
+ num_optional_params = l_farr[7];
+ }
if(l_cnt >= 16)
- {
+ {
pvals->point[l_idx].ttlx = l_farr[8];
pvals->point[l_idx].ttly = l_farr[9];
pvals->point[l_idx].ttrx = l_farr[10];
@@ -1613,28 +1613,28 @@
pvals->point[l_idx].tbly = l_farr[13];
pvals->point[l_idx].tbrx = l_farr[14];
pvals->point[l_idx].tbry = l_farr[15];
- }
- key_idx = -1;
- if(l_idx > 0)
- {
- switch(l_cnt)
- {
- case 7:
- key_idx = 6; /* for compatibilty with old format */
- break;
- case 9:
- key_idx = 8;
- break;
- case 17:
- key_idx = 16;
- break;
- }
- }
- if(key_idx > 0)
- {
+ }
+ key_idx = -1;
+ if(l_idx > 0)
+ {
+ switch(l_cnt)
+ {
+ case 7:
+ key_idx = 6; /* for compatibilty with old format */
+ break;
+ case 9:
+ key_idx = 8;
+ break;
+ case 17:
+ key_idx = 16;
+ break;
+ }
+ }
+ if(key_idx > 0)
+ {
pvals->point[l_idx].keyframe = l_farr[key_idx];
pvals->point[l_idx].keyframe_abs = gap_mov_exec_conv_keyframe_to_abs(l_farr[key_idx], pvals);
- }
+ }
l_idx ++;
}
@@ -1773,53 +1773,53 @@
if(l_idx == 0)
{
l_angle = p_calc_angle(pvals->point[l_idx].p_x,
- pvals->point[l_idx].p_y,
- pvals->point[l_idx +1].p_x,
- pvals->point[l_idx +1].p_y);
+ pvals->point[l_idx].p_y,
+ pvals->point[l_idx +1].p_x,
+ pvals->point[l_idx +1].p_y);
}
else
{
if(l_idx == pvals->point_idx_max)
- {
+ {
l_angle_new = p_calc_angle(pvals->point[l_idx -1].p_x,
- pvals->point[l_idx -1].p_y,
- pvals->point[l_idx].p_x,
- pvals->point[l_idx].p_y);
- }
- else
- {
+ pvals->point[l_idx -1].p_y,
+ pvals->point[l_idx].p_x,
+ pvals->point[l_idx].p_y);
+ }
+ else
+ {
l_angle_1 = p_calc_angle(pvals->point[l_idx -1].p_x,
- pvals->point[l_idx -1].p_y,
- pvals->point[l_idx].p_x,
- pvals->point[l_idx].p_y);
+ pvals->point[l_idx -1].p_y,
+ pvals->point[l_idx].p_x,
+ pvals->point[l_idx].p_y);
l_angle_2 = p_calc_angle(pvals->point[l_idx].p_x,
- pvals->point[l_idx].p_y,
- pvals->point[l_idx +1].p_x,
- pvals->point[l_idx +1].p_y);
+ pvals->point[l_idx].p_y,
+ pvals->point[l_idx +1].p_x,
+ pvals->point[l_idx +1].p_y);
if((l_angle_1 == 0) && (l_angle_2 == 180))
- {
+ {
l_angle_new = 270;
- }
- else
- {
+ }
+ else
+ {
if((l_angle_1 == 90) && (l_angle_2 == 270))
- {
+ {
l_angle_new = 0;
- }
- else
- {
+ }
+ else
+ {
l_angle_new = (l_angle_1 + l_angle_2) / 2;
- }
- }
- if(((l_angle_1 < 0) && (l_angle_2 >= 180))
- || ((l_angle_2 < 0) && (l_angle_1 >= 180)))
- {
- l_angle_new += 180;
- }
- }
- l_angle = p_rotatate_less_than_180(l_angle, l_angle_new, &l_turns);
+ }
+ }
+ if(((l_angle_1 < 0) && (l_angle_2 >= 180))
+ || ((l_angle_2 < 0) && (l_angle_1 >= 180)))
+ {
+ l_angle_new += 180;
+ }
+ }
+ l_angle = p_rotatate_less_than_180(l_angle, l_angle_new, &l_turns);
}
if(gap_debug)
@@ -1830,7 +1830,7 @@
pvals->point[l_idx].rotation = l_startangle + l_angle;
}
}
-} /* end gap_mov_exec_calculate_rotate_follow */
+} /* end gap_mov_exec_calculate_rotate_follow */
/* ============================================================================
@@ -1865,48 +1865,48 @@
pvals->point[l_idx].keyframe = gap_mov_exec_conv_keyframe_to_rel(pvals->point[l_idx].keyframe_abs, pvals);
if(pvals->point[l_idx].keyframe > l_affected_frames - 2)
- {
- l_err = g_strdup_printf(_("\nError: Keyframe %d at point [%d] higher or equal than last handled frame")
- , pvals->point[l_idx].keyframe_abs, l_idx+1);
- l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
- g_free(l_err);
- l_errcount++;
- }
+ {
+ l_err = g_strdup_printf(_("\nError: Keyframe %d at point [%d] higher or equal than last handled frame")
+ , pvals->point[l_idx].keyframe_abs, l_idx+1);
+ l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
+ g_free(l_err);
+ l_errcount++;
+ }
if(pvals->point[l_idx].keyframe < l_prev_frame)
- {
- l_err = g_strdup_printf(_("\nError: Keyframe %d at point [%d] leaves not enough space (frames)"
- "\nfor the previous controlpoints")
- , pvals->point[l_idx].keyframe_abs, l_idx+1);
- l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
- g_free(l_err);
- l_errcount++;
- }
+ {
+ l_err = g_strdup_printf(_("\nError: Keyframe %d at point [%d] leaves not enough space (frames)"
+ "\nfor the previous controlpoints")
+ , pvals->point[l_idx].keyframe_abs, l_idx+1);
+ l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
+ g_free(l_err);
+ l_errcount++;
+ }
if(pvals->point[l_idx].keyframe <= l_prev_keyframe)
- {
- l_err = g_strdup_printf(_("\nError: Keyframe %d is not in sequence at point [%d]")
- , pvals->point[l_idx].keyframe_abs, l_idx+1);
- l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
- g_free(l_err);
- l_errcount++;
- }
+ {
+ l_err = g_strdup_printf(_("\nError: Keyframe %d is not in sequence at point [%d]")
+ , pvals->point[l_idx].keyframe_abs, l_idx+1);
+ l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
+ g_free(l_err);
+ l_errcount++;
+ }
l_prev_keyframe = pvals->point[l_idx].keyframe;
- if(l_prev_keyframe > l_prev_frame)
- {
- l_prev_frame = l_prev_keyframe +1;
- }
+ if(l_prev_keyframe > l_prev_frame)
+ {
+ l_prev_frame = l_prev_keyframe +1;
+ }
}
else
{
- l_prev_frame++;
- if(l_prev_frame +1 > l_affected_frames)
- {
- l_err = g_strdup_printf(_("\nError: controlpoint [%d] is out of handled framerange"), l_idx+1);
- l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
- g_free(l_err);
- l_errcount++;
- }
+ l_prev_frame++;
+ if(l_prev_frame +1 > l_affected_frames)
+ {
+ l_err = g_strdup_printf(_("\nError: controlpoint [%d] is out of handled framerange"), l_idx+1);
+ l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
+ g_free(l_err);
+ l_errcount++;
+ }
}
if(l_errcount > 10)
{
@@ -1916,15 +1916,15 @@
if(pvals->point_idx_max + 1 > l_affected_frames)
{
- l_err = g_strdup_printf(_("\nError: More controlpoints (%d) than handled frames (%d)."
- "\nPlease reduce controlpoints or select more frames"),
- (int)pvals->point_idx_max+1, (int)l_affected_frames);
- l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
- g_free(l_err);
+ l_err = g_strdup_printf(_("\nError: More controlpoints (%d) than handled frames (%d)."
+ "\nPlease reduce controlpoints or select more frames"),
+ (int)pvals->point_idx_max+1, (int)l_affected_frames);
+ l_err_lbltext = g_strdup_printf("%s%s", l_err_lbltext, l_err);
+ g_free(l_err);
}
return(l_err_lbltext);
-} /* end gap_mov_exec_chk_keyframes */
+} /* end gap_mov_exec_chk_keyframes */
/* ============================================================================
@@ -1986,7 +1986,7 @@
g_free(l_err_lbltext);
return (l_rc);
-} /* end p_check_move_path_params */
+} /* end p_check_move_path_params */
/* ============================================================================
@@ -2021,33 +2021,33 @@
{
l_rc = 0;
- /* get controlpoints from pointfile */
- if (pointfile != NULL)
- {
- l_rc = gap_mov_exec_gap_load_pointfile(pointfile, pvals);
- if (l_rc < 0)
- {
- printf("Execution Error: could not load MovePath controlpoints from file: %s\n",
- pointfile);
- }
- }
-
- if(l_rc >= 0)
- {
- l_rc = p_check_move_path_params(&l_mov_data);
- }
-
- /* Automatic calculation of rotation values */
- if((rotation_follow > 0) && (l_rc == 0))
- {
+ /* get controlpoints from pointfile */
+ if (pointfile != NULL)
+ {
+ l_rc = gap_mov_exec_gap_load_pointfile(pointfile, pvals);
+ if (l_rc < 0)
+ {
+ printf("Execution Error: could not load MovePath controlpoints from file: %s\n",
+ pointfile);
+ }
+ }
+
+ if(l_rc >= 0)
+ {
+ l_rc = p_check_move_path_params(&l_mov_data);
+ }
+
+ /* Automatic calculation of rotation values */
+ if((rotation_follow > 0) && (l_rc == 0))
+ {
gap_mov_exec_calculate_rotate_follow(pvals, startangle);
- }
+ }
}
else
{
- /* Dialog for GIMP_RUN_INTERACTIVE
- * (and for GIMP_RUN_WITH_LAST_VALS that is not really supported here)
- */
+ /* Dialog for GIMP_RUN_INTERACTIVE
+ * (and for GIMP_RUN_WITH_LAST_VALS that is not really supported here)
+ */
l_rc = gap_mov_dlg_move_dialog (&l_mov_data);
if(0 != gap_lib_chk_framechange(ainfo_ptr))
{
@@ -2074,10 +2074,10 @@
if(l_mov_data.val_ptr->cache_tmp_image_id >= 0)
{
- if(gap_debug)
- {
- printf("gap_move: DELETE cache_tmp_image_id:%d\n",
- (int)l_mov_data.val_ptr->cache_tmp_image_id);
+ if(gap_debug)
+ {
+ printf("gap_move: DELETE cache_tmp_image_id:%d\n",
+ (int)l_mov_data.val_ptr->cache_tmp_image_id);
}
/* destroy the cached frame image */
gimp_image_delete(l_mov_data.val_ptr->cache_tmp_image_id);
@@ -2095,7 +2095,7 @@
}
return(l_rc);
-} /* end gap_mov_exec_move_path */
+} /* end gap_mov_exec_move_path */
/* ============================================================================
@@ -2143,5 +2143,5 @@
default:
break;
}
-} /* end gap_mov_exec_set_handle_offsets */
+} /* end gap_mov_exec_set_handle_offsets */
Modified: trunk/gap/gap_mov_render.c
==============================================================================
--- trunk/gap/gap_mov_render.c (original)
+++ trunk/gap/gap_mov_render.c Sun Apr 5 06:47:07 2009
@@ -61,8 +61,8 @@
extern int gap_debug; /* ==0 ... dont print debug infos */
static void p_mov_selection_handling(gint32 orig_layer_id
- , gint src_offset_x
- , gint src_offset_y
+ , gint src_offset_x
+ , gint src_offset_y
, GapMovValues *val_ptr
, GapMovCurrent *cur_ptr
);
@@ -115,8 +115,8 @@
*/
static void
p_mov_selection_handling(gint32 orig_layer_id
- , gint src_offset_x
- , gint src_offset_y
+ , gint src_offset_x
+ , gint src_offset_y
, GapMovValues *val_ptr
, GapMovCurrent *cur_ptr
)
@@ -143,7 +143,7 @@
l_tmp_layer_id = gimp_layer_new(val_ptr->tmpsel_image_id, "dummy",
l_width, l_height,
- GIMP_RGBA_IMAGE,
+ GIMP_RGBA_IMAGE,
100.0, /* full opaque */
GIMP_NORMAL_MODE);
gimp_image_add_layer(val_ptr->tmpsel_image_id, l_tmp_layer_id, 0);
@@ -152,8 +152,8 @@
gap_layer_copy_picked_channel(l_tmp_layer_id, 3 /* dst_pick is the alpha channel */
,orig_layer_id, (l_bpp -1)
- ,FALSE /* shadow */
- );
+ ,FALSE /* shadow */
+ );
gimp_selection_load(val_ptr->tmpsel_channel_id);
@@ -177,8 +177,8 @@
/* copy alpha channel form dummy back to original */
gap_layer_copy_picked_channel(orig_layer_id, (l_bpp -1)
,l_tmp_layer_id, 3 /* dst_pick is the alpha channel */
- ,FALSE /* shadow */
- );
+ ,FALSE /* shadow */
+ );
}
/* DEBUG code: show the tmpsel_image */
@@ -304,41 +304,41 @@
,(float)cur_ptr->currTBLY
,(float)cur_ptr->currTBRX
,(float)cur_ptr->currTBRY
- );
+ );
printf(" width: %.3f height: %.3f\n"
,(float)width
,(float)height
- );
+ );
printf(" x0: %4.3f y0: %4.3f x1: %4.3f y1: %4.3f\n"
,(float)x0
,(float)y0
,(float)x1
,(float)y1
- );
+ );
printf(" x2: %4.3f y2: %4.3f x3: %4.3f y3: %4.3f\n\n"
,(float)x2
,(float)y2
,(float)x3
,(float)y3
- );
+ );
printf(" neww: %.3f newh: %.3f\n"
,(float)neww
,(float)newh
- );
+ );
}
gimp_drawable_transform_perspective_default (layer_id,
- x0,
- y0,
- x1,
- y1,
- x2,
- y2,
- x3,
- y3,
- TRUE, /* whether to use interpolation and supersampling for good quality */
+ x0,
+ y0,
+ x1,
+ y1,
+ x2,
+ y2,
+ x3,
+ y3,
+ TRUE, /* whether to use interpolation and supersampling for good quality */
FALSE /* whether to clip results */
- );
+ );
*resized_flag = 1;
*new_width = neww;
@@ -381,7 +381,7 @@
cur_ptr->currRotation,
val_ptr->clip_to_img,
val_ptr->src_force_visible,
- val_ptr->src_stepmode);
+ val_ptr->src_stepmode);
if(val_ptr->src_stepmode < GAP_STEP_FRAME)
{
@@ -392,7 +392,7 @@
}
l_mode = p_get_paintmode(val_ptr->src_paintmode
,cur_ptr->src_layers[cur_ptr->src_layer_idx]
- );
+ );
/* make a copy of the current source layer
* (using current opacity & paintmode values)
*/
@@ -412,7 +412,7 @@
}
l_mode = p_get_paintmode(val_ptr->src_paintmode
,val_ptr->cache_tmp_layer_id
- );
+ );
/* for FRAME based stepmodes use the flattened layer in the cahed frame image */
l_cp_layer_id = gap_layer_copy_to_dest_image(image_id,
val_ptr->cache_tmp_layer_id,
@@ -474,10 +474,10 @@
{
p_mov_selection_handling (l_cp_layer_id
, l_src_offset_x
- , l_src_offset_y
- , val_ptr
- , cur_ptr
- );
+ , l_src_offset_y
+ , val_ptr
+ , cur_ptr
+ );
}
if((cur_ptr->currWidth * cur_ptr->currHeight) > (100.0 * 100.0))
@@ -587,8 +587,8 @@
if (l_new_width && l_new_height)
{
gimp_layer_resize(l_cp_layer_id, l_new_width, l_new_height,
- -(lx1 - l_offset_x),
- -(ly1 - l_offset_y));
+ -(lx1 - l_offset_x),
+ -(ly1 - l_offset_y));
}
else
{
@@ -640,7 +640,7 @@
if(gap_debug) printf("GAP gap_mov_render_render: exit OK\n");
return 0;
-} /* end gap_mov_render_render */
+} /* end gap_mov_render_render */
/* ============================================================================
* gap_mov_render_fetch_src_frame
@@ -682,13 +682,13 @@
if(pvals->cache_tmp_image_id >= 0)
{
if(gap_debug)
- {
- printf("gap_mov_render_fetch_src_frame: DELETE cache_tmp_image_id:%d\n",
- (int)pvals->cache_tmp_image_id);
+ {
+ printf("gap_mov_render_fetch_src_frame: DELETE cache_tmp_image_id:%d\n",
+ (int)pvals->cache_tmp_image_id);
}
/* destroy the cached frame image */
gimp_image_delete(pvals->cache_tmp_image_id);
- pvals->cache_tmp_image_id = -1;
+ pvals->cache_tmp_image_id = -1;
}
l_ainfo_ptr = gap_lib_alloc_ainfo(pvals->src_image_id, GIMP_RUN_NONINTERACTIVE);
@@ -700,28 +700,28 @@
else
{
if ((pvals->src_image_id == pvals->cache_src_image_id)
- && (strcmp(pvals->cache_ainfo_ptr->basename, l_ainfo_ptr->basename) == 0))
- {
+ && (strcmp(pvals->cache_ainfo_ptr->basename, l_ainfo_ptr->basename) == 0))
+ {
pvals->cache_ainfo_ptr->curr_frame_nr = l_ainfo_ptr->curr_frame_nr;
gap_lib_free_ainfo(&l_ainfo_ptr);
- }
- else
- {
+ }
+ else
+ {
/* update cached ainfo if source image has changed
- * (either by id or by its basename)
- */
+ * (either by id or by its basename)
+ */
l_old_ainfo_ptr = pvals->cache_ainfo_ptr;
pvals->cache_ainfo_ptr = l_ainfo_ptr;
gap_lib_free_ainfo(&l_old_ainfo_ptr);
- }
+ }
}
if ((wanted_frame_nr == pvals->cache_ainfo_ptr->curr_frame_nr)
|| (wanted_frame_nr < 0))
{
/* always take the current source frame from the already opened image
- * not only for speedup reasons. (the diskfile may contain non actual imagedata)
- */
+ * not only for speedup reasons. (the diskfile may contain non actual imagedata)
+ */
pvals->cache_tmp_image_id = gimp_image_duplicate(pvals->src_image_id);
wanted_frame_nr = pvals->cache_ainfo_ptr->curr_frame_nr;
}
@@ -733,8 +733,8 @@
g_free(pvals->cache_ainfo_ptr->new_filename);
}
pvals->cache_ainfo_ptr->new_filename = gap_lib_alloc_fname(pvals->cache_ainfo_ptr->basename,
- wanted_frame_nr,
- pvals->cache_ainfo_ptr->extension);
+ wanted_frame_nr,
+ pvals->cache_ainfo_ptr->extension);
if(pvals->cache_ainfo_ptr->new_filename == NULL)
{
printf("gap: error got no source frame filename\n");
@@ -780,19 +780,19 @@
if((pvals->tmpsel_channel_id < 0)
|| (pvals->src_selmode == GAP_MOV_SEL_FRAME_SPECIFIC))
{
- gint32 l_sel_channel_id;
- gboolean l_all_empty;
+ gint32 l_sel_channel_id;
+ gboolean l_all_empty;
l_all_empty = FALSE;
- /* pick the selection for the 1.st handled frame
- * or foreach handled frame when mode is GAP_MOV_SEL_FRAME_SPECIFIC
- */
- if(gimp_selection_is_empty(pvals->cache_tmp_image_id))
- {
+ /* pick the selection for the 1.st handled frame
+ * or foreach handled frame when mode is GAP_MOV_SEL_FRAME_SPECIFIC
+ */
+ if(gimp_selection_is_empty(pvals->cache_tmp_image_id))
+ {
l_all_empty = TRUE;
- }
- l_sel_channel_id = gimp_image_get_selection(pvals->cache_tmp_image_id);
- gap_mov_render_create_or_replace_tempsel_image(l_sel_channel_id, pvals, l_all_empty);
+ }
+ l_sel_channel_id = gimp_image_get_selection(pvals->cache_tmp_image_id);
+ gap_mov_render_create_or_replace_tempsel_image(l_sel_channel_id, pvals, l_all_empty);
}
}
@@ -804,7 +804,7 @@
return 0; /* OK */
-} /* end gap_mov_render_fetch_src_frame */
+} /* end gap_mov_render_fetch_src_frame */
/* ============================================================================
@@ -819,7 +819,7 @@
void
gap_mov_render_create_or_replace_tempsel_image(gint32 channel_id
, GapMovValues *val_ptr
- , gboolean all_empty
+ , gboolean all_empty
)
{
if(val_ptr->tmpsel_image_id >= 0)
@@ -829,8 +829,8 @@
val_ptr->tmpsel_image_id = gimp_image_new(gimp_drawable_width(channel_id)
,gimp_drawable_height(channel_id)
- ,GIMP_RGB
- );
+ ,GIMP_RGB
+ );
gimp_selection_all(val_ptr->tmpsel_image_id);
val_ptr->tmpsel_channel_id = gimp_selection_save(val_ptr->tmpsel_image_id);
@@ -839,6 +839,6 @@
{
gap_layer_copy_content(val_ptr->tmpsel_channel_id /* dst */
,channel_id /* src */
- );
+ );
}
} /* end gap_mov_render_create_or_replace_tempsel_image */
Modified: trunk/gap/gap_mpege.c
==============================================================================
--- trunk/gap/gap_mpege.c (original)
+++ trunk/gap/gap_mpege.c Sun Apr 5 06:47:07 2009
@@ -151,7 +151,7 @@
"%s"
),
"http://www.mpeg.org/MSSG";,
- "ftp://ftp.mpeg.org/pub/mpeg/mssg";
+ "ftp://ftp.mpeg.org/pub/mpeg/mssg";
);
argv[l_idx].label_txt = txt;
}
@@ -161,7 +161,7 @@
"you can get mpeg_encode at\n"
"%s"
),
- "ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/bmt1r1.tar.gz";
+ "ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/bmt1r1.tar.gz";
);
argv[l_idx].label_txt = txt;
}
@@ -242,7 +242,7 @@
g_free(txt);
return (l_rc);
-} /* end p_mpege_info */
+} /* end p_mpege_info */
/* ============================================================================
@@ -523,7 +523,7 @@
mp_ptr->startscript = &l_startscript[0];
return (l_rc);
-} /* end p_mpege_dialog */
+} /* end p_mpege_dialog */
/* ============================================================================
* p_mpege_extension_check
@@ -556,7 +556,7 @@
}
return(base_file_formats[l_ffidx]);
-} /* end p_mpege_extension_check */
+} /* end p_mpege_extension_check */
static
int p_mpeg2_extension_check(GapAnimInfo *ainfo_ptr)
@@ -574,7 +574,7 @@
}
return(l_ffidx);
-} /* end p_mpege_extension_check */
+} /* end p_mpege_extension_check */
/* ============================================================================
@@ -779,7 +779,7 @@
fprintf(l_fp, "#\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# general format of each line is:\n");
- fprintf(l_fp, "# <option> <spaces and/or tabs> <value>\n");
+ fprintf(l_fp, "# <option> <spaces and/or tabs> <value>\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# lines can generally be in any order\n");
fprintf(l_fp, "#\n");
@@ -801,7 +801,7 @@
fprintf(l_fp, "#\n");
fprintf(l_fp, "# You must specify the type of the input files. The choices are:\n");
fprintf(l_fp, "# YUV, PPM, JMOVIE, Y, JPEG, PNM\n");
- fprintf(l_fp, "# (must be upper case)\n");
+ fprintf(l_fp, "# (must be upper case)\n");
fprintf(l_fp, "#\n");
if(*l_base_file_format == '\0')
@@ -815,7 +815,7 @@
fprintf(l_fp, "#\n");
fprintf(l_fp, "# if YUV format (or using parallel version), must provide width and height\n");
- fprintf(l_fp, "# YUV_SIZE widthxheight\n");
+ fprintf(l_fp, "# YUV_SIZE widthxheight\n");
fprintf(l_fp, "# this option is ignored if BASE_FILE_FORMAT is not YUV and you're running\n");
fprintf(l_fp, "# on just one machine\n");
fprintf(l_fp, "#\n");
@@ -835,13 +835,13 @@
fprintf(l_fp, "# Each occurrence of '*' will be replaced by the input file\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# e.g., if you have a bunch of GIF files, then this might be:\n");
- fprintf(l_fp, "# INPUT_CONVERT giftoppm *\n");
+ fprintf(l_fp, "# INPUT_CONVERT giftoppm *\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# e.g., if you have a bunch of files like a.Y a.U a.V, etc., then:\n");
- fprintf(l_fp, "# INPUT_CONVERT cat *.Y *.U *.V\n");
+ fprintf(l_fp, "# INPUT_CONVERT cat *.Y *.U *.V\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# e.g., if you are grabbing from laser disc you might have something like\n");
- fprintf(l_fp, "# INPUT_CONVERT goto frame *; grabppm\n");
+ fprintf(l_fp, "# INPUT_CONVERT goto frame *; grabppm\n");
fprintf(l_fp, "# 'INPUT_CONVERT *' means the files are already in the base file format\n");
fprintf(l_fp, "#\n");
@@ -862,17 +862,17 @@
fprintf(l_fp, "# later, will add more flexible GOP signalling\n");
fprintf(l_fp, "#\n");
- fprintf(l_fp, "GOP_SIZE %d\n", strlen(mp_ptr->pattern));
+ fprintf(l_fp, "GOP_SIZE %d\n", strlen(mp_ptr->pattern));
fprintf(l_fp, "# number of slices in a frame\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# 1 is a good number. another possibility is the number of macroblock rows\n");
fprintf(l_fp, "# (which is the height divided by 16)\n");
fprintf(l_fp, "#\n");
- fprintf(l_fp, "SLICES_PER_FRAME 1\n\n");
+ fprintf(l_fp, "SLICES_PER_FRAME 1\n\n");
fprintf(l_fp, "# directory to get all input files from (makes this file easier to read)\n");
- fprintf(l_fp, "INPUT_DIR %s\n", l_dirname_ptr);
+ fprintf(l_fp, "INPUT_DIR %s\n", l_dirname_ptr);
fprintf(l_fp, "# There are a bunch of ways to specify the input files.\n");
fprintf(l_fp, "# from a simple one-per-line listing, to the following\n");
@@ -901,22 +901,22 @@
fprintf(l_fp, "# Many of the remaining options have to do with the motion search and qscale\n\n");
fprintf(l_fp, "# FULL or HALF -- must be upper case\n");
- fprintf(l_fp, "PIXEL HALF\n\n");
+ fprintf(l_fp, "PIXEL HALF\n\n");
fprintf(l_fp, "# means +/- this many pixels for both P and B frame searches\n");
fprintf(l_fp, "# specify two numbers if you wish to serc different ranges in the two.\n");
- fprintf(l_fp, "RANGE 10\n");
+ fprintf(l_fp, "RANGE 10\n");
fprintf(l_fp, "# this must be one of {EXHAUSTIVE, SUBSAMPLE, LOGARITHMIC}\n");
- fprintf(l_fp, "PSEARCH_ALG %s\n\n", mp_ptr->psearch);
+ fprintf(l_fp, "PSEARCH_ALG %s\n\n", mp_ptr->psearch);
fprintf(l_fp, "# this must be one of {SIMPLE, CROSS2, EXHAUSTIVE}\n");
fprintf(l_fp, "#\n");
fprintf(l_fp, "# note that EXHAUSTIVE is really, really, really slow\n");
fprintf(l_fp, "#\n");
- fprintf(l_fp, "BSEARCH_ALG %s\n\n", mp_ptr->bsearch);
+ fprintf(l_fp, "BSEARCH_ALG %s\n\n", mp_ptr->bsearch);
fprintf(l_fp, "#\n");
fprintf(l_fp, "# these specify the q-scale for I, P, and B frames\n");
@@ -925,12 +925,12 @@
fprintf(l_fp, "# mode, and starting points (but not important) for constant bit rate\n");
fprintf(l_fp, "#\n");
- fprintf(l_fp, "IQSCALE %d\n", (int)mp_ptr->iqscale);
- fprintf(l_fp, "PQSCALE %d\n", (int)mp_ptr->pqscale);
- fprintf(l_fp, "BQSCALE %d\n\n", (int)mp_ptr->bqscale);
+ fprintf(l_fp, "IQSCALE %d\n", (int)mp_ptr->iqscale);
+ fprintf(l_fp, "PQSCALE %d\n", (int)mp_ptr->pqscale);
+ fprintf(l_fp, "BQSCALE %d\n\n", (int)mp_ptr->bqscale);
fprintf(l_fp, "# this must be ORIGINAL or DECODED\n");
- fprintf(l_fp, "REFERENCE_FRAME ORIGINAL\n\n");
+ fprintf(l_fp, "REFERENCE_FRAME ORIGINAL\n\n");
fprintf(l_fp, "# for parallel parameters see parallel.param in the exmaples subdirectory\n\n");
@@ -1103,7 +1103,7 @@
/* execute mpeg encoder startscript in an xterm window */
l_cmd = g_strdup_printf("xterm -e %s &", mp_par.startscript);
l_rc = system(l_cmd);
- g_free(l_cmd);
+ g_free(l_cmd);
if(l_rc != 0)
{
fprintf(stderr, "ERROR: could not execute mpeg_encode (not installed or not in PATH)");
@@ -1118,4 +1118,4 @@
return(l_rc);
-} /* end gap_mpeg_encode */
+} /* end gap_mpeg_encode */
Modified: trunk/gap/gap_name2layer_main.c
==============================================================================
--- trunk/gap/gap_name2layer_main.c (original)
+++ trunk/gap/gap_name2layer_main.c Sun Apr 5 06:47:07 2009
@@ -285,7 +285,7 @@
gimp_set_data (PLUG_IN_NAME, &glob_namlvals, sizeof (NamlValues));
}
values[0].data.d_status = status;
-} /* end run */
+} /* end run */
@@ -416,7 +416,7 @@
if(gap_debug) printf("p_Naml END layer_id: %d\n", (int)l_new_layer_id);
return l_new_layer_id;
-} /* end p_Naml */
+} /* end p_Naml */
/* ------------------
@@ -531,4 +531,4 @@
{
return -1;
}
-} /* end Naml_dialog */
+} /* end Naml_dialog */
Modified: trunk/gap/gap_navi_activtable.c
==============================================================================
--- trunk/gap/gap_navi_activtable.c (original)
+++ trunk/gap/gap_navi_activtable.c Sun Apr 5 06:47:07 2009
@@ -58,7 +58,7 @@
}
g_free(l_activtab);
}
-} /* end gap_navat_update_active_image */
+} /* end gap_navat_update_active_image */
/* ============================================================================
* gap_navat_set_active_image
@@ -107,7 +107,7 @@
gimp_set_data(GAP_NAVID_ACTIVE_IMAGE, l_activtab, l_nactivs * sizeof(t_gap_activdata));
g_free(l_activtab);
-} /* end gap_navat_set_active_image */
+} /* end gap_navat_set_active_image */
@@ -164,5 +164,5 @@
return (l_new_image_id);
-} /* end gap_navat_get_active_image */
+} /* end gap_navat_get_active_image */
Modified: trunk/gap/gap_navigator_dialog.c
==============================================================================
--- trunk/gap/gap_navigator_dialog.c (original)
+++ trunk/gap/gap_navigator_dialog.c Sun Apr 5 06:47:07 2009
@@ -498,9 +498,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
@@ -1380,12 +1380,12 @@
printf("navi_scroll_to_current_frame_nr: BEGIN timezoom:%d, item_height:%d\n"
" curr_frame_nr: %d dyn_topframenr: %d dyn_rows:%d dyn_adj: %d\n"
, (int)naviD->vin_ptr->timezoom
- , (int)naviD->item_height
- , (int)naviD->ainfo_ptr->curr_frame_nr
- , (int)naviD->dyn_topframenr
- , (int)naviD->dyn_rows
- , (int)adj_intval
- );
+ , (int)naviD->item_height
+ , (int)naviD->ainfo_ptr->curr_frame_nr
+ , (int)naviD->dyn_topframenr
+ , (int)naviD->dyn_rows
+ , (int)adj_intval
+ );
}
@@ -1595,7 +1595,7 @@
gtk_box_pack_start (GTK_BOX (naviD->image_combo_hbox)
, naviD->image_combo
- , TRUE, TRUE, 0);
+ , TRUE, TRUE, 0);
gtk_widget_show (naviD->image_combo);
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (naviD->image_combo),
@@ -1785,7 +1785,7 @@
, &l_th_width
, &l_th_height
, &l_th_data_count
- , &l_th_bpp
+ , &l_th_bpp
, &l_raw_thumb
))
@@ -2589,18 +2589,18 @@
if(gap_debug) printf("navi_render_preview: fetching THUMBNAILFILE for: %s\n", l_frame_filename);
if(l_frame_filename)
{
- /* init preferred width and height
- * (as hint for the thumbnail loader to decide
- * if thumbnail is to fetch from normal or large thumbnail directory
- * just for the case when both sizes are available)
- */
- l_th_width = naviD->preview_size;
- l_th_height = naviD->preview_size;
+ /* init preferred width and height
+ * (as hint for the thumbnail loader to decide
+ * if thumbnail is to fetch from normal or large thumbnail directory
+ * just for the case when both sizes are available)
+ */
+ l_th_width = naviD->preview_size;
+ l_th_height = naviD->preview_size;
gap_thumb_file_load_thumbnail(l_frame_filename
, &l_th_width
, &l_th_height
, &l_th_data_count
- , &l_th_bpp
+ , &l_th_bpp
, &l_th_data
);
}
@@ -3597,8 +3597,8 @@
{
printf("navi_dyn_adj_set_pos: adj_intval:%d topval:%d\n"
, (int)adj_intval
- , (int)topval
- );
+ , (int)topval
+ );
}
@@ -3997,13 +3997,13 @@
l_radio_pressed = (naviD->vin_ptr->active_layer_tracking == GAP_ACTIVE_LAYER_TRACKING_OFF);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Disable active layer tracking"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_acl_tracking_off_callback),
- naviD);
+ G_CALLBACK (p_acl_tracking_off_callback),
+ naviD);
l_idx = 1;
@@ -4020,13 +4020,13 @@
l_radio_pressed = (naviD->vin_ptr->active_layer_tracking == GAP_ACTIVE_LAYER_TRACKING_BY_NAME);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Enable tracking of the active layer by name at framechanges"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_acl_tracking_by_name_callback),
- naviD);
+ G_CALLBACK (p_acl_tracking_by_name_callback),
+ naviD);
l_idx = 2;
@@ -4044,13 +4044,13 @@
l_radio_pressed = (naviD->vin_ptr->active_layer_tracking == GAP_ACTIVE_LAYER_TRACKING_BY_STACKPOS);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Enable tracking of the active layer by stack position at framechanges"), NULL);
gtk_widget_show (radio_button);
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_acl_tracking_by_pos_callback),
- naviD);
+ G_CALLBACK (p_acl_tracking_by_pos_callback),
+ naviD);
gtk_box_pack_start (GTK_BOX (util_box), radio_table, FALSE, FALSE, 2);
gtk_widget_show (radio_table);
Modified: trunk/gap/gap_onion_base.c
==============================================================================
--- trunk/gap/gap_onion_base.c (original)
+++ trunk/gap/gap_onion_base.c Sun Apr 5 06:47:07 2009
@@ -370,7 +370,7 @@
break;
case GAP_ONION_REFMODE_BIDRIECTIONAL_DOUBLE:
l_sign *= -1; /* toggle sign between -1 and +1 */
- l_nr = 1 + ((l_nr -1) / 2);
+ l_nr = 1 + ((l_nr -1) / 2);
break;
case GAP_ONION_REFMODE_NORMAL:
l_sign = 1; /* normal mode: always force sign of +1 */
@@ -616,8 +616,8 @@
{
printf("gap_onion_image_has_oinonlayers: START only_visible: %d image_id: %d\n"
, (int)only_visible
- , (int)image_id
- );
+ , (int)image_id
+ );
}
l_has_onion = FALSE;
@@ -633,17 +633,17 @@
if(l_is_onion)
{
if (only_visible)
- {
- if(gimp_drawable_get_visible(l_layer_id))
- {
+ {
+ if(gimp_drawable_get_visible(l_layer_id))
+ {
l_has_onion = TRUE;
- break;
- }
- }
- else
+ break;
+ }
+ }
+ else
{
l_has_onion = TRUE;
- break;
+ break;
}
}
}
@@ -686,13 +686,13 @@
{
for(l_idx=0;l_idx < MIN(l_nlayers, l_dup_nlayers);l_idx++)
{
- l_layer_id = l_layers_list[l_idx];
- l_is_onion = gap_onion_base_check_is_onion_layer(l_layer_id);
+ l_layer_id = l_layers_list[l_idx];
+ l_is_onion = gap_onion_base_check_is_onion_layer(l_layer_id);
- if(l_is_onion)
- {
- gap_onion_base_mark_as_onionlayer(l_dup_layers_list[l_idx]);
- }
+ if(l_is_onion)
+ {
+ gap_onion_base_mark_as_onionlayer(l_dup_layers_list[l_idx]);
+ }
}
g_free(l_layers_list);
Modified: trunk/gap/gap_onion_dialog.c
==============================================================================
--- trunk/gap/gap_onion_dialog.c (original)
+++ trunk/gap/gap_onion_dialog.c Sun Apr 5 06:47:07 2009
@@ -995,8 +995,8 @@
NULL);
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (oni__combo_ref_mode),
0, /* initial gint value */
- G_CALLBACK (on_oni__combo_ref_mode),
- gpp);
+ G_CALLBACK (on_oni__combo_ref_mode),
+ gpp);
gtk_widget_show (oni__combo_ref_mode);
gtk_table_attach (GTK_TABLE (table1), oni__combo_ref_mode, 1, 3, tab1_row, tab1_row+1,
@@ -1004,10 +1004,10 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data(oni__combo_ref_mode
, _("Reference Modes determines stepsequence:\n"
- " normal: +1,+2,+3,+4,+5,+6\n"
- " bidirectional single: +1,-2,+3,-4,+5,-6\n"
- " bidirectional double: +1,-1,+2,-2,+3,-3\n"
- " (stepsize is set by frame reference parameter)")
+ " normal: +1,+2,+3,+4,+5,+6\n"
+ " bidirectional single: +1,-2,+3,-4,+5,-6\n"
+ " bidirectional double: +1,-1,+2,-2,+3,-3\n"
+ " (stepsize is set by frame reference parameter)")
, NULL);
@@ -1049,7 +1049,7 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data(oni__checkbutton_asc_opacity
, _("ON: Far neighbour frames have the higher opacity.\n"
- "OFF: Near neighbour frames have the higher opacity.")
+ "OFF: Near neighbour frames have the higher opacity.")
, NULL);
tab1_row++;
@@ -1077,7 +1077,7 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data(oni__spinbutton_ref_delta
, _("reference stepsize where -1 is previous frame, +1 is next frame."
- " (stepsequence is built together with reference mode parameter)")
+ " (stepsequence is built together with reference mode parameter)")
, NULL);
oni__checkbutton_ref_cycle = gtk_check_button_new_with_label (_("Cyclic"));
@@ -1123,7 +1123,7 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data(oni__checkbutton_stack_top
, _("ON: 0 is top of stack (in front).\n"
- "OFF: 0 is bottom of stack (in background).")
+ "OFF: 0 is bottom of stack (in background).")
, NULL);
tab1_row++;
@@ -1230,8 +1230,8 @@
NULL);
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (oni__combo_select_mode),
0, /* initial gint value */
- G_CALLBACK (on_oni__combo_select_mode),
- gpp);
+ G_CALLBACK (on_oni__combo_select_mode),
+ gpp);
gtk_widget_show (oni__combo_select_mode);
gtk_table_attach (GTK_TABLE (table2), oni__combo_select_mode, 1, 2, 2, 3,
@@ -1263,7 +1263,7 @@
gtk_box_pack_start (GTK_BOX (hbox2), oni__checkbutton_select_case, FALSE, TRUE, 0);
gimp_help_set_help_data(oni__checkbutton_select_case
, _("ON: Case sensitive pattern.\n"
- "OFF: Ignore case.")
+ "OFF: Ignore case.")
, NULL);
oni__checkbutton_select_invert = gtk_check_button_new_with_label (_("Invert Selection"));
@@ -1271,7 +1271,7 @@
gtk_box_pack_start (GTK_BOX (hbox2), oni__checkbutton_select_invert, FALSE, TRUE, 0);
gimp_help_set_help_data(oni__checkbutton_select_invert
, _("ON: Select non-matching layers.\n"
- "OFF: Select matching layers")
+ "OFF: Select matching layers")
, NULL);
label6 = gtk_label_new (_("Select Pattern:"));
Modified: trunk/gap/gap_onion_main.c
==============================================================================
--- trunk/gap/gap_onion_main.c (original)
+++ trunk/gap/gap_onion_main.c Sun Apr 5 06:47:07 2009
@@ -64,9 +64,9 @@
static void query(void);
static void run(const gchar *name
, gint n_params
- , const GimpParam *param
+ , const GimpParam *param
, gint *nreturn_vals
- , GimpParam **return_vals);
+ , GimpParam **return_vals);
GimpPlugInInfo PLUG_IN_INFO =
{
Modified: trunk/gap/gap_pdb_calls.c
==============================================================================
--- trunk/gap/gap_pdb_calls.c (original)
+++ trunk/gap/gap_pdb_calls.c Sun Apr 5 06:47:07 2009
@@ -105,7 +105,7 @@
*/
// gimp_procedural_db_query
gimp_procedural_db_query (".*", ".*", ".*", ".*", ".*", ".*", ".*",
- &num_procs, &proc_list);
+ &num_procs, &proc_list);
initialized = TRUE;
@@ -124,9 +124,9 @@
for (loop = 0; loop < num_procs; loop++)
{
if(strcmp(search_name, proc_list[loop]) == 0)
- {
+ {
found = TRUE;
- break; /* stop at 1st match */
+ break; /* stop at 1st match */
}
}
}
@@ -166,16 +166,16 @@
* regarding a particular procedure.
*/
if (gimp_procedural_db_proc_info (proc_name,
- &l_proc_blurb,
- &l_proc_help,
- &l_proc_author,
- &l_proc_copyright,
- &l_proc_date,
- &l_proc_type,
- &l_nparams,
- &l_nreturn_vals,
- &l_params,
- &l_return_vals))
+ &l_proc_blurb,
+ &l_proc_help,
+ &l_proc_author,
+ &l_proc_copyright,
+ &l_proc_date,
+ &l_proc_type,
+ &l_nparams,
+ &l_nreturn_vals,
+ &l_params,
+ &l_return_vals))
{
/* procedure found in PDB */
return (l_nparams);
@@ -183,7 +183,7 @@
printf("Warning: Procedure %s not found.\n", proc_name);
return -1;
-} /* end gap_pdb_procedure_available */
+} /* end gap_pdb_procedure_available */
/* ---------------------- PDB procedure calls -------------------------- */
@@ -207,12 +207,12 @@
return(gimp_drawable_transform_rotate_default(drawable_id
, l_angle_rad
- , FALSE /* auto_center */
- , 0 /* center_x */
- , 0 /* center_y */
- , interpolation
- , FALSE /* clip_results */
- ));
+ , FALSE /* auto_center */
+ , 0 /* center_x */
+ , 0 /* center_y */
+ , interpolation
+ , FALSE /* clip_results */
+ ));
} /* end gap_pdb_gimp_rotate_degree */
@@ -250,7 +250,7 @@
, p_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
-} /* end gap_pdb_gimp_displays_reconnect */
+} /* end gap_pdb_gimp_displays_reconnect */
@@ -289,7 +289,7 @@
);
return(-1);
-} /* end gap_pdb_gimp_layer_new_from_drawable */
+} /* end gap_pdb_gimp_layer_new_from_drawable */
/* ============================================================================
* gap_pdb_gimp_file_save_thumbnail
@@ -309,7 +309,7 @@
return_vals = gimp_run_procedure (l_called_proc,
&nreturn_vals,
GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_STRING, filename,
+ GIMP_PDB_STRING, filename,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@@ -321,13 +321,13 @@
gimp_destroy_params(return_vals, nreturn_vals);
printf("GAP: Error: PDB call of %s failed on file: %s (image_id:%d), d_status:%d %s\n"
, l_called_proc
- , filename
- , (int)image_id
+ , filename
+ , (int)image_id
, (int)return_vals[0].data.d_status
, p_status_to_string(return_vals[0].data.d_status)
- );
+ );
return(FALSE);
-} /* end gap_pdb_gimp_file_save_thumbnail */
+} /* end gap_pdb_gimp_file_save_thumbnail */
/* ============================================================================
@@ -338,7 +338,7 @@
gboolean
gap_pdb_gimp_image_thumbnail(gint32 image_id, gint32 width, gint32 height,
gint32 *th_width, gint32 *th_height, gint32 *th_bpp,
- gint32 *th_data_count, unsigned char **th_data)
+ gint32 *th_data_count, unsigned char **th_data)
{
static char *l_called_proc = "gimp_image_thumbnail";
GimpParam *return_vals;
@@ -361,9 +361,9 @@
workaround:
return_vals = gimp_run_procedure (l_called_proc,
&nreturn_vals,
- GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_INT32, width,
- GIMP_PDB_INT32, height,
+ GIMP_PDB_IMAGE, image_id,
+ GIMP_PDB_INT32, width,
+ GIMP_PDB_INT32, height,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@@ -415,4 +415,4 @@
, p_status_to_string(return_vals[0].data.d_status)
);
return(FALSE);
-} /* end gap_pdb_gimp_image_thumbnail */
+} /* end gap_pdb_gimp_image_thumbnail */
Modified: trunk/gap/gap_pdb_calls.h
==============================================================================
--- trunk/gap/gap_pdb_calls.h (original)
+++ trunk/gap/gap_pdb_calls.h Sun Apr 5 06:47:07 2009
@@ -51,7 +51,7 @@
gboolean gap_pdb_gimp_image_thumbnail(gint32 image_id, gint32 width, gint32 height,
gint32 *th_width, gint32 *th_height, gint32 *th_bpp,
- gint32 *th_data_count, unsigned char **th_data);
+ gint32 *th_data_count, unsigned char **th_data);
gboolean gap_pdb_procedure_name_available (const gchar *search_name);
#endif
Modified: trunk/gap/gap_player_dialog.h
==============================================================================
--- trunk/gap/gap_player_dialog.h (original)
+++ trunk/gap/gap_player_dialog.h Sun Apr 5 06:47:07 2009
@@ -36,22 +36,22 @@
void gap_player_dlg_cleanup(GapPlayerMainGlobalParams *gpp);
void gap_player_dlg_restart(GapPlayerMainGlobalParams *gpp
, gboolean autostart
- , gint32 image_id
- , char *imagename
- , gint32 imagewidth
- , gint32 imageheight
- , GapStoryBoard *stb_ptr
- , gint32 begin_frame
- , gint32 end_frame
- , gboolean play_selection_only
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- , gboolean force_open_as_video
+ , gint32 image_id
+ , char *imagename
+ , gint32 imagewidth
+ , gint32 imageheight
+ , GapStoryBoard *stb_ptr
+ , gint32 begin_frame
+ , gint32 end_frame
+ , gboolean play_selection_only
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ , gboolean force_open_as_video
, gint32 flip_request
, gint32 flip_status
, gint32 stb_in_track
- );
+ );
void gap_player_dlg_playback_dialog(GapPlayerMainGlobalParams *gpp);
Modified: trunk/gap/gap_player_main.c
==============================================================================
--- trunk/gap/gap_player_main.c (original)
+++ trunk/gap/gap_player_main.c Sun Apr 5 06:47:07 2009
@@ -367,16 +367,16 @@
gpp->pv_pixelsize = MAX(gpp->pv_width, gpp->pv_height);
gpp->audio_enable = (gboolean) param[14].data.d_int32;
- if(param[15].data.d_string)
- {
+ if(param[15].data.d_string)
+ {
g_snprintf(gpp->audio_filename, sizeof(gpp->audio_filename), "%s"
- , param[15].data.d_string);
- }
- else
- {
+ , param[15].data.d_string);
+ }
+ else
+ {
gpp->audio_filename[0] = '\0';
- gpp->audio_enable = FALSE;
- }
+ gpp->audio_enable = FALSE;
+ }
gpp->audio_frame_offset = (gint) param[16].data.d_int32;
gpp->audio_volume = (gdouble) param[17].data.d_float;
}
@@ -416,4 +416,4 @@
gimp_set_data (PLUG_IN_NAME, gpp, sizeof (GapPlayerMainGlobalParams));
}
values[0].data.d_status = status;
-} /* end run */
+} /* end run */
Modified: trunk/gap/gap_pview_da.c
==============================================================================
--- trunk/gap/gap_pview_da.c (original)
+++ trunk/gap/gap_pview_da.c Sun Apr 5 06:47:07 2009
@@ -192,8 +192,8 @@
, pv_ptr->pv_width * pv_ptr->pv_bpp /* rowstride */
, NULL /* GdkPixbufDestroyNotify NULL: dont call destroy_fn */
, pv_ptr->pv_area_data /* gpointer destroy_fn_data */
- );
-
+ );
+
/* clear flag to let gap_pview_repaint procedure know
* to use the pixbuf rather than pv_area_data or pixmap for refresh
*/
@@ -223,15 +223,15 @@
if(pv_ptr->pv_desaturated_area_data)
{
gdk_draw_rgb_image ( pv_ptr->da_widget->window
- , pv_ptr->da_widget->style->white_gc
- , 0
- , 0
- , pv_ptr->pv_width
- , pv_ptr->pv_height
- , GDK_RGB_DITHER_NORMAL
- , pv_ptr->pv_desaturated_area_data
- , pv_ptr->pv_width * 3
- );
+ , pv_ptr->da_widget->style->white_gc
+ , 0
+ , 0
+ , pv_ptr->pv_width
+ , pv_ptr->pv_height
+ , GDK_RGB_DITHER_NORMAL
+ , pv_ptr->pv_desaturated_area_data
+ , pv_ptr->pv_width * 3
+ );
}
} /* end p_pview_repaint_desaturated */
@@ -562,7 +562,7 @@
}
gdk_draw_pixbuf(
pv_ptr->da_widget->window
- , pv_ptr->da_widget->style->white_gc
+ , pv_ptr->da_widget->style->white_gc
, pv_ptr->pixbuf
, 0 /* gint src_x */
, 0 /* gint src_y */
@@ -573,7 +573,7 @@
, GDK_RGB_DITHER_NORMAL
, 0 /* gint x_dither_offset */
, 0 /* gint y_dither_offset */
- );
+ );
return;
}
@@ -594,15 +594,15 @@
}
}
gdk_draw_rgb_image ( pv_ptr->da_widget->window
- , pv_ptr->da_widget->style->white_gc
- , 0
- , 0
- , pv_ptr->pv_width
- , pv_ptr->pv_height
- , GDK_RGB_DITHER_NORMAL
- , pv_ptr->pv_area_data
- , pv_ptr->pv_width * 3
- );
+ , pv_ptr->da_widget->style->white_gc
+ , 0
+ , 0
+ , pv_ptr->pv_width
+ , pv_ptr->pv_height
+ , GDK_RGB_DITHER_NORMAL
+ , pv_ptr->pv_area_data
+ , pv_ptr->pv_width * 3
+ );
return;
}
@@ -654,7 +654,7 @@
, gint src_bpp
, gboolean allow_grab_src_data
, gint32 flip_request
- , gint32 flip_status
+ , gint32 flip_status
)
{
register guchar *src, *dest;
@@ -811,49 +811,49 @@
{
src = &src_row[ pv_ptr->src_col[col] ];
alpha = src[ofs_alpha];
- if(alpha > 244)
- {
- /* copy full (or nearly full opaque) pixels 1:1
- * without MIXING with checkerboard background.
- * (speeds up rendering of opaque pixels)
- */
+ if(alpha > 244)
+ {
+ /* copy full (or nearly full opaque) pixels 1:1
+ * without MIXING with checkerboard background.
+ * (speeds up rendering of opaque pixels)
+ */
*(dest++) = src[0];
*(dest++) = src[ofs_green];
*(dest++) = src[ofs_blue];
- }
- else
- {
+ }
+ else
+ {
if(((col+ii) / pv_ptr->pv_check_size) & 1)
{
- if(alpha < 10)
- {
- *(dest++) = PREVIEW_BG_GRAY1;
- *(dest++) = PREVIEW_BG_GRAY1;
- *(dest++) = PREVIEW_BG_GRAY1;
- }
- else
- {
- *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[0], alpha);
- *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[ofs_green], alpha);
- *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[ofs_blue], alpha);
- }
+ if(alpha < 10)
+ {
+ *(dest++) = PREVIEW_BG_GRAY1;
+ *(dest++) = PREVIEW_BG_GRAY1;
+ *(dest++) = PREVIEW_BG_GRAY1;
+ }
+ else
+ {
+ *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[0], alpha);
+ *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[ofs_green], alpha);
+ *(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY1, src[ofs_blue], alpha);
+ }
}
else
{
- if(alpha < 10)
- {
- *(dest++) = PREVIEW_BG_GRAY2;
- *(dest++) = PREVIEW_BG_GRAY2;
- *(dest++) = PREVIEW_BG_GRAY2;
- }
- else
- {
+ if(alpha < 10)
+ {
+ *(dest++) = PREVIEW_BG_GRAY2;
+ *(dest++) = PREVIEW_BG_GRAY2;
+ *(dest++) = PREVIEW_BG_GRAY2;
+ }
+ else
+ {
*(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY2, src[0], alpha);
*(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY2, src[ofs_green], alpha);
*(dest++) = MIX_CHANNEL (PREVIEW_BG_GRAY2, src[ofs_blue], alpha);
- }
+ }
}
- }
+ }
}
}
}
@@ -908,7 +908,7 @@
{
printf("gap_pview_render_f_from_image: have no image, cant render image_id:%d\n"
,(int)image_id
- );
+ );
}
return;
}
@@ -957,12 +957,12 @@
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0
, drawable->width, drawable->height
- , FALSE /* dirty */
- , FALSE /* shadow */
- );
+ , FALSE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_get_rect (&pixel_rgn, frame_data
, 0
- , 0
+ , 0
, drawable->width
, drawable->height);
@@ -977,7 +977,7 @@
, drawable->bpp
, TRUE /* allow_grab_src_data */
, flip_request
- , flip_status
+ , flip_status
);
@@ -1015,8 +1015,8 @@
gap_pview_render_f_from_image(pv_ptr
, dup_image_id
, flip_request
- , flip_status
- );
+ , flip_status
+ );
gimp_image_delete(dup_image_id);
} /* end gap_pview_render_f_from_image_duplicate */
@@ -1196,7 +1196,7 @@
/* scale and flatten the pixbuf */
pv_ptr->pixbuf = gdk_pixbuf_composite_color_simple(
- src_pixbuf
+ src_pixbuf
, (int) pv_ptr->pv_width
, (int) pv_ptr->pv_height
, GDK_INTERP_NEAREST
@@ -1204,7 +1204,7 @@
, (int)l_check_size /* power of 2 required */
, PREVIEW_BG_GRAY1_GDK
, PREVIEW_BG_GRAY2_GDK
- );
+ );
if(gap_debug)
{
int nchannels;
@@ -1296,13 +1296,13 @@
gap_pview_render_f_from_buf(pv_ptr
, pix_data
- , width
- , height
- , nchannels
- , FALSE /* DONT allow_grab_src_data */
+ , width
+ , height
+ , nchannels
+ , FALSE /* DONT allow_grab_src_data */
, flip_request
, flip_status
- );
+ );
}
@@ -1394,7 +1394,7 @@
{
size_t pixel_data_size = pv_ptr->pv_height * pv_ptr->pv_width * pv_ptr->pv_bpp;
pixel_data_copy = g_new ( guchar, pixel_data_size );
- memcpy(pixel_data_copy, pixel_data_src, pixel_data_size);
+ memcpy(pixel_data_copy, pixel_data_src, pixel_data_size);
return(gdk_pixbuf_new_from_data(
pixel_data_copy
@@ -1406,7 +1406,7 @@
, rowstride
, (GdkPixbufDestroyNotify)p_pixmap_data_destructor /* destroy_fn */
, pixel_data_copy /* gpointer destroy_fn_data */
- ));
+ ));
}
return (NULL);
} /* end gap_pview_get_repaint_pixbuf */
@@ -1481,7 +1481,7 @@
{
size_t pixel_data_size = pv_ptr->pv_height * pv_ptr->pv_width * pv_ptr->pv_bpp;
pixel_data_copy = g_new ( guchar, pixel_data_size );
- memcpy(pixel_data_copy, pixel_data_src, pixel_data_size);
+ memcpy(pixel_data_copy, pixel_data_src, pixel_data_size);
*th_size = width * height * pv_ptr->pv_bpp;
*th_width = width;
Modified: trunk/gap/gap_range_ops.c
==============================================================================
--- trunk/gap/gap_range_ops.c (original)
+++ trunk/gap/gap_range_ops.c Sun Apr 5 06:47:07 2009
@@ -267,7 +267,7 @@
return -1;
}
-} /* end p_anim_sizechange_dialog */
+} /* end p_anim_sizechange_dialog */
/* ============================================================================
@@ -284,7 +284,7 @@
p_range_dialog(GapAnimInfo *ainfo_ptr,
long *range_from, long *range_to,
char *title, char *hline, gint cnt,
- const char *help_id)
+ const char *help_id)
{
static GapArrArg argv[4];
gint argc;
@@ -350,7 +350,7 @@
return -1;
}
-} /* end p_range_dialog */
+} /* end p_range_dialog */
/* ============================================================================
* p_convert_indexed_dialog
@@ -362,21 +362,21 @@
*/
static long
p_convert_indexed_dialog(gint32 *dest_colors, gint32 *dest_dither,
- gint32 *palette_type, gint32 *alpha_dither, gint32 *remove_unused,
+ gint32 *palette_type, gint32 *alpha_dither, gint32 *remove_unused,
char *palette, gint len_palette)
{
#define ARGC_INDEXED 6
static GapArrArg argv[ARGC_INDEXED];
static char *radio_paltype[4] = { N_("Generate Optimal Palette")
, N_("WEB Palette")
- , N_("Use Custom Palette")
- , N_("Use Black/White (1-Bit) Palette")
- };
+ , N_("Use Custom Palette")
+ , N_("Use Black/White (1-Bit) Palette")
+ };
static char *radio_dither[4] = { N_("Floyd-Steinberg Color Dithering (Normal)")
, N_("Floyd-Steinberg Color Dithering (Reduced Color Bleeding)")
- , N_("Positioned Color Dithering")
+ , N_("Positioned Color Dithering")
, N_("No Color Dithering")
- };
+ };
static int gettextize_loop = 0;
for (;gettextize_loop < 4; gettextize_loop++)
@@ -485,7 +485,7 @@
GimpImageBaseType *dest_type, gint32 *dest_colors, gint32 *dest_dither,
char *basename, gint len_base,
char *extension, gint len_ext,
- gint32 *palette_type, gint32 *alpha_dither, gint32 *remove_unused,
+ gint32 *palette_type, gint32 *alpha_dither, gint32 *remove_unused,
char *palette, gint len_palette)
{
static GapArrArg argv[8];
@@ -530,9 +530,9 @@
argv[4].label_txt = _("Extension:");
argv[4].help_txt = _("The extension of resulting frames is also used to define the fileformat. "
"Please note that fileformats differ in capabilities to store information for "
- "multiple layers and other things. "
- "Some fileformats may require converting to another imagetype "
- "and/or flattening the frames.");
+ "multiple layers and other things. "
+ "Some fileformats may require converting to another imagetype "
+ "and/or flattening the frames.");
argv[4].text_buf_len = len_ext;
argv[4].text_buf_ret = extension;
@@ -541,7 +541,7 @@
argv[5].label_txt = _("Imagetype:");
argv[5].help_txt = _("Convert to another imagetype, or keep imagetype as it is. "
"Most fileformats can't handle all types and may require a conversion."
- "Example: GIF can not handle RGB and requires convert to indexed imagetype.");
+ "Example: GIF can not handle RGB and requires convert to indexed imagetype.");
argv[5].radio_argc = 4;
argv[5].radio_argv = radio_args;
argv[5].radio_ret = 0;
@@ -550,7 +550,7 @@
argv[6].label_txt = _("Flatten:");
argv[6].help_txt = _("Flatten all resulting frames. Most fileformats can not handle multiple layers "
"and need flattened frames (flattening does melt down all layers to one composite layer)."
- "Example: JPEG can not handle multiple layers and requires flattened frames.");
+ "Example: JPEG can not handle multiple layers and requires flattened frames.");
argv[6].int_ret = 1;
gap_arr_arg_init(&argv[7], GAP_ARR_WGT_HELP_BUTTON);
@@ -576,7 +576,7 @@
*dest_type = GIMP_INDEXED;
break;
default:
- *dest_type = 9444; /* huh ?? */
+ *dest_type = 9444; /* huh ?? */
break;
}
*flatten = (long)(argv[6].int_ret);
@@ -591,16 +591,16 @@
{
/* Open a 2.nd dialog for the Dither Options */
if(0 != p_convert_indexed_dialog(dest_colors,
- dest_dither,
- palette_type,
- alpha_dither,
- remove_unused,
- palette,
- len_palette
- ))
- {
+ dest_dither,
+ palette_type,
+ alpha_dither,
+ remove_unused,
+ palette,
+ len_palette
+ ))
+ {
return -1;
- }
+ }
}
if(0 != gap_lib_chk_framechange(ainfo_ptr))
@@ -613,7 +613,7 @@
{
return -1;
}
-} /* end p_convert_dialog */
+} /* end p_convert_dialog */
/* ============================================================================
* p_range_to_multilayer_dialog
@@ -631,9 +631,9 @@
long *framrate, char *frame_basename, gint len_frame_basename,
char *title, char *hline,
- gint32 *layersel_mode, gint32 *layersel_case,
- gint32 *sel_invert, char *sel_pattern,
- gint32 *selection_mode)
+ gint32 *layersel_mode, gint32 *layersel_case,
+ gint32 *sel_invert, char *sel_pattern,
+ gint32 *selection_mode)
{
static GapArrArg argv[13];
int argc;
@@ -673,11 +673,11 @@
static char *selection_help[3] = { N_("Pick layers at full size. "
"Ignore all pixel selections in all frames"),
N_("Pick only the selected pixels. "
- "Use the selection from the invoking frame "
- "as fixed selection in all handled frames."),
+ "Use the selection from the invoking frame "
+ "as fixed selection in all handled frames."),
N_("Pick only the selected pixels. "
- "Use the individual selection "
- "as it is in each handled frame.")
+ "Use the individual selection "
+ "as it is in each handled frame.")
};
static int gettextize_radio = 0, gettextize_layersel = 0, gettextize_sel = 0;
@@ -758,7 +758,7 @@
argv[7].label_txt = _("Layer Pattern:");
argv[7].entry_width = 140; /* pixel */
argv[7].help_txt = _("String to identify layer(s) by name or by layerstack position numbers. "
- "Example: 0,3-5");
+ "Example: 0,3-5");
argv[7].text_buf_len = MAX_LAYERNAME;
argv[7].text_buf_ret = sel_pattern;
@@ -822,7 +822,7 @@
return -1;
}
-} /* end p_range_to_multilayer_dialog */
+} /* end p_range_to_multilayer_dialog */
/* ============================================================================
@@ -836,9 +836,9 @@
long range_from, long range_to,
long flatten_mode, long bg_visible,
long framerate, char *frame_basename,
- gint32 layersel_mode, gint32 layersel_case,
- gint32 sel_invert, char *sel_pattern,
- gint32 selection_mode)
+ gint32 layersel_mode, gint32 layersel_case,
+ gint32 sel_invert, char *sel_pattern,
+ gint32 selection_mode)
{
GimpImageBaseType l_type;
guint l_width, l_height;
@@ -946,7 +946,7 @@
/* copy the initial selection to the newly create image */
gap_layer_copy_content(l_new_selection_channel_id /* dst_drawable_id */
, l_initial_selection_channel_id /* src_drawable_id */
- );
+ );
/* invert the (copied initial selection) in the newly create image */
gimp_selection_invert(l_new_image_id);
@@ -1009,10 +1009,10 @@
{
/* set BG_Layer invisible */
gimp_drawable_set_visible(l_tmp_layer_id, FALSE);
- if(l_layli_ptr[l_vidx].selected)
- {
- l_nvisible--;
- }
+ if(l_layli_ptr[l_vidx].selected)
+ {
+ l_nvisible--;
+ }
}
}
@@ -1056,7 +1056,7 @@
if(!gimp_selection_is_empty(l_tmp_image_id))
{
gimp_selection_invert(l_tmp_image_id);
- gimp_edit_clear(l_tmp_layer_id);
+ gimp_edit_clear(l_tmp_layer_id);
}
}
@@ -1075,9 +1075,9 @@
gimp_layer_set_offsets(l_cp_layer_id, l_src_offset_x, l_src_offset_y);
if(l_clear_selected_area)
- {
- gimp_edit_clear(l_cp_layer_id);
- }
+ {
+ gimp_edit_clear(l_cp_layer_id);
+ }
l_nlayers_result++;
@@ -1091,8 +1091,8 @@
if (frame_basename == NULL) frame_basename = "frame_[######]";
if (*frame_basename == '\0') frame_basename = "frame_[######]";
- gap_match_substitute_framenr(&l_layername[0], sizeof(l_layername),
- frame_basename, (long)l_cur_frame_nr);
+ gap_match_substitute_framenr(&l_layername[0], sizeof(l_layername),
+ frame_basename, (long)l_cur_frame_nr);
gimp_drawable_set_name(l_cp_layer_id, &l_layername[0]);
gimp_drawable_set_visible(l_cp_layer_id, l_visible);
@@ -1124,7 +1124,7 @@
error:
gimp_image_delete(l_new_image_id);
return -1;
-} /* end p_frames_to_multilayer */
+} /* end p_frames_to_multilayer */
@@ -1136,10 +1136,10 @@
long range_from, long range_to,
long flatten_mode, long bg_visible,
long framerate,
- char *frame_basename, int frame_basename_len,
- gint32 layersel_mode, gint32 layersel_case,
- gint32 sel_invert, char *sel_pattern,
- gint32 selection_mode)
+ char *frame_basename, int frame_basename_len,
+ gint32 layersel_mode, gint32 layersel_case,
+ gint32 sel_invert, char *sel_pattern,
+ gint32 selection_mode)
{
gint32 new_image_id;
gint32 l_rc;
@@ -1162,13 +1162,13 @@
{
if(run_mode == GIMP_RUN_INTERACTIVE)
{
- l_framerate = 24.0;
+ l_framerate = 24.0;
vin_ptr = gap_vin_get_all(ainfo_ptr->basename);
if(vin_ptr)
- {
- if(vin_ptr->framerate > 0) l_framerate = vin_ptr->framerate;
- g_free(vin_ptr);
- }
+ {
+ if(vin_ptr->framerate > 0) l_framerate = vin_ptr->framerate;
+ g_free(vin_ptr);
+ }
g_snprintf(frame_basename, frame_basename_len, "frame_[######] (%dms)", (int)(1000/l_framerate));
framerate = 0;
l_rc = p_range_to_multilayer_dialog (ainfo_ptr, &l_from, &l_to,
@@ -1176,23 +1176,23 @@
&framerate, frame_basename, frame_basename_len,
_("Frames to Image"),
_("Create Multilayer-Image from Frames"),
- &l_layersel_mode, &layersel_case,
- &sel_invert, &l_sel_pattern[0],
- &l_selection_mode
- );
+ &l_layersel_mode, &layersel_case,
+ &sel_invert, &l_sel_pattern[0],
+ &l_selection_mode
+ );
}
else
{
l_from = range_from;
l_to = range_to;
l_rc = 0;
- l_layersel_mode = layersel_mode;
- l_layersel_case = layersel_case;
- l_sel_invert = sel_invert;
- l_selection_mode = selection_mode;
+ l_layersel_mode = layersel_mode;
+ l_layersel_case = layersel_case;
+ l_sel_invert = sel_invert;
+ l_selection_mode = selection_mode;
strncpy(&l_sel_pattern[0], sel_pattern, sizeof(l_sel_pattern) -1);
- l_sel_pattern[sizeof(l_sel_pattern) -1] = '\0';
+ l_sel_pattern[sizeof(l_sel_pattern) -1] = '\0';
}
if(l_rc >= 0)
@@ -1200,9 +1200,9 @@
new_image_id = p_frames_to_multilayer(ainfo_ptr, l_from, l_to,
flatten_mode, bg_visible,
framerate, frame_basename,
- l_layersel_mode, layersel_case,
- sel_invert, &l_sel_pattern[0],
- l_selection_mode);
+ l_layersel_mode, layersel_case,
+ sel_invert, &l_sel_pattern[0],
+ l_selection_mode);
gimp_display_new(new_image_id);
l_rc = new_image_id;
}
@@ -1211,7 +1211,7 @@
}
return(l_rc);
-} /* end gap_range_to_multilayer */
+} /* end gap_range_to_multilayer */
/* ============================================================================
* p_type_convert
@@ -1220,7 +1220,7 @@
*/
static int
p_type_convert(gint32 image_id, GimpImageBaseType dest_type, gint32 dest_colors, gint32 dest_dither,
- gint32 palette_type, gint32 alpha_dither, gint32 remove_unused, char *palette)
+ gint32 palette_type, gint32 alpha_dither, gint32 remove_unused, char *palette)
{
gboolean l_rc;
gboolean l_alpha_dither;
@@ -1280,7 +1280,7 @@
if (l_rc) return 0;
return -1;
-} /* end p_type_convert */
+} /* end p_type_convert */
/* ============================================================================
* p_frames_convert
@@ -1305,7 +1305,7 @@
char *save_proc_name, char *new_basename, char *new_extension,
int flatten,
GimpImageBaseType dest_type, gint32 dest_colors, gint32 dest_dither,
- gint32 palette_type, gint32 alpha_dither, gint32 remove_unused, char *palette)
+ gint32 palette_type, gint32 alpha_dither, gint32 remove_unused, char *palette)
{
GimpRunMode l_run_mode;
gint32 l_tmp_image_id;
@@ -1398,33 +1398,33 @@
if(gap_debug) fprintf(stderr, "DEBUG: p_frames_convert flatten tmp image'\n");
/* hof:
- * we add dummy layers to make sure that flatten works on any kind of image.
- * even if the image had no layer at all, or all its layers were invisible.
- * (flatten need at least 2 layers and at least one visible layer to work.
- * if just invisible layers are flattened
- * we do not get a resulting layer (returned l_layer_id == -1)
- */
+ * we add dummy layers to make sure that flatten works on any kind of image.
+ * even if the image had no layer at all, or all its layers were invisible.
+ * (flatten need at least 2 layers and at least one visible layer to work.
+ * if just invisible layers are flattened
+ * we do not get a resulting layer (returned l_layer_id == -1)
+ */
l_dummy_layer_id = gimp_layer_new(l_tmp_image_id, "dummy",
1,
- 1,
- ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
+ 1,
+ ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
gimp_image_add_layer(l_tmp_image_id, l_dummy_layer_id, 0);
- gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
+ gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
- if(l_nlayers == 0)
- {
- /* on empty images we need 2 dummies to make flatten happy */
+ if(l_nlayers == 0)
+ {
+ /* on empty images we need 2 dummies to make flatten happy */
l_dummy_layer_id = gimp_layer_new(l_tmp_image_id, "dummy2",
1,
- 1,
- ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
+ 1,
+ ((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
gimp_image_add_layer(l_tmp_image_id, l_dummy_layer_id, 0);
- gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
- }
+ gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
+ }
/* flatten current frame image (reduce to single layer) */
@@ -1443,7 +1443,7 @@
{
/* have to convert to desired type (RGB, INDEXED, GRAYSCALE) */
p_type_convert(l_tmp_image_id, dest_type, dest_colors, dest_dither,
- palette_type, alpha_dither, remove_unused, palette);
+ palette_type, alpha_dither, remove_unused, palette);
}
@@ -1486,8 +1486,8 @@
if(l_rc < 0)
{
gap_arr_msg_win(ainfo_ptr->run_mode, _("Convert Frames: Save operation failed.\n"
- "Desired save plugin can't handle type\n"
- "or desired save plugin not available."));
+ "Desired save plugin can't handle type\n"
+ "or desired save plugin not available."));
}
}
if(l_run_mode == GIMP_RUN_INTERACTIVE)
@@ -1537,7 +1537,7 @@
return l_rc;
-} /* end p_frames_convert */
+} /* end p_frames_convert */
@@ -1584,7 +1584,7 @@
if(l_rc) return 0;
return -1;
-} /* end p_image_sizechange */
+} /* end p_image_sizechange */
/* ============================================================================
* p_anim_sizechange
@@ -1682,7 +1682,7 @@
} /* end while loop over all frames*/
return l_rc;
-} /* end p_anim_sizechange */
+} /* end p_anim_sizechange */
@@ -1714,7 +1714,7 @@
l_rc = p_range_dialog (ainfo_ptr, &l_from, &l_to,
_("Flatten Frames"),
_("Select Frame Range"), 2,
- GAP_HELP_ID_FLATTEN);
+ GAP_HELP_ID_FLATTEN);
}
else
@@ -1748,7 +1748,7 @@
return -1;
}
return(l_rc);
-} /* end gap_range_flatten */
+} /* end gap_range_flatten */
@@ -1871,7 +1871,7 @@
return l_rc;
-} /* end p_frames_layer_del */
+} /* end p_frames_layer_del */
/* ============================================================================
@@ -1902,7 +1902,7 @@
l_rc = p_range_dialog (ainfo_ptr, &l_from, &l_to,
_("Delete Layers in Frames"),
_("Select Frame Range & Stack Position"), 3,
- GAP_HELP_ID_LAYER_DEL);
+ GAP_HELP_ID_LAYER_DEL);
l_position = l_rc;
}
@@ -1938,7 +1938,7 @@
return -1;
}
return(l_rc);
-} /* end gap_range_layer_del */
+} /* end gap_range_layer_del */
/* ============================================================================
@@ -1961,7 +1961,7 @@
gint32 palette_type,
gint32 alpha_dither,
gint32 remove_unused,
- char *palette)
+ char *palette)
{
gint32 l_rc;
long l_from, l_to;
@@ -2000,13 +2000,13 @@
/* p_convert_dialog : select destination type
* to find out extension
*/
- strcpy(l_palette, "Default");
+ strcpy(l_palette, "Default");
l_rc = p_convert_dialog (ainfo_ptr, &l_from, &l_to, &l_flatten,
&l_dest_type, &l_dest_colors, &l_dest_dither,
&l_basename[0], sizeof(l_basename),
&l_extension[0], sizeof(l_extension),
- &l_palette_type, &l_alpha_dither, &l_remove_unused,
- &l_palette[0], sizeof(l_palette));
+ &l_palette_type, &l_alpha_dither, &l_remove_unused,
+ &l_palette[0], sizeof(l_palette));
}
else
@@ -2051,10 +2051,10 @@
l_dest_type,
l_dest_colors,
l_dest_dither,
- l_palette_type,
- l_alpha_dither,
- l_remove_unused,
- l_palette);
+ l_palette_type,
+ l_alpha_dither,
+ l_remove_unused,
+ l_palette);
g_free(l_basename_ptr);
if((l_rc >= 0) && (run_mode == GIMP_RUN_INTERACTIVE))
{
@@ -2067,7 +2067,7 @@
}
return(l_rc);
-} /* end gap_range_conv */
+} /* end gap_range_conv */
@@ -2147,4 +2147,4 @@
}
return(l_rc);
-} /* end gap_range_anim_sizechange */
+} /* end gap_range_anim_sizechange */
Modified: trunk/gap/gap_range_ops.h
==============================================================================
--- trunk/gap/gap_range_ops.h (original)
+++ trunk/gap/gap_range_ops.h Sun Apr 5 06:47:07 2009
@@ -66,10 +66,10 @@
long range_from, long range_to,
long flatten_mode, long bg_visible,
long framerate, char *frame_basename, int frame_basename_len,
- gint32 sel_mode, gint32 sel_case,
- gint32 sel_invert, char *sel_pattern,
- gint32 selection_mode
- );
+ gint32 sel_mode, gint32 sel_case,
+ gint32 sel_invert, char *sel_pattern,
+ gint32 selection_mode
+ );
gint32 gap_range_flatten(GimpRunMode run_mode,
gint32 image_id,
@@ -87,11 +87,11 @@
gint32 dest_dither,
char *basename,
char *extension,
- gint32 palette_type,
- gint32 alpha_dither,
- gint32 remove_unused,
+ gint32 palette_type,
+ gint32 alpha_dither,
+ gint32 remove_unused,
char *palette
- );
+ );
int gap_range_anim_sizechange(GimpRunMode run_mode,
GapRangeOpsAsiz asiz_mode,
Modified: trunk/gap/gap_stock.c
==============================================================================
--- trunk/gap/gap_stock.c (original)
+++ trunk/gap/gap_stock.c Sun Apr 5 06:47:07 2009
@@ -70,7 +70,7 @@
static void
add_stock_icon (const gchar *stock_id,
GtkIconSize size,
- const guint8 *inline_data)
+ const guint8 *inline_data)
{
GtkIconSource *source;
GtkIconSet *set;
Modified: trunk/gap/gap_story_dialog.h
==============================================================================
--- trunk/gap/gap_story_dialog.h (original)
+++ trunk/gap/gap_story_dialog.h Sun Apr 5 06:47:07 2009
@@ -47,8 +47,8 @@
void gap_story_dlg_recreate_tab_widgets(GapStbTabWidgets *tabw
- ,GapStbMainGlobalParams *sgpp
- );
+ ,GapStbMainGlobalParams *sgpp
+ );
void gap_story_dlg_render_default_icon(GapStoryElem *stb_elem, GapPView *pv_ptr);
void gap_story_dlg_tabw_update_frame_label (GapStbTabWidgets *tabw
, GapStbMainGlobalParams *sgpp
Modified: trunk/gap/gap_story_main.c
==============================================================================
--- trunk/gap/gap_story_main.c (original)
+++ trunk/gap/gap_story_main.c Sun Apr 5 06:47:07 2009
@@ -154,9 +154,9 @@
/* get version numbers from config.h (that is derived from ../configure.in) */
l_plug_in_version = g_strdup_printf(plug_in_version_fmt
,GAP_MAJOR_VERSION
- ,GAP_MINOR_VERSION
- ,GAP_MICRO_VERSION
- );
+ ,GAP_MINOR_VERSION
+ ,GAP_MICRO_VERSION
+ );
gimp_plugin_domain_register (GETTEXT_PACKAGE, LOCALEDIR);
@@ -165,7 +165,7 @@
"Storyboardfile Editor",
"This plug-in is an interactive GUI to create edit storyboard level1 files, "
"storyboard level1 files are videoframe playlist textfiles"
- "that can be used for playback and encoding",
+ "that can be used for playback and encoding",
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
l_plug_in_version,
@@ -272,4 +272,4 @@
gimp_set_data (GAP_STORY_PLUG_IN_PROC, sgpp, sizeof (GapStbMainGlobalParams));
}
values[0].data.d_status = status;
-} /* end run */
+} /* end run */
Modified: trunk/gap/gap_story_render_audio.c
==============================================================================
--- trunk/gap/gap_story_render_audio.c (original)
+++ trunk/gap/gap_story_render_audio.c Sun Apr 5 06:47:07 2009
@@ -115,17 +115,17 @@
#ifdef GAP_ENABLE_VIDEOAPI_SUPPORT
static void p_extract_audioblock(t_GVA_Handle *gvahand
- , FILE *fp_wav
- , gdouble samples_to_extract
- , int audio_channels
- , int sample_rate
- , GapStoryRenderVidHandle *vidhand /* for progress */
- );
+ , FILE *fp_wav
+ , gdouble samples_to_extract
+ , int audio_channels
+ , int sample_rate
+ , GapStoryRenderVidHandle *vidhand /* for progress */
+ );
static void p_extract_audiopart(t_GVA_Handle *gvahand
, char *wavfilename
, gdouble min_play_sec
, gdouble max_play_sec
- , GapStoryRenderVidHandle *vidhand /* for progress */
+ , GapStoryRenderVidHandle *vidhand /* for progress */
);
#endif
@@ -199,7 +199,7 @@
if(gap_debug)
{
printf("gap_story_render_remove_tmp_audiofiles tmp_audiofile: %s\n"
- , aud_elem->tmp_audiofile);
+ , aud_elem->tmp_audiofile);
}
/* delete tmp_audiofile if still exists
@@ -207,11 +207,11 @@
*/
if(g_file_test(aud_elem->tmp_audiofile, G_FILE_TEST_EXISTS))
{
- if(gap_debug)
- {
- printf("gap_story_render_remove_tmp_audiofiles removing: %s\n"
- , aud_elem->tmp_audiofile);
- }
+ if(gap_debug)
+ {
+ printf("gap_story_render_remove_tmp_audiofiles removing: %s\n"
+ , aud_elem->tmp_audiofile);
+ }
g_remove(aud_elem->tmp_audiofile);
}
g_free(aud_elem->tmp_audiofile);
@@ -496,12 +496,12 @@
if((l_byte_idx < 0) || (l_byte_idx >= ac_elem->segment_bytelength /*aud_elem->aud_bytelength */ ))
{
printf("p_get_audio_sample: **ERROR INDEX OVERFLOW: %d (segment_bytelength: %d aud_bytelength: %d)\n"
- " file:%s\n"
+ " file:%s\n"
, (int)l_byte_idx
, (int)ac_elem->segment_bytelength
, (int)aud_elem->aud_bytelength
- , ac_elem->filename
- );
+ , ac_elem->filename
+ );
return;
}
@@ -747,9 +747,9 @@
p_extract_audioblock(t_GVA_Handle *gvahand
, FILE *fp_wav
, gdouble samples_to_extract
- , int audio_channels
- , int sample_rate
- , GapStoryRenderVidHandle *vidhand
+ , int audio_channels
+ , int sample_rate
+ , GapStoryRenderVidHandle *vidhand
)
{
static unsigned short *left_ptr;
@@ -810,13 +810,13 @@
*/
for(l_ii=0; l_ii < l_to_read; l_ii++)
{
- gap_audio_wav_write_gint16(fp_wav, *l_lptr);
- l_lptr++;
- if(audio_channels > 1)
- {
+ gap_audio_wav_write_gint16(fp_wav, *l_lptr);
+ l_lptr++;
+ if(audio_channels > 1)
+ {
gap_audio_wav_write_gint16(fp_wav, *l_rptr);
l_rptr++;
- }
+ }
}
}
@@ -830,12 +830,12 @@
{
if(fp_wav)
{
- g_snprintf(vidhand->status_msg, vidhand->status_msg_len
+ g_snprintf(vidhand->status_msg, vidhand->status_msg_len
, _("extracting audio to tmp audiofile"));
}
else
{
- g_snprintf(vidhand->status_msg, vidhand->status_msg_len
+ g_snprintf(vidhand->status_msg, vidhand->status_msg_len
, _("seeking audio"));
}
}
@@ -867,7 +867,7 @@
, char *wavfilename
, gdouble min_play_sec
, gdouble max_play_sec
- , GapStoryRenderVidHandle *vidhand /* for progress */
+ , GapStoryRenderVidHandle *vidhand /* for progress */
)
{
static int l_audio_channels;
@@ -923,12 +923,12 @@
if(samples_to_skip > 0)
{
p_extract_audioblock(gvahand
- ,NULL /* dont write to file */
- ,samples_to_skip
- ,l_audio_channels
- ,l_sample_rate
- ,vidhand
- );
+ ,NULL /* dont write to file */
+ ,samples_to_skip
+ ,l_audio_channels
+ ,l_sample_rate
+ ,vidhand
+ );
}
if(gap_debug)
{
@@ -936,12 +936,12 @@
}
p_extract_audioblock(gvahand
- ,fp_wav /* now write to file */
- ,samples_to_extract
- ,l_audio_channels
- ,l_sample_rate
- ,vidhand
- );
+ ,fp_wav /* now write to file */
+ ,samples_to_extract
+ ,l_audio_channels
+ ,l_sample_rate
+ ,vidhand
+ );
/* close wavfile */
fclose(fp_wav);
@@ -1031,10 +1031,10 @@
,GapStoryRenderAudioRangeElem *known_aud_list /* NULL or list of already known ranges */
,GapStoryRenderErrors *sterr /* element to store Error/Warning report */
,gint32 seltrack /* IN: select audiotrack number 1 upto 99 for GAP_AUT_MOVIE */
- ,gboolean create_audio_tmp_files
- ,gdouble min_play_sec
+ ,gboolean create_audio_tmp_files
+ ,gdouble min_play_sec
,gdouble max_play_sec
- ,GapStoryRenderVidHandle *vidhand /* for progress */
+ ,GapStoryRenderVidHandle *vidhand /* for progress */
)
{
GapStoryRenderAudioRangeElem *aud_known;
@@ -1196,7 +1196,7 @@
aud_elem->samples = gvahand->total_aud_samples; /* sometimes this is not an exact value, but just a guess */
aud_elem->byteoffset_data = 0; /* no headeroffset for audiopart loaded from videofiles */
- if(gap_debug)
+ if(gap_debug)
{
printf("AFTER GVA_open_read: %s\n", aud_elem->audiofile);
printf(" samplerate: %d\n", (int)aud_elem->samplerate );
@@ -1207,130 +1207,130 @@
if(create_audio_tmp_files)
{
- if ((aud_elem->samplerate == master_samplerate)
- && ((aud_elem->channels == 2) || (aud_elem->channels == 1)))
- {
- /* audio part of the video is OK, extract 1:1 as wavfile */
- aud_elem->tmp_audiofile = gimp_temp_name("tmp.wav");
+ if ((aud_elem->samplerate == master_samplerate)
+ && ((aud_elem->channels == 2) || (aud_elem->channels == 1)))
+ {
+ /* audio part of the video is OK, extract 1:1 as wavfile */
+ aud_elem->tmp_audiofile = gimp_temp_name("tmp.wav");
- if(gap_debug)
+ if(gap_debug)
{
printf("Extracting Audiopart as file:%s\n", aud_elem->tmp_audiofile);
}
- p_extract_audiopart(gvahand
- , aud_elem->tmp_audiofile
- , min_play_sec
- , max_play_sec
- , vidhand
- );
- GVA_close(gvahand);
- }
- else
- {
- char *l_wavfilename;
- long samplerate;
- long channels;
- long bytes_per_sample;
- long bits;
- long samples;
- int l_rc;
-
- /* extract the audiopart for resample */
- l_wavfilename = gimp_temp_name("tmp.wav");
- aud_elem->tmp_audiofile = gimp_temp_name("tmp.wav");
+ p_extract_audiopart(gvahand
+ , aud_elem->tmp_audiofile
+ , min_play_sec
+ , max_play_sec
+ , vidhand
+ );
+ GVA_close(gvahand);
+ }
+ else
+ {
+ char *l_wavfilename;
+ long samplerate;
+ long channels;
+ long bytes_per_sample;
+ long bits;
+ long samples;
+ int l_rc;
+
+ /* extract the audiopart for resample */
+ l_wavfilename = gimp_temp_name("tmp.wav");
+ aud_elem->tmp_audiofile = gimp_temp_name("tmp.wav");
- if(gap_debug)
+ if(gap_debug)
{
printf("Resample Audiopart in file:%s outfile: %s\n"
, l_wavfilename
, aud_elem->tmp_audiofile
);
}
- p_extract_audiopart(gvahand
- , l_wavfilename
- , min_play_sec
- , max_play_sec
- , vidhand
- );
- GVA_close(gvahand);
-
-
- if(vidhand->status_msg)
- {
- g_snprintf(vidhand->status_msg, vidhand->status_msg_len
- , _("converting audio (via external programm)")
- );
- }
- /* fake some dummy progress */
- *vidhand->progress = 0.05;
+ p_extract_audiopart(gvahand
+ , l_wavfilename
+ , min_play_sec
+ , max_play_sec
+ , vidhand
+ );
+ GVA_close(gvahand);
+
+
+ if(vidhand->status_msg)
+ {
+ g_snprintf(vidhand->status_msg, vidhand->status_msg_len
+ , _("converting audio (via external programm)")
+ );
+ }
+ /* fake some dummy progress */
+ *vidhand->progress = 0.05;
- if(gap_debug)
+ if(gap_debug)
{
printf("calling externeal Resample program: %s %s\n"
, util_sox
, util_sox_options
);
}
- gap_story_sox_exec_resample(l_wavfilename
- ,aud_elem->tmp_audiofile
- ,master_samplerate
- ,util_sox /* the extern converter program */
- ,util_sox_options /* options for the converter */
- );
-
- /* check again (with the resampled copy in tmp_audiofile
- * that should have been created by gap_story_sox_exec_resample
- * (if convert was OK)
- */
- l_rc = gap_audio_wav_file_check(aud_elem->tmp_audiofile
- , &samplerate, &channels
- , &bytes_per_sample, &bits, &samples);
-
- /* delete the extracted wavfile after resampling (keep just the resampled variant) */
- g_remove(l_wavfilename);
- g_free(l_wavfilename);
-
- if((l_rc == 0)
- && ((bits == 16) || (bits == 8))
- && ((channels == 2) || (channels == 1))
- && (samplerate == master_samplerate))
- {
- /* audio file is OK */
- aud_elem->samplerate = samplerate;
- aud_elem->channels = channels;
- aud_elem->bytes_per_sample = bytes_per_sample;
- aud_elem->samples = samples;
- aud_elem->byteoffset_data = 44;
- /* TODO: gap_audio_wav_file_check should return the real offset
- * of the 1.st audio_sample databyte in the wav file.
- */
- }
- else
- {
- char *l_errtxt;
- /* conversion failed, cant use that file, delete tmp_audiofile now */
-
- if(aud_elem->tmp_audiofile)
- {
- g_remove(aud_elem->tmp_audiofile);
- g_free(aud_elem->tmp_audiofile);
- aud_elem->tmp_audiofile = NULL;
- }
+ gap_story_sox_exec_resample(l_wavfilename
+ ,aud_elem->tmp_audiofile
+ ,master_samplerate
+ ,util_sox /* the extern converter program */
+ ,util_sox_options /* options for the converter */
+ );
+
+ /* check again (with the resampled copy in tmp_audiofile
+ * that should have been created by gap_story_sox_exec_resample
+ * (if convert was OK)
+ */
+ l_rc = gap_audio_wav_file_check(aud_elem->tmp_audiofile
+ , &samplerate, &channels
+ , &bytes_per_sample, &bits, &samples);
+
+ /* delete the extracted wavfile after resampling (keep just the resampled variant) */
+ g_remove(l_wavfilename);
+ g_free(l_wavfilename);
+
+ if((l_rc == 0)
+ && ((bits == 16) || (bits == 8))
+ && ((channels == 2) || (channels == 1))
+ && (samplerate == master_samplerate))
+ {
+ /* audio file is OK */
+ aud_elem->samplerate = samplerate;
+ aud_elem->channels = channels;
+ aud_elem->bytes_per_sample = bytes_per_sample;
+ aud_elem->samples = samples;
+ aud_elem->byteoffset_data = 44;
+ /* TODO: gap_audio_wav_file_check should return the real offset
+ * of the 1.st audio_sample databyte in the wav file.
+ */
+ }
+ else
+ {
+ char *l_errtxt;
+ /* conversion failed, cant use that file, delete tmp_audiofile now */
+
+ if(aud_elem->tmp_audiofile)
+ {
+ g_remove(aud_elem->tmp_audiofile);
+ g_free(aud_elem->tmp_audiofile);
+ aud_elem->tmp_audiofile = NULL;
+ }
if(gap_debug)
- {
- printf("AUD 1 channels:%d samplerate:%d master_samplerate:%d\n"
- ,(int)channels
- ,(int)samplerate
- ,(int)master_samplerate
- );
- }
- l_errtxt = g_strdup_printf(_("cant use file: %s as audioinput"), aud_elem->audiofile);
- gap_story_render_set_stb_error(sterr, l_errtxt);
- g_free(l_errtxt);
- return(NULL);
- }
+ {
+ printf("AUD 1 channels:%d samplerate:%d master_samplerate:%d\n"
+ ,(int)channels
+ ,(int)samplerate
+ ,(int)master_samplerate
+ );
+ }
+ l_errtxt = g_strdup_printf(_("cant use file: %s as audioinput"), aud_elem->audiofile);
+ gap_story_render_set_stb_error(sterr, l_errtxt);
+ g_free(l_errtxt);
+ return(NULL);
+ }
- }
+ }
}
else
{
@@ -1401,16 +1401,16 @@
{
if(create_audio_tmp_files)
{
-
- if(vidhand->status_msg)
- {
- g_snprintf(vidhand->status_msg, vidhand->status_msg_len
- , _("converting audio (via external programm)")
- );
- }
- /* fake some dummy progress */
- *vidhand->progress = 0.05;
-
+
+ if(vidhand->status_msg)
+ {
+ g_snprintf(vidhand->status_msg, vidhand->status_msg_len
+ , _("converting audio (via external programm)")
+ );
+ }
+ /* fake some dummy progress */
+ *vidhand->progress = 0.05;
+
/* aud_elem->tmp_audiofile = g_strdup_printf("%s.tmp.wav", aud_elem->audiofile); */
aud_elem->tmp_audiofile = gimp_temp_name("tmp.wav");
gap_story_sox_exec_resample(aud_elem->audiofile
Modified: trunk/gap/gap_story_render_audio.h
==============================================================================
--- trunk/gap/gap_story_render_audio.h (original)
+++ trunk/gap/gap_story_render_audio.h Sun Apr 5 06:47:07 2009
@@ -70,10 +70,10 @@
,GapStoryRenderAudioRangeElem *known_aud_list /* NULL or list of already known ranges */
,GapStoryRenderErrors *sterr /* element to store Error/Warning report */
,gint32 seltrack /* IN: select audiotrack number 1 upto 99 for GAP_AUT_MOVIE */
- ,gboolean create_audio_tmp_files
- ,gdouble min_play_sec
- ,gdouble max_play_sec
- ,GapStoryRenderVidHandle *vidhand /* for progress */
+ ,gboolean create_audio_tmp_files
+ ,gdouble min_play_sec
+ ,gdouble max_play_sec
+ ,GapStoryRenderVidHandle *vidhand /* for progress */
);
void gap_story_render_audio_add_aud_list(GapStoryRenderVidHandle *vidhand, GapStoryRenderAudioRangeElem *aud_elem);
Modified: trunk/gap/gap_story_render_processor.h
==============================================================================
--- trunk/gap/gap_story_render_processor.h (original)
+++ trunk/gap/gap_story_render_processor.h Sun Apr 5 06:47:07 2009
@@ -145,8 +145,8 @@
);
GapStoryRenderVidHandle * gap_story_render_open_vid_handle(
- GapLibTypeInputRange input_mode
- ,gint32 image_id
+ GapLibTypeInputRange input_mode
+ ,gint32 image_id
,const char *storyboard_file
,const char *basename
,const char *ext
@@ -158,11 +158,11 @@
GapStoryRenderVidHandle * gap_story_render_open_extended_video_handle(
gboolean ignore_audio
,gboolean igore_video
- ,gboolean create_audio_tmp_files
+ ,gboolean create_audio_tmp_files
,gdouble *progress_ptr
,char *status_msg
,gint32 status_msg_len
- ,GapLibTypeInputRange input_mode
+ ,GapLibTypeInputRange input_mode
,const char *imagename
,const char *storyboard_file
,const char *basename
Modified: trunk/gap/gap_story_sox.c
==============================================================================
--- trunk/gap/gap_story_sox.c (original)
+++ trunk/gap/gap_story_sox.c Sun Apr 5 06:47:07 2009
@@ -60,10 +60,10 @@
l_cmd = g_strdup_printf("IN='%s';OUT='%s';RATE=%d;%s %s\n"
, in_audiofile /* input audio file */
, out_audiofile /* output audio file (tmp 16-bit wav file) */
- , (int)samplerate
+ , (int)samplerate
, util_sox
, util_sox_options
- );
+ );
if(gap_debug)
{
Modified: trunk/gap/gap_story_vthumb.c
==============================================================================
--- trunk/gap/gap_story_vthumb.c (original)
+++ trunk/gap/gap_story_vthumb.c Sun Apr 5 06:47:07 2009
@@ -926,13 +926,13 @@
if(framenr <= velem->total_frames)
{
th_data = gap_story_vthumb_create_generic_vthumb(sgpp
- ,stb
- ,stb->active_section
- ,stb_elem
- ,framenr
- ,&th_bpp
- ,&th_width
- ,&th_height
+ ,stb
+ ,stb->active_section
+ ,stb_elem
+ ,framenr
+ ,&th_bpp
+ ,&th_width
+ ,&th_height
, TRUE /* do scale */
);
}
Modified: trunk/gap/gap_thumbnail.c
==============================================================================
--- trunk/gap/gap_thumbnail.c (original)
+++ trunk/gap/gap_thumbnail.c Sun Apr 5 06:47:07 2009
@@ -102,7 +102,7 @@
{
global_creator_software = g_strdup_printf ("gap%d.%d"
, GAP_MAJOR_VERSION
- , GAP_MINOR_VERSION);
+ , GAP_MINOR_VERSION);
}
if (gimp_thumb_init(global_creator_software, thumb_basedir))
@@ -242,62 +242,62 @@
thumbnail = gimp_thumbnail_new();
if(thumbnail)
- {
- gimp_thumbnail_set_filename(thumbnail, filename_src, &error);
+ {
+ gimp_thumbnail_set_filename(thumbnail, filename_src, &error);
pixbuf = gimp_thumbnail_load_thumb(thumbnail, enum_value->value, &error);
if(pixbuf)
{
- gint l_width, l_height, l_num_layers;
- gchar *l_type_str;
+ gint l_width, l_height, l_num_layers;
+ gchar *l_type_str;
if(gap_debug) printf("p_copy_png_thumb: pixbuf: %d\n", (int)pixbuf);
- l_width = 1;
- l_height = 1;
- l_num_layers = 1;
- l_type_str = NULL;
+ l_width = 1;
+ l_height = 1;
+ l_num_layers = 1;
+ l_type_str = NULL;
g_object_get (thumbnail
- , "image-width", &l_width
- , "image-height", &l_height
- , "image-type", &l_type_str
- , "image-num-layers", &l_num_layers
- , NULL);
+ , "image-width", &l_width
+ , "image-height", &l_height
+ , "image-type", &l_type_str
+ , "image-num-layers", &l_num_layers
+ , NULL);
/* set new filename (does also set uri and reset all other TAGs */
- gimp_thumbnail_set_filename(thumbnail, filename_dst, &error);
- gimp_thumbnail_peek_image(thumbnail);
+ gimp_thumbnail_set_filename(thumbnail, filename_dst, &error);
+ gimp_thumbnail_peek_image(thumbnail);
/* copy TAGs for width,height,type,num_layers */
if(l_type_str)
- {
- g_object_set (thumbnail,
- "image-width", l_width,
- "image-height", l_height,
- "image-type", l_type_str,
- "image-num-layers", l_num_layers,
- NULL);
+ {
+ g_object_set (thumbnail,
+ "image-width", l_width,
+ "image-height", l_height,
+ "image-type", l_type_str,
+ "image-num-layers", l_num_layers,
+ NULL);
g_free(l_type_str);
- }
- else
- {
- g_object_set (thumbnail,
- "image-width", l_width,
- "image-height", l_height,
- "image-num-layers", l_num_layers,
- NULL);
- }
+ }
+ else
+ {
+ g_object_set (thumbnail,
+ "image-width", l_width,
+ "image-height", l_height,
+ "image-num-layers", l_num_layers,
+ NULL);
+ }
gimp_thumbnail_save_thumb(thumbnail
- , pixbuf
- , global_creator_software
+ , pixbuf
+ , global_creator_software
, &error
- );
+ );
g_object_unref(pixbuf);
- }
- g_object_unref(thumbnail);
- }
+ }
+ g_object_unref(thumbnail);
+ }
g_free(dst_png_thumb_full);
}
@@ -539,7 +539,7 @@
GdkPixbuf *
gap_thumb_file_load_pixbuf_thumbnail(char* filename
, gint32 *th_width
- , gint32 *th_height
+ , gint32 *th_height
, gint32 *th_bpp)
{
GimpThumbnail *thumbnail;
@@ -587,13 +587,13 @@
has_alpha = gdk_pixbuf_get_has_alpha(pixbuf);
rowstride = gdk_pixbuf_get_rowstride(pixbuf);
- printf("gap_thumb_file_load_thumbnail:\n");
- printf(" width: %d\n", (int)width );
- printf(" height: %d\n", (int)height );
- printf(" nchannels: %d\n", (int)nchannels );
- printf(" pix_data: %d\n", (int)pix_data );
- printf(" has_alpha: %d\n", (int)has_alpha );
- printf(" rowstride: %d\n", (int)rowstride );
+ printf("gap_thumb_file_load_thumbnail:\n");
+ printf(" width: %d\n", (int)width );
+ printf(" height: %d\n", (int)height );
+ printf(" nchannels: %d\n", (int)nchannels );
+ printf(" pix_data: %d\n", (int)pix_data );
+ printf(" has_alpha: %d\n", (int)has_alpha );
+ printf(" rowstride: %d\n", (int)rowstride );
}
*th_width = width;
@@ -606,7 +606,7 @@
return (pixbuf);
-} /* end gap_thumb_file_load_pixbuf_thumbnail */
+} /* end gap_thumb_file_load_pixbuf_thumbnail */
/* -----------------------------
* gap_thumb_file_load_thumbnail
@@ -644,7 +644,7 @@
pixbuf = gap_thumb_file_load_pixbuf_thumbnail(filename
, th_width
- , th_height
+ , th_height
, th_bpp);
if(pixbuf)
@@ -674,8 +674,8 @@
{
*th_data_count = rowstride * height;
*th_data = g_malloc(*th_data_count);
- memcpy(*th_data, pix_data, *th_data_count);
- rc = TRUE; /* OK */
+ memcpy(*th_data, pix_data, *th_data_count);
+ rc = TRUE; /* OK */
}
}
@@ -684,5 +684,5 @@
return (rc);
-} /* end gap_thumb_file_load_thumbnail */
+} /* end gap_thumb_file_load_thumbnail */
Modified: trunk/gap/gap_thumbnail.h
==============================================================================
--- trunk/gap/gap_thumbnail.h (original)
+++ trunk/gap/gap_thumbnail.h Sun Apr 5 06:47:07 2009
@@ -68,12 +68,12 @@
gboolean gap_thumb_file_load_thumbnail(char* filename
, gint32 *th_width, gint32 *th_height
, gint32 *th_data_count
- , gint32 *th_bpp
- , unsigned char **th_data);
+ , gint32 *th_bpp
+ , unsigned char **th_data);
GdkPixbuf * gap_thumb_file_load_pixbuf_thumbnail(char* filename
, gint32 *th_width
- , gint32 *th_height
+ , gint32 *th_height
, gint32 *th_bpp);
#endif
Modified: trunk/gap/gap_vex_dialog.c
==============================================================================
--- trunk/gap/gap_vex_dialog.c (original)
+++ trunk/gap/gap_vex_dialog.c Sun Apr 5 06:47:07 2009
@@ -66,22 +66,22 @@
static void p_update_wgt_sensitivity(GapVexMainGlobalParams *gpp);
static void p_init_mw__main_window_widgets (GapVexMainGlobalParams *gpp);
static void p_call_player_widget(GapVexMainGlobalParams *gpp
- , char *imagename
- , gint32 imagewidth
- , gint32 imageheight
- , gint32 begin_frame
- , gint32 end_frame
- , gint32 seltrack
- , gdouble delace
- , gboolean docked_mode
- );
+ , char *imagename
+ , gint32 imagewidth
+ , gint32 imageheight
+ , gint32 begin_frame
+ , gint32 end_frame
+ , gint32 seltrack
+ , gdouble delace
+ , gboolean docked_mode
+ );
static void p_vex_set_range_cb(GapPlayerAddClip *plac_ptr);
static void p_check_videofile(GapVexMainGlobalParams *gpp);
/* -------- GUI CALLBACK PROCEDURES -----------*/
static void on_mw_response (GtkWidget *widget,
- gint response_id,
- GapVexMainGlobalParams *gpp);
+ gint response_id,
+ GapVexMainGlobalParams *gpp);
static void on_mw__combo_preferred_decoder (GtkWidget *widget,
GapVexMainGlobalParams *gpp);
@@ -120,7 +120,7 @@
GapVexMainGlobalParams *gpp);
static void on_mw__button_vrange_dialog_clicked (GtkButton *button,
GdkEventButton *bevent,
- GapVexMainGlobalParams *gpp);
+ GapVexMainGlobalParams *gpp);
static void on_mw__button_vrange_docked_clicked (GtkButton *button,
GapVexMainGlobalParams *gpp);
static void on_mw__entry_preferred_decoder_changed (GtkEditable *editable,
@@ -246,10 +246,10 @@
msg = g_strdup_printf(_("File: %s already exists"), filename);
l_rc = gap_arr_std_dialog ( _("Overwrite")
, msg
- , 1, argv
- , 3, l_argv
- , -1
- );
+ , 1, argv
+ , 3, l_argv
+ , -1
+ );
g_free(msg);
return(l_rc);
}
@@ -558,15 +558,15 @@
*/
static void
p_call_player_widget(GapVexMainGlobalParams *gpp
- , char *imagename
- , gint32 imagewidth
- , gint32 imageheight
- , gint32 begin_frame
- , gint32 end_frame
- , gint32 seltrack
- , gdouble delace
- , gboolean docked_mode
- )
+ , char *imagename
+ , gint32 imagewidth
+ , gint32 imageheight
+ , gint32 begin_frame
+ , gint32 end_frame
+ , gint32 seltrack
+ , gdouble delace
+ , gboolean docked_mode
+ )
{
if(gpp->in_player_call)
{
@@ -660,22 +660,22 @@
/* RESTART mode */
gap_player_dlg_restart(gpp->plp
, FALSE /* gboolean autostart */
- , -1 /* have no image_id, operate on videofile */
- , imagename
- , imagewidth
- , imageheight
- , NULL /* have no storyboard */
- , begin_frame
- , end_frame
- , FALSE /* gboolean play_selection_only */
- , seltrack
- , delace
- , gpp->val.preferred_decoder
- , TRUE /* force_open_as_video */
+ , -1 /* have no image_id, operate on videofile */
+ , imagename
+ , imagewidth
+ , imageheight
+ , NULL /* have no storyboard */
+ , begin_frame
+ , end_frame
+ , FALSE /* gboolean play_selection_only */
+ , seltrack
+ , delace
+ , gpp->val.preferred_decoder
+ , TRUE /* force_open_as_video */
, GAP_STB_FLIP_NONE /* flip_request */
, GAP_STB_FLIP_NONE /* flip_status */
, 1 /* stb_in_track */
- );
+ );
}
if(gpp->plp)
@@ -685,10 +685,10 @@
{
gimp_help_set_help_data (gpp->plp->from_button
, _("Set range to extract")
- , NULL);
+ , NULL);
gimp_help_set_help_data (gpp->plp->to_button
, _("Set range to extract")
- , NULL);
+ , NULL);
}
}
gpp->in_player_call = FALSE;
@@ -804,9 +804,9 @@
}
g_snprintf(ratio_txt, sizeof(ratio_txt)
, "%0.5f%s"
- , (float)aspect_ratio
- , ratio2_txt
- );
+ , (float)aspect_ratio
+ , ratio2_txt
+ );
gtk_label_set_text(lbl, ratio_txt);
}
@@ -863,11 +863,11 @@
if(gpp)
{
dialog = gpp->mw__main_window;
- if(dialog)
- {
+ if(dialog)
+ {
gpp->mw__main_window = NULL;
gtk_widget_destroy (dialog);
- }
+ }
}
gtk_main_quit ();
break;
@@ -1222,7 +1222,7 @@
{
gpp->fsv__fileselection = create_fsv__fileselection(gpp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gpp->fsv__fileselection),
- gpp->val.videoname);
+ gpp->val.videoname);
gtk_widget_show (gpp->fsv__fileselection);
}
@@ -1267,7 +1267,7 @@
{
gpp->fsb__fileselection = create_fsb__fileselection(gpp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gpp->fsb__fileselection),
- gpp->val.basename);
+ gpp->val.basename);
gtk_widget_show (gpp->fsb__fileselection);
}
@@ -1358,7 +1358,7 @@
{
gpp->fsa__fileselection = create_fsa__fileselection(gpp);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gpp->fsa__fileselection),
- gpp->val.audiofile);
+ gpp->val.audiofile);
gtk_widget_show (gpp->fsa__fileselection);
}
@@ -1402,7 +1402,7 @@
static void
on_mw__button_vrange_dialog_clicked (GtkButton *button,
GdkEventButton *bevent,
- GapVexMainGlobalParams *gpp)
+ GapVexMainGlobalParams *gpp)
{
gdouble delace;
gboolean docked_mode;
@@ -1432,15 +1432,15 @@
}
p_call_player_widget(gpp
- ,gpp->val.videoname
- ,gpp->video_width
- ,gpp->video_height
- , gpp->val.begin_frame
- , gpp->val.end_frame
- , gpp->val.videotrack
- , delace
+ ,gpp->val.videoname
+ ,gpp->video_width
+ ,gpp->video_height
+ , gpp->val.begin_frame
+ , gpp->val.end_frame
+ , gpp->val.videotrack
+ , delace
, docked_mode
- );
+ );
}
@@ -1470,15 +1470,15 @@
if(gpp == NULL) return;
p_call_player_widget(gpp
- ,gpp->val.videoname
- ,gpp->video_width
- ,gpp->video_height
- , gpp->val.begin_frame
- , gpp->val.end_frame
- , gpp->val.videotrack
- , delace
+ ,gpp->val.videoname
+ ,gpp->video_width
+ ,gpp->video_height
+ , gpp->val.begin_frame
+ , gpp->val.end_frame
+ , gpp->val.videotrack
+ , delace
, TRUE /* docked_mode */
- );
+ );
}
/* --------------------------------
@@ -1930,7 +1930,7 @@
printf("WIDGET[%02d].width: %d\n"
,(int)ii
,(int)requisition.width
- );
+ );
}
if(requisition.width > max_label_width)
{
@@ -2023,11 +2023,11 @@
mw__main_window = gimp_dialog_new (_("Extract Videorange"),
GAP_VEX_PLUG_IN_NAME,
NULL, 0,
- gimp_standard_help_func, GAP_VEX_PLUG_IN_HELP_ID,
+ gimp_standard_help_func, GAP_VEX_PLUG_IN_HELP_ID,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL);
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
gtk_window_set_type_hint (mw__main_window, GDK_WINDOW_TYPE_HINT_NORMAL);
g_signal_connect (G_OBJECT (mw__main_window), "response",
@@ -2176,7 +2176,7 @@
gimp_help_set_help_data (mw__button_vrange_dialog
, _("Visual video range selection via videoplayer\n"
"SHIFT: Open a separate player window")
- , NULL);
+ , NULL);
in_row++;
@@ -2206,9 +2206,9 @@
gtk_widget_set_size_request (mw__spinbutton_end_frame, SPIN_WIDTH_LARGE, -1);
gimp_help_set_help_data (mw__spinbutton_end_frame
, _("Frame number of last frame to extract. "
- "To extract all frames use a range from 1 to 999999. "
- "(Extract stops at the last available frame)")
- , NULL);
+ "To extract all frames use a range from 1 to 999999. "
+ "(Extract stops at the last available frame)")
+ , NULL);
/* to timecode label */
@@ -2383,8 +2383,8 @@
gtk_widget_show (mw__checkbutton_exact_seek);
gimp_help_set_help_data (mw__checkbutton_exact_seek
, _("ON: emulate seek operations by sequential reads, "
- "even when videoindex is available")
- , NULL);
+ "even when videoindex is available")
+ , NULL);
gtk_table_attach (GTK_TABLE (mw__table_in), mw__checkbutton_exact_seek, 2, 3, in_row, in_row+1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
@@ -2451,8 +2451,8 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data (mw__checkbutton_multilayer
, _("On: extracted frames are stored in one multilayer image\n"
- "Off: extracted frames are written to frame files on disc")
- , NULL);
+ "Off: extracted frames are written to frame files on disc")
+ , NULL);
out_row++;
@@ -2533,8 +2533,8 @@
gtk_box_pack_start (GTK_BOX (hbox2), checkbutton, TRUE, TRUE, 0);
gimp_help_set_help_data (checkbutton
, _("On: extract grayscale mask (generated by bluebox)\n"
- "Off: extract color frames 1.1")
- , NULL);
+ "Off: extract color frames 1.1")
+ , NULL);
g_signal_connect (G_OBJECT (checkbutton), "toggled",
G_CALLBACK (on_mw__checkbutton_graymask_toggled),
gpp);
@@ -2546,8 +2546,8 @@
gtk_box_pack_start (GTK_BOX (hbox2), checkbutton, TRUE, TRUE, 0);
gimp_help_set_help_data (checkbutton
, _("On: bluebox shall generate transparency as layermask\n"
- "Off: bluebox shall generate transparency as alpha channel")
- , NULL);
+ "Off: bluebox shall generate transparency as alpha channel")
+ , NULL);
g_signal_connect (G_OBJECT (checkbutton), "toggled",
G_CALLBACK (on_mw__checkbutton_layermask_toggled),
gpp);
@@ -2562,8 +2562,8 @@
gimp_help_set_help_data (checkbutton
, _("On: add trasparency for extracted frames via blubox filter"
" (using values of last run in this session)\n"
- "Off: extract frames 1.1")
- , NULL);
+ "Off: extract frames 1.1")
+ , NULL);
g_signal_connect (G_OBJECT (checkbutton), "toggled",
G_CALLBACK (on_mw__checkbutton_bluebox_toggled),
gpp);
Modified: trunk/gap/gap_vex_dialog.h
==============================================================================
--- trunk/gap/gap_vex_dialog.h (original)
+++ trunk/gap/gap_vex_dialog.h Sun Apr 5 06:47:07 2009
@@ -45,8 +45,8 @@
void gap_vex_dlg_init_gpp (GapVexMainGlobalParams *gpp);
gint gap_vex_dlg_overwrite_dialog(GapVexMainGlobalParams *gpp
, gchar *filename
- , gint overwrite_mode
- );
+ , gint overwrite_mode
+ );
GtkWidget* gap_vex_dlg_create_mw__main_window (GapVexMainGlobalParams *gpp);
void gap_vex_dlg_main_dialog (GapVexMainGlobalParams *gpp);
Modified: trunk/gap/gap_vex_exec.c
==============================================================================
--- trunk/gap/gap_vex_exec.c (original)
+++ trunk/gap/gap_vex_exec.c Sun Apr 5 06:47:07 2009
@@ -243,8 +243,8 @@
l_overwrite_mode_audio = 0;
l_overwrite_mode_audio = gap_vex_dlg_overwrite_dialog(gpp
, gpp->val.audiofile
- , l_overwrite_mode_audio
- );
+ , l_overwrite_mode_audio
+ );
}
@@ -386,7 +386,7 @@
else
{
/* dead code (older and slower seek emulation
- * implementation outside the API)
+ * implementation outside the API)
*/
l_seek_framenumber = l_pos;
if(l_pos_unit == GVA_UPOS_PRECENTAGE)
@@ -434,7 +434,7 @@
if(gpp->val.multilayer == 0)
{
if((gpp->val.deinterlace == GAP_VEX_DELACE_ODD_X2)
- || (gpp->val.deinterlace == GAP_VEX_DELACE_EVEN_X2))
+ || (gpp->val.deinterlace == GAP_VEX_DELACE_EVEN_X2))
{
framenumber_fil = (framenumber * 2) -1;
}
@@ -467,9 +467,9 @@
gpp->val.image_ID = gvahand->image_id;
l_overwrite_mode = gap_vex_dlg_overwrite_dialog(gpp
- , framename
- , l_overwrite_mode
- );
+ , framename
+ , l_overwrite_mode
+ );
if (l_overwrite_mode < 0)
{
g_free(framename);
@@ -525,7 +525,7 @@
gpp->val.image_ID = gvahand->image_id;
if((gpp->val.deinterlace == GAP_VEX_DELACE_ODD_X2)
- || (gpp->val.deinterlace == GAP_VEX_DELACE_EVEN_X2))
+ || (gpp->val.deinterlace == GAP_VEX_DELACE_EVEN_X2))
{
/* deinterlace the other set of rows as extra layer (even/odd) */
l_rc = GVA_frame_to_gimp_layer(gvahand
Modified: trunk/gap/gap_vex_main.c
==============================================================================
--- trunk/gap/gap_vex_main.c (original)
+++ trunk/gap/gap_vex_main.c Sun Apr 5 06:47:07 2009
@@ -393,8 +393,8 @@
#endif
g_message(_("Videoextract is not available because "
"GIMP-GAP was configured and compiled with\n "
- "--disable-videoapi-support")
- );
+ "--disable-videoapi-support")
+ );
return;
} /* end run */
Modified: trunk/gap/gap_video_index_creator.c
==============================================================================
--- trunk/gap/gap_video_index_creator.c (original)
+++ trunk/gap/gap_video_index_creator.c Sun Apr 5 06:47:07 2009
@@ -1168,10 +1168,10 @@
}
printf("%3s %-90.90s %s\n"
- , label /* visible number starting at 1 */
- , video_filename
- , processing_status
- );
+ , label /* visible number starting at 1 */
+ , video_filename
+ , processing_status
+ );
g_free (label);
@@ -1209,7 +1209,7 @@
vipp->store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_view_set_model (GTK_TREE_VIEW (vipp->tv)
,GTK_TREE_MODEL (vipp->store)
- );
+ );
g_object_unref (vipp->store);
count_elem = 0;
@@ -1250,11 +1250,11 @@
gtk_list_store_append (vipp->store, &iter);
gtk_list_store_set (vipp->store, &iter
- ,0, numtxt /* internal invisible number starting at 0 */
- ,1, label /* visible number starting at 1 */
- ,2, video_filename
- ,3, processing_status
- ,-1);
+ ,0, numtxt /* internal invisible number starting at 0 */
+ ,1, label /* visible number starting at 1 */
+ ,2, video_filename
+ ,3, processing_status
+ ,-1);
if(currentFlag == TRUE)
{
@@ -1274,11 +1274,11 @@
gtk_list_store_append (vipp->store, &iter);
gtk_list_store_set (vipp->store, &iter
- ,0, "-1"
- ,1, " "
- ,2, _("** Empty **")
- ,3, " "
- ,-1);
+ ,0, "-1"
+ ,1, " "
+ ,2, _("** Empty **")
+ ,3, " "
+ ,-1);
}
gtk_tree_model_get_iter_first (GTK_TREE_MODEL (vipp->store), &iter);
@@ -1311,10 +1311,10 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
@@ -1325,22 +1325,22 @@
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vipp->tv),
- -1, _("Nr"),
- renderer,
- "text", 1,
- NULL);
+ -1, _("Nr"),
+ renderer,
+ "text", 1,
+ NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vipp->tv),
- -1, _("videofile"),
- renderer,
- "text", 2,
- NULL);
+ -1, _("videofile"),
+ renderer,
+ "text", 2,
+ NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vipp->tv),
- -1, _("Status"),
- renderer,
- "text", 3,
- NULL);
+ -1, _("Status"),
+ renderer,
+ "text", 3,
+ NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (vipp->tv), TRUE);
gtk_widget_set_size_request (vipp->tv, 840 /*WIDTH*/, 250 /*HEIGHT*/);
Modified: trunk/gap/gap_vin.c
==============================================================================
--- trunk/gap/gap_vin.c (original)
+++ trunk/gap/gap_vin.c Sun Apr 5 06:47:07 2009
@@ -131,9 +131,9 @@
{
l_rc = gap_val_rewrite_file(keylist
,l_vin_filename
- ,"# GIMP / GAP Videoinfo file" /* hdr_text */
- ,")" /* terminate char */
- );
+ ,"# GIMP / GAP Videoinfo file" /* hdr_text */
+ ,")" /* terminate char */
+ );
g_free(l_vin_filename);
}
Modified: trunk/gap/gap_wr_color_huesat.c
==============================================================================
--- trunk/gap/gap_wr_color_huesat.c (original)
+++ trunk/gap/gap_wr_color_huesat.c Sun Apr 5 06:47:07 2009
@@ -126,10 +126,10 @@
*/
static void
p_delta_gdouble (gdouble *val,
- gdouble val_from,
- gdouble val_to,
- gint32 total_steps,
- gdouble current_step)
+ gdouble val_from,
+ gdouble val_to,
+ gint32 total_steps,
+ gdouble current_step)
{
gdouble delta;
@@ -141,10 +141,10 @@
static void
p_delta_gint32 (gint32 *val,
- gint32 val_from,
- gint32 val_to,
- gint32 total_steps,
- gdouble current_step)
+ gint32 val_from,
+ gint32 val_to,
+ gint32 total_steps,
+ gdouble current_step)
{
gdouble delta;
@@ -162,10 +162,10 @@
gint32
p_gimp_hue_saturation (gint32 drawable_id,
- gint32 hue_range,
- gdouble hue_offset,
- gdouble lightness,
- gdouble saturation
+ gint32 hue_range,
+ gdouble hue_offset,
+ gdouble lightness,
+ gdouble saturation
)
{
static char *l_procname = "gimp_hue_saturation";
@@ -189,7 +189,7 @@
gimp_destroy_params(return_vals, nreturn_vals);
printf("Error: PDB call of %s failed status:%d\n", l_procname, (int)return_vals[0].data.d_status);
return(-1);
-} /* end p_gimp_hue_saturation */
+} /* end p_gimp_hue_saturation */
static void
p_run_huesat_tool(gint32 drawable_id, wr_huesat_val_t *cuvals)
@@ -251,11 +251,11 @@
/* the actual installation of the bend plugin */
gimp_install_procedure (PLUG_IN_NAME,
PLUG_IN_DESCRIPTION,
- "This Plugin is a wrapper to call the GIMP Hue Saturation Color Tool (gimp_hue_saturation)"
- " it has a simplified Dialog (without preview) where you can enter the parameters"
- " this wrapper is useful for animated filtercalls and provides "
- " a PDB interface that runs in GIMP_RUN_WITH_LAST_VALUES mode"
- " and also provides an Iterator Procedure for animated calls"
+ "This Plugin is a wrapper to call the GIMP Hue Saturation Color Tool (gimp_hue_saturation)"
+ " it has a simplified Dialog (without preview) where you can enter the parameters"
+ " this wrapper is useful for animated filtercalls and provides "
+ " a PDB interface that runs in GIMP_RUN_WITH_LAST_VALUES mode"
+ " and also provides an Iterator Procedure for animated calls"
,
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
@@ -439,16 +439,16 @@
/* Run the main function */
if(wcd->run)
{
- gimp_image_undo_group_start (l_image_id);
- p_run_huesat_tool(l_drawable_id, &l_cuvals);
+ gimp_image_undo_group_start (l_image_id);
+ p_run_huesat_tool(l_drawable_id, &l_cuvals);
l_handled_drawable_id = l_drawable_id;
- gimp_image_undo_group_end (l_image_id);
+ gimp_image_undo_group_end (l_image_id);
- /* Store variable states for next run */
- if (run_mode == GIMP_RUN_INTERACTIVE)
- {
- gimp_set_data(PLUG_IN_NAME, &l_cuvals, sizeof(l_cuvals));
- }
+ /* Store variable states for next run */
+ if (run_mode == GIMP_RUN_INTERACTIVE)
+ {
+ gimp_set_data(PLUG_IN_NAME, &l_cuvals, sizeof(l_cuvals));
+ }
}
else
{
@@ -465,7 +465,7 @@
values[0].data.d_status = status;
values[1].data.d_int32 = l_handled_drawable_id; /* return the id of handled layer */
-} /* end run */
+} /* end run */
/*
@@ -515,10 +515,10 @@
case GTK_RESPONSE_OK:
if(wcd)
{
- if (GTK_WIDGET_VISIBLE (wcd->shell))
- gtk_widget_hide (wcd->shell);
+ if (GTK_WIDGET_VISIBLE (wcd->shell))
+ gtk_widget_hide (wcd->shell);
- wcd->run = TRUE;
+ wcd->run = TRUE;
}
default:
@@ -526,11 +526,11 @@
if(wcd)
{
dialog = wcd->shell;
- if(dialog)
- {
+ if(dialog)
+ {
wcd->shell = NULL;
gtk_widget_destroy (dialog);
- }
+ }
}
gtk_main_quit ();
break;
@@ -582,7 +582,7 @@
/* The dialog1 and main vbox */
dialog1 = gimp_dialog_new (_("Hue-Saturation"), "hue_saturation_wrapper",
NULL, 0,
- gimp_standard_help_func, PLUG_IN_HELP_ID,
+ gimp_standard_help_func, PLUG_IN_HELP_ID,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -598,14 +598,14 @@
g_signal_connect (G_OBJECT (dialog1), "response",
- G_CALLBACK (wr_huesat_response),
- wcd);
+ G_CALLBACK (wr_huesat_response),
+ wcd);
/* the vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog1)->vbox), vbox,
- TRUE, TRUE, 0);
+ TRUE, TRUE, 0);
gtk_widget_show (vbox);
dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
Modified: trunk/gap/gap_wr_color_levels.c
==============================================================================
--- trunk/gap/gap_wr_color_levels.c (original)
+++ trunk/gap/gap_wr_color_levels.c Sun Apr 5 06:47:07 2009
@@ -125,10 +125,10 @@
*/
static void
p_delta_gdouble (gdouble *val,
- gdouble val_from,
- gdouble val_to,
- gint32 total_steps,
- gdouble current_step)
+ gdouble val_from,
+ gdouble val_to,
+ gint32 total_steps,
+ gdouble current_step)
{
gdouble delta;
@@ -140,10 +140,10 @@
static void
p_delta_gint32 (gint32 *val,
- gint32 val_from,
- gint32 val_to,
- gint32 total_steps,
- gdouble current_step)
+ gint32 val_from,
+ gint32 val_to,
+ gint32 total_steps,
+ gdouble current_step)
{
gdouble delta;
@@ -163,10 +163,10 @@
p_gimp_levels (gint32 drawable_id,
gint32 channel,
gint32 low_input,
- gint32 high_input,
- gdouble gamma,
- gint32 low_output,
- gint32 high_output
+ gint32 high_input,
+ gdouble gamma,
+ gint32 low_output,
+ gint32 high_output
)
{
static char *l_procname = "gimp_levels";
@@ -192,7 +192,7 @@
gimp_destroy_params(return_vals, nreturn_vals);
printf("Error: PDB call of %s failed status:%d\n", l_procname, (int)return_vals[0].data.d_status);
return(-1);
-} /* end p_gimp_levels */
+} /* end p_gimp_levels */
static void
p_run_levels_tool(gint32 drawable_id, wr_levels_val_t *cuvals)
@@ -260,11 +260,11 @@
/* the actual installation of the bend plugin */
gimp_install_procedure (PLUG_IN_NAME,
PLUG_IN_DESCRIPTION,
- "This Plugin is a wrapper to call the GIMP Levels Color Tool (gimp_levels)"
- " it has a simplified Dialog (without preview) where you can enter the parameters"
- " this wrapper is useful for animated filtercalls and provides "
- " a PDB interface that runs in GIMP_RUN_WITH_LAST_VALUES mode"
- " and also provides an Iterator Procedure for animated calls"
+ "This Plugin is a wrapper to call the GIMP Levels Color Tool (gimp_levels)"
+ " it has a simplified Dialog (without preview) where you can enter the parameters"
+ " this wrapper is useful for animated filtercalls and provides "
+ " a PDB interface that runs in GIMP_RUN_WITH_LAST_VALUES mode"
+ " and also provides an Iterator Procedure for animated calls"
,
PLUG_IN_AUTHOR,
PLUG_IN_COPYRIGHT,
@@ -459,16 +459,16 @@
/* Run the main function */
if(wcd->run)
{
- gimp_image_undo_group_start (l_image_id);
- p_run_levels_tool(l_drawable_id, &l_cuvals);
+ gimp_image_undo_group_start (l_image_id);
+ p_run_levels_tool(l_drawable_id, &l_cuvals);
l_handled_drawable_id = l_drawable_id;
- gimp_image_undo_group_end (l_image_id);
+ gimp_image_undo_group_end (l_image_id);
- /* Store variable states for next run */
- if (run_mode == GIMP_RUN_INTERACTIVE)
- {
- gimp_set_data(PLUG_IN_NAME, &l_cuvals, sizeof(l_cuvals));
- }
+ /* Store variable states for next run */
+ if (run_mode == GIMP_RUN_INTERACTIVE)
+ {
+ gimp_set_data(PLUG_IN_NAME, &l_cuvals, sizeof(l_cuvals));
+ }
}
else
{
@@ -485,7 +485,7 @@
values[0].data.d_status = status;
values[1].data.d_int32 = l_handled_drawable_id; /* return the id of handled layer */
-} /* end run */
+} /* end run */
/*
@@ -532,10 +532,10 @@
case GTK_RESPONSE_OK:
if(wcd)
{
- if (GTK_WIDGET_VISIBLE (wcd->shell))
- gtk_widget_hide (wcd->shell);
+ if (GTK_WIDGET_VISIBLE (wcd->shell))
+ gtk_widget_hide (wcd->shell);
- wcd->run = TRUE;
+ wcd->run = TRUE;
}
default:
@@ -543,11 +543,11 @@
if(wcd)
{
dialog = wcd->shell;
- if(dialog)
- {
+ if(dialog)
+ {
wcd->shell = NULL;
gtk_widget_destroy (dialog);
- }
+ }
}
gtk_main_quit ();
break;
@@ -603,7 +603,7 @@
/* The dialog1 and main vbox */
dialog1 = gimp_dialog_new (_("Color Levels"), "levels_wrapper",
NULL, 0,
- gimp_standard_help_func, PLUG_IN_HELP_ID,
+ gimp_standard_help_func, PLUG_IN_HELP_ID,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -612,14 +612,14 @@
g_signal_connect (G_OBJECT (dialog1), "response",
- G_CALLBACK (wr_levels_response),
- wcd);
+ G_CALLBACK (wr_levels_response),
+ wcd);
/* the vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog1)->vbox), vbox,
- TRUE, TRUE, 0);
+ TRUE, TRUE, 0);
gtk_widget_show (vbox);
dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
Modified: trunk/gap/gap_wr_opacity.c
==============================================================================
--- trunk/gap/gap_wr_opacity.c (original)
+++ trunk/gap/gap_wr_opacity.c Sun Apr 5 06:47:07 2009
@@ -256,7 +256,7 @@
gimp_set_data (PLUG_IN_NAME, &glob_vals, sizeof (OpaValues));
}
values[0].data.d_status = status;
-} /* end run */
+} /* end run */
@@ -307,7 +307,7 @@
gimp_layer_set_opacity(drawable_id, CLAMP(l_new_opacity, 0.0, 100.0));
return (drawable_id);
-} /* end p_opa_run */
+} /* end p_opa_run */
/* ------------------
@@ -368,4 +368,4 @@
{
return -1;
}
-} /* end p_opa_dialog */
+} /* end p_opa_dialog */
Modified: trunk/gap/gap_wr_trans.c
==============================================================================
--- trunk/gap/gap_wr_trans.c (original)
+++ trunk/gap/gap_wr_trans.c Sun Apr 5 06:47:07 2009
@@ -416,27 +416,27 @@
/* here the action starts, we transform the drawable */
trans_drawable_id = p_transform_layer(image_id
, drawable_id
- , trans_mode
+ , trans_mode
, &glob_vals
- );
+ );
if (trans_drawable_id < 0)
{
- status = GIMP_PDB_CALLING_ERROR;
+ status = GIMP_PDB_CALLING_ERROR;
}
else
{
values[1].data.d_drawable = drawable_id;
- /* Store variable states for next run
- * (the parameters for the transform wrapper plugins are stored
- * even if they contain just a dummy
- * this is done to fullfill the GIMP-GAP LAST_VALUES conventions
- * for filtermacro and animated calls)
- */
- if (run_mode == GIMP_RUN_INTERACTIVE)
- {
- gimp_set_data (name, &glob_vals, sizeof (TransValues));
- }
+ /* Store variable states for next run
+ * (the parameters for the transform wrapper plugins are stored
+ * even if they contain just a dummy
+ * this is done to fullfill the GIMP-GAP LAST_VALUES conventions
+ * for filtermacro and animated calls)
+ */
+ if (run_mode == GIMP_RUN_INTERACTIVE)
+ {
+ gimp_set_data (name, &glob_vals, sizeof (TransValues));
+ }
}
}
else
@@ -445,9 +445,9 @@
if (run_mode == GIMP_RUN_INTERACTIVE)
{
g_message(_("The plug-in %s\noperates only on layers\n"
- "(but was called on mask or channel)")
- , name
- );
+ "(but was called on mask or channel)")
+ , name
+ );
}
}
@@ -465,7 +465,7 @@
}
values[0].data.d_status = status;
-} /* end run */
+} /* end run */
@@ -512,50 +512,50 @@
axis = (gdouble)(gimp_drawable_width(drawable_id)) / 2.0;
trans_drawable_id = gimp_drawable_transform_flip_simple(drawable_id
,GIMP_ORIENTATION_HORIZONTAL
- ,auto_center
- ,axis
- ,clip_result
- );
+ ,auto_center
+ ,axis
+ ,clip_result
+ );
break;
case GAP_TRANS_FLIP_VER:
clip_result = TRUE;
axis = (gdouble)(gimp_drawable_height(drawable_id)) / 2.0;
trans_drawable_id = gimp_drawable_transform_flip_simple(drawable_id
,GIMP_ORIENTATION_VERTICAL
- ,auto_center
- ,axis
- ,clip_result
- );
+ ,auto_center
+ ,axis
+ ,clip_result
+ );
break;
case GAP_TRANS_ROT_90:
clip_result = FALSE;
trans_drawable_id = gimp_drawable_transform_rotate_simple(drawable_id
,GIMP_ROTATE_90
- ,auto_center
- ,center_x
- ,center_y
- ,clip_result
- );
+ ,auto_center
+ ,center_x
+ ,center_y
+ ,clip_result
+ );
break;
case GAP_TRANS_ROT_180:
clip_result = FALSE;
trans_drawable_id = gimp_drawable_transform_rotate_simple(drawable_id
,GIMP_ROTATE_180
- ,auto_center
- ,center_x
- ,center_y
- ,clip_result
- );
+ ,auto_center
+ ,center_x
+ ,center_y
+ ,clip_result
+ );
break;
case GAP_TRANS_ROT_270:
clip_result = FALSE;
trans_drawable_id = gimp_drawable_transform_rotate_simple(drawable_id
,GIMP_ROTATE_270
- ,auto_center
- ,center_x
- ,center_y
- ,clip_result
- );
+ ,auto_center
+ ,center_x
+ ,center_y
+ ,clip_result
+ );
break;
case GAP_TRANS_ROT_ANY:
{
@@ -566,12 +566,12 @@
trans_drawable_id = gimp_drawable_transform_rotate_default(drawable_id
, l_angle_rad
- , FALSE /* auto_center */
- , center_x
- , center_y
- , TRUE /* interpolation (TRUE use default interpolation) */
- , clip_result
- );
+ , FALSE /* auto_center */
+ , center_x
+ , center_y
+ , TRUE /* interpolation (TRUE use default interpolation) */
+ , clip_result
+ );
} /* end gap_pdb_gimp_rotate_degree */
Modified: trunk/gap/gimplastvaldesc.c
==============================================================================
--- trunk/gap/gimplastvaldesc.c (original)
+++ trunk/gap/gimplastvaldesc.c Sun Apr 5 06:47:07 2009
@@ -236,7 +236,7 @@
g_free(lastval_desc_arr);
return (retcode);
-} /* gimp_lastval_desc_register */
+} /* gimp_lastval_desc_register */
@@ -410,7 +410,7 @@
g_free(key_description);
g_free(lastval_desc_arr);
g_free(fname);
-} /* end gimp_lastval_desc_update */
+} /* end gimp_lastval_desc_update */
@@ -423,7 +423,7 @@
l_fname = g_build_filename(gimp_directory (), "lastval_descriptions.txt", NULL);
return(l_fname);
-} /* end gimp_lastval_desc_filename */
+} /* end gimp_lastval_desc_filename */
@@ -503,7 +503,7 @@
token_table_initialized = TRUE;
}
-} /* end p_init_token_table */
+} /* end p_init_token_table */
static gchar *
@@ -523,7 +523,7 @@
/* load File into Buffer */
file_buff = g_malloc0(file_size+1);
- fp = g_fopen(fname, "rb"); /* open read */
+ fp = g_fopen(fname, "rb"); /* open read */
if(fp == NULL)
{
printf ("open(read) error on '%s'\n", fname);
@@ -533,7 +533,7 @@
fclose(fp);
}
return (file_buff);
-} /* end p_load_lsatval_desc_file */
+} /* end p_load_lsatval_desc_file */
static void
@@ -555,12 +555,12 @@
fprintf(fp, "\"%s\" ", keyname);
fprintf(fp, "#- added or changed by GIMP on %04d-%02d-%02d %02d:%02d:%02d\n"
- , l_t->tm_year + 1900
- , l_t->tm_mon + 1
- , l_t->tm_mday
- , l_t->tm_hour
- , l_t->tm_min
- , l_t->tm_sec
+ , l_t->tm_year + 1900
+ , l_t->tm_mon + 1
+ , l_t->tm_mday
+ , l_t->tm_hour
+ , l_t->tm_min
+ , l_t->tm_sec
);
for(l_idx=0; l_idx < argc; l_idx++)
@@ -587,7 +587,7 @@
}
fprintf(fp, "END;\n");
}
-} /* end p_fwrite_lastvals_desc */
+} /* end p_fwrite_lastvals_desc */
static gint32
@@ -630,7 +630,7 @@
fwrite(ptr, l_idx, 1, fp);
}
return l_idx;
-} /* end p_fwrite_lines_until_keyname */
+} /* end p_fwrite_lines_until_keyname */
@@ -686,7 +686,7 @@
}
}
}
-} /* end p_fwrite_lines_remaining_without_keyname */
+} /* end p_fwrite_lines_remaining_without_keyname */
static void
@@ -738,4 +738,4 @@
printf("p_lastvals_register_persistent: error at open write file: %s\n", fname);
}
g_free(fname);
-} /* end p_lastvals_register_persistent */
+} /* end p_lastvals_register_persistent */
Modified: trunk/libgapbase/gap_base.c
==============================================================================
--- trunk/libgapbase/gap_base.c (original)
+++ trunk/libgapbase/gap_base.c Sun Apr 5 06:47:07 2009
@@ -63,7 +63,7 @@
#ifdef G_OS_WIN32
-#include <process.h> /* For _getpid() */
+#include <process.h> /* For _getpid() */
#endif
/* GAP includes */
@@ -91,9 +91,9 @@
char *
gap_base_shorten_filename(const char *prefix
,const char *filename
- ,const char *suffix
- ,gint32 max_chars
- )
+ ,const char *suffix
+ ,gint32 max_chars
+ )
{
gint len_prefix;
gint len_fname;
@@ -140,15 +140,15 @@
if(pfx)
{
ret_string = g_strdup_printf("%s %s"
- ,pfx
- ,fnam
- );
+ ,pfx
+ ,fnam
+ );
}
else
{
ret_string = g_strdup_printf("%s"
- ,fnam
- );
+ ,fnam
+ );
}
}
else
@@ -162,15 +162,15 @@
if(pfx)
{
ret_string = g_strdup_printf("%s ...%s"
- ,pfx
- ,&fnam[fname_idx]
- );
+ ,pfx
+ ,&fnam[fname_idx]
+ );
}
else
{
ret_string = g_strdup_printf("...%s"
- ,&fnam[fname_idx]
- );
+ ,&fnam[fname_idx]
+ );
}
}
@@ -181,7 +181,7 @@
ret_string = g_strdup(prefix);
return(ret_string);
-} /* end gap_base_shorten_filename */
+} /* end gap_base_shorten_filename */
/* -----------------------------
@@ -331,8 +331,8 @@
gint
gap_base_sscan_flt_numbers(gchar *buf
, gdouble *farr
- , gint farr_max
- )
+ , gint farr_max
+ )
{
gint l_cnt;
gchar *nptr;
Modified: trunk/libgapbase/gap_base.h
==============================================================================
--- trunk/libgapbase/gap_base.h (original)
+++ trunk/libgapbase/gap_base.h Sun Apr 5 06:47:07 2009
@@ -52,9 +52,9 @@
char *
gap_base_shorten_filename(const char *prefix
,const char *filename
- ,const char *suffix
- ,gint32 max_chars
- );
+ ,const char *suffix
+ ,gint32 max_chars
+ );
/* -----------------------------
@@ -113,8 +113,8 @@
gint
gap_base_sscan_flt_numbers(gchar *buf
, gdouble *farr
- , gint farr_max
- );
+ , gint farr_max
+ );
/* --------------------------------
Modified: trunk/libgapbase/gap_file_util.c
==============================================================================
--- trunk/libgapbase/gap_file_util.c (original)
+++ trunk/libgapbase/gap_file_util.c Sun Apr 5 06:47:07 2009
@@ -122,9 +122,9 @@
char *
gap_file_load_file_len(const char *fname, gint32 *filelen)
{
- FILE *fp;
+ FILE *fp;
char *l_buff_ptr;
- long len;
+ long len;
*filelen = 0;
@@ -145,18 +145,18 @@
l_buff_ptr[len] = '\0';
/* File in eine Buffer laden */
- fp = g_fopen(fname, "rb"); /* open read */
+ fp = g_fopen(fname, "rb"); /* open read */
if(fp == NULL)
{
printf ("open(read) error on '%s'\n", fname);
return(NULL);
}
- fread(l_buff_ptr, 1, (size_t)len, fp); /* read */
- fclose(fp); /* close */
+ fread(l_buff_ptr, 1, (size_t)len, fp); /* read */
+ fclose(fp); /* close */
*filelen = len;
return(l_buff_ptr);
-} /* end gap_file_load_file_len */
+} /* end gap_file_load_file_len */
/* -------------------------
* gap_file_load_file
Modified: trunk/libgapbase/gap_file_util.h
==============================================================================
--- trunk/libgapbase/gap_file_util.h (original)
+++ trunk/libgapbase/gap_file_util.h Sun Apr 5 06:47:07 2009
@@ -51,7 +51,7 @@
#endif /* !G_OS_WIN32 */
#ifdef G_OS_WIN32
-#include <direct.h> /* For _mkdir() */
+#include <direct.h> /* For _mkdir() */
#define mkdir(path,mode) _mkdir(path)
#endif
Modified: trunk/libgapbase/gap_val_file.c
==============================================================================
--- trunk/libgapbase/gap_val_file.c (original)
+++ trunk/libgapbase/gap_val_file.c Sun Apr 5 06:47:07 2009
@@ -261,7 +261,7 @@
l_str = g_strdup_printf("%s%lld%s %s"
, keyptr->keyword /* "(keyword " */
, *val_ptr /* value */
- , term_ptr
+ , term_ptr
, keyptr->comment
);
fprintf(fp, "%s\n", l_str);
Modified: trunk/libgapbase/gap_val_file.h
==============================================================================
--- trunk/libgapbase/gap_val_file.h (original)
+++ trunk/libgapbase/gap_val_file.h Sun Apr 5 06:47:07 2009
@@ -76,9 +76,9 @@
);
int gap_val_rewrite_file(GapValKeyList *keylist
, const char *filename
- , const char *hdr_text
- , const char *term_str
- );
+ , const char *hdr_text
+ , const char *term_str
+ );
int gap_val_scann_filevalues(GapValKeyList *keylist, const char *filename);
Modified: trunk/libgapvidapi/gap_vid_api-intl.h
==============================================================================
--- trunk/libgapvidapi/gap_vid_api-intl.h (original)
+++ trunk/libgapvidapi/gap_vid_api-intl.h Sun Apr 5 06:47:07 2009
@@ -21,7 +21,7 @@
# define bind_textdomain_codeset(Domain, Codeset) (Domain)
#endif
-#define INIT_I18N() G_STMT_START{ \
+#define INIT_I18N() G_STMT_START{ \
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \
textdomain (GETTEXT_PACKAGE); \
Modified: trunk/libgapvidapi/gap_vid_api.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api.c (original)
+++ trunk/libgapvidapi/gap_vid_api.c Sun Apr 5 06:47:07 2009
@@ -101,21 +101,21 @@
static t_GVA_RetCode p_gva_worker_seek_frame(t_GVA_Handle *gvahand, gdouble pos, t_GVA_PosUnit pos_unit);
static t_GVA_RetCode p_gva_worker_seek_audio(t_GVA_Handle *gvahand, gdouble pos, t_GVA_PosUnit pos_unit);
static t_GVA_RetCode p_gva_worker_get_audio(t_GVA_Handle *gvahand
- ,gint16 *output_i /* preallocated buffer large enough for samples * siezeof gint16 */
- ,gint32 channel /* audiochannel 1 upto n */
- ,gdouble samples /* number of samples to read */
- ,t_GVA_AudPos mode_flag /* specify the position where to start reading audio from */
- );
+ ,gint16 *output_i /* preallocated buffer large enough for samples * siezeof gint16 */
+ ,gint32 channel /* audiochannel 1 upto n */
+ ,gdouble samples /* number of samples to read */
+ ,t_GVA_AudPos mode_flag /* specify the position where to start reading audio from */
+ );
static t_GVA_RetCode p_gva_worker_count_frames(t_GVA_Handle *gvahand);
static t_GVA_RetCode p_gva_worker_get_video_chunk(t_GVA_Handle *gvahand
- , gint32 frame_nr
- , unsigned char *chunk
- , gint32 *size
- , gint32 max_size);
+ , gint32 frame_nr
+ , unsigned char *chunk
+ , gint32 *size
+ , gint32 max_size);
static t_GVA_Handle * p_gva_worker_open_read(const char *filename, gint32 vid_track, gint32 aud_track
- ,const char *preferred_decoder
- ,gboolean disable_mmx
- );
+ ,const char *preferred_decoder
+ ,gboolean disable_mmx
+ );
/* ---------------------------
* GVA_percent_2_frame
@@ -869,8 +869,8 @@
if(gvahand->filename)
{
- g_free(gvahand->filename);
- gvahand->filename = NULL;
+ g_free(gvahand->filename);
+ gvahand->filename = NULL;
}
/* free image buffer and row_pointers */
@@ -912,16 +912,16 @@
if(fcache->fc_current)
{
/* if fcache framenumber is negative, we can reuse
- * that EMPTY element without advance
- */
+ * that EMPTY element without advance
+ */
if(fcache->fc_current->framenumber >= 0)
- {
+ {
/* advance current write position to next element in the fcache ringlist */
fcache->fc_current = fcache->fc_current->next;
fcache->fc_current->framenumber = -1;
gvahand->frame_data = fcache->fc_current->frame_data;
gvahand->row_pointers = fcache->fc_current->row_pointers;
- }
+ }
/* CALL decoder specific implementation of GET_NEXT_FRAME procedure */
l_rc = (*dec_elem->fptr_get_next_frame)(gvahand);
@@ -967,22 +967,22 @@
if(fcache->fc_current)
{
/* if fcache framenumber is negative, we can reuse
- * that EMPTY element without advance
- */
+ * that EMPTY element without advance
+ */
if(fcache->fc_current->framenumber >= 0)
- {
+ {
/* advance current write position to next element in the fcache ringlist
- * Some of the seek procedure implementations do dummy reads
- * therefore we provide a fcache element, but leave the
- * framenumber -1 because this element is invalid in most cases
- */
+ * Some of the seek procedure implementations do dummy reads
+ * therefore we provide a fcache element, but leave the
+ * framenumber -1 because this element is invalid in most cases
+ */
fcache->fc_current = fcache->fc_current->next;
fcache->fc_current->framenumber = -1;
gvahand->frame_data = fcache->fc_current->frame_data;
gvahand->row_pointers = fcache->fc_current->row_pointers;
- }
+ }
}
-
+
/* CALL decoder specific implementation of SEEK_FRAME procedure */
l_rc = (*dec_elem->fptr_seek_frame)(gvahand, pos, pos_unit);
fcache->fcache_locked = FALSE;
@@ -1674,12 +1674,12 @@
*/
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0
, drawable->width, drawable->height
- , FALSE /* dirty */
- , FALSE /* shadow */
- );
+ , FALSE /* dirty */
+ , FALSE /* shadow */
+ );
gimp_pixel_rgn_get_rect (&pixel_rgn, gvahand->frame_data
, 0
- , 0
+ , 0
, gvahand->width
, gvahand->height);
@@ -1881,7 +1881,7 @@
GVA_delace_frame(t_GVA_Handle *gvahand
, gint32 deinterlace
, gdouble threshold
- )
+ )
{
guchar *l_framedata_copy;
guchar *l_row_ptr_dest;
@@ -2055,7 +2055,7 @@
GVA_delace_drawable(gint32 drawable_id
, gint32 deinterlace
, gdouble threshold
- )
+ )
{
GimpDrawable *drawable;
@@ -2118,9 +2118,9 @@
if(gap_debug)
{
printf("API: resolution x/y %f / %f\n"
- , (float)xresolution
- , (float)yresolution
- );
+ , (float)xresolution
+ , (float)yresolution
+ );
}
}
} /* end GVA_image_set_aspect */
@@ -2205,9 +2205,9 @@
/* resize to image to framesize */
gimp_image_resize(*image_id
, gvahand->width
- , gvahand->height
- , 0
- , 0);
+ , gvahand->height
+ , 0
+ , 0);
GVA_image_set_aspect(gvahand, *image_id);
}
}
@@ -2244,7 +2244,7 @@
, gvahand->width
, gvahand->height
, GIMP_RGBA_IMAGE
- , 100.0, GIMP_NORMAL_MODE);
+ , 100.0, GIMP_NORMAL_MODE);
}
else
{
@@ -2253,7 +2253,7 @@
, gvahand->width
, gvahand->height
, GIMP_RGB_IMAGE
- , 100.0, GIMP_NORMAL_MODE);
+ , 100.0, GIMP_NORMAL_MODE);
}
g_free(layername);
@@ -2285,21 +2285,21 @@
if (gap_debug) printf("DEBUG: FILL In the ALPHA CHANNEL\n");
for (i=(gvahand->width * gvahand->height)-1; i>=0; i--)
{
- gvahand->fc_frame_data[3+(i*4)] = 255;
+ gvahand->fc_frame_data[3+(i*4)] = 255;
}
}
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0
, drawable->width, drawable->height
- , TRUE /* dirty */
- , FALSE /* shadow */
- );
+ , TRUE /* dirty */
+ , FALSE /* shadow */
+ );
if ((deinterlace == 0) || (gvahand->height < 2))
{
gimp_pixel_rgn_set_rect (&pixel_rgn, gvahand->fc_frame_data
, 0
- , 0
+ , 0
, gvahand->width
, gvahand->height);
}
@@ -2309,13 +2309,13 @@
l_framedata_copy = GVA_delace_frame(gvahand
,deinterlace
- ,threshold
- );
+ ,threshold
+ );
if(l_framedata_copy)
{
gimp_pixel_rgn_set_rect (&pixel_rgn, l_framedata_copy
, 0
- , 0
+ , 0
, gvahand->width
, gvahand->height);
g_free(l_framedata_copy);
@@ -2548,7 +2548,7 @@
* ------------------------------------
* HINT:
* for the calling program it is easier to call
- * GVA_fetch_frame_to_buffer
+ * GVA_fetch_frame_to_buffer
*
* IN: gvahand videohandle
* IN: do_scale FALSE: deliver frame at original size (ignore bpp, width and height parameters)
@@ -2578,9 +2578,9 @@
, gint32 framenumber
, gint32 deinterlace
, gdouble threshold
- , gint32 *bpp
- , gint32 *width
- , gint32 *height
+ , gint32 *bpp
+ , gint32 *width
+ , gint32 *height
)
{
gint32 frame_size;
@@ -2599,8 +2599,8 @@
if(do_scale)
{
- guchar *src_row, *src, *dest;
- gint row, col;
+ guchar *src_row, *src, *dest;
+ gint row, col;
gint32 deinterlace_mask;
gint *arr_src_col;
@@ -2651,23 +2651,23 @@
{
for ( col = 0; col < (*width); col++ )
{
- arr_src_col[ col ] = ( col * gvahand->width / (*width) ) * gvahand->frame_bpp;
+ arr_src_col[ col ] = ( col * gvahand->width / (*width) ) * gvahand->frame_bpp;
}
dest = frame_data;
/* copy row by row */
for ( row = 0; row < *height; row++ )
{
- src_row = gvahand->fc_row_pointers[(row * gvahand->height / (*height)) & deinterlace_mask];
- for ( col = 0; col < (*width); col++ )
- {
- src = &src_row[ arr_src_col[col] ];
- dest[0] = src[0];
- dest[1] = src[1];
- dest[2] = src[2];
- dest[3] = 255;
- dest += (*bpp);
- }
+ src_row = gvahand->fc_row_pointers[(row * gvahand->height / (*height)) & deinterlace_mask];
+ for ( col = 0; col < (*width); col++ )
+ {
+ src = &src_row[ arr_src_col[col] ];
+ dest[0] = src[0];
+ dest[1] = src[1];
+ dest[2] = src[2];
+ dest[3] = 255;
+ dest += (*bpp);
+ }
}
g_free(arr_src_col);
}
@@ -2689,7 +2689,7 @@
frame_data = g_malloc(frame_size);
if(frame_data == NULL)
{
- return (NULL);
+ return (NULL);
}
memcpy(frame_data, gvahand->fc_frame_data, frame_size);
}
@@ -2697,11 +2697,11 @@
{
frame_data = GVA_delace_frame(gvahand
,deinterlace
- ,threshold
- );
+ ,threshold
+ );
if(frame_data == NULL)
{
- return (NULL);
+ return (NULL);
}
}
@@ -2715,17 +2715,17 @@
{
gint i;
- if (gap_debug) printf("DEBUG: FILL In the ALPHA CHANNEL\n");
- for (i=((*width) * (*height))-1; i>=0; i--)
- {
- frame_data[3+(i*4)] = 255;
- }
+ if (gap_debug) printf("DEBUG: FILL In the ALPHA CHANNEL\n");
+ for (i=((*width) * (*height))-1; i>=0; i--)
+ {
+ frame_data[3+(i*4)] = 255;
+ }
}
}
return(frame_data);
-} /* end GVA_frame_to_buffer */
+} /* end GVA_frame_to_buffer */
/* ------------------------------------
@@ -2763,9 +2763,9 @@
, gint32 framenumber
, gint32 deinterlace
, gdouble threshold
- , gint32 *bpp
- , gint32 *width
- , gint32 *height
+ , gint32 *bpp
+ , gint32 *width
+ , gint32 *height
)
{
guchar *frame_data;
@@ -2777,9 +2777,9 @@
, framenumber
, deinterlace
, threshold
- , bpp
- , width
- , height
+ , bpp
+ , width
+ , height
);
if(frame_data == NULL)
@@ -2825,9 +2825,9 @@
, framenumber
, deinterlace
, threshold
- , bpp
- , width
- , height
+ , bpp
+ , width
+ , height
);
}
}
Modified: trunk/libgapvidapi/gap_vid_api.h
==============================================================================
--- trunk/libgapvidapi/gap_vid_api.h (original)
+++ trunk/libgapvidapi/gap_vid_api.h Sun Apr 5 06:47:07 2009
@@ -234,8 +234,8 @@
gpointer progress_cb_user_data;
t_GVA_progress_callback_fptr fptr_progress_callback; /* if != NULL: The API calls this user procedure with current progress
* if the procedure returns TRUE
- * the API does cancel current seek operations immediate.
- */
+ * the API does cancel current seek operations immediate.
+ */
/* PUBLIC information (read only outside the API) */
@@ -421,29 +421,29 @@
, gint32 framenumber
, gint32 deinterlace
, gdouble threshold
- , gint32 *bpp
- , gint32 *width
- , gint32 *height
+ , gint32 *bpp
+ , gint32 *width
+ , gint32 *height
);
guchar * GVA_fetch_frame_to_buffer(t_GVA_Handle *gvahand
, gboolean do_scale
, gint32 framenumber
, gint32 deinterlace
, gdouble threshold
- , gint32 *bpp
- , gint32 *width
- , gint32 *height
+ , gint32 *bpp
+ , gint32 *width
+ , gint32 *height
);
guchar * GVA_delace_frame(t_GVA_Handle *gvahand
, gint32 deinterlace
, gdouble threshold
- );
+ );
void GVA_delace_drawable(gint32 drawable_id
, gint32 deinterlace
, gdouble threshold
- );
-
+ );
+
gint32 GVA_percent_2_frame(gint32 total_frames, gdouble percent);
gdouble GVA_frame_2_percent(gint32 total_frames, gdouble framenr);
Modified: trunk/libgapvidapi/gap_vid_api_gimp.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api_gimp.c (original)
+++ trunk/libgapvidapi/gap_vid_api_gimp.c Sun Apr 5 06:47:07 2009
@@ -138,7 +138,7 @@
dummy_layer_id = gap_image_get_any_layer(l_image_id);
return_vals = gimp_run_procedure (l_called_proc,
&nreturn_vals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
GIMP_PDB_IMAGE, l_image_id,
GIMP_PDB_DRAWABLE, dummy_layer_id,
GIMP_PDB_END);
Modified: trunk/libgapvidapi/gap_vid_api_mpeg3.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api_mpeg3.c (original)
+++ trunk/libgapvidapi/gap_vid_api_mpeg3.c Sun Apr 5 06:47:07 2009
@@ -170,10 +170,10 @@
}
else
{
- if((minor == 5) && (release < 4))
- {
+ if((minor == 5) && (release < 4))
+ {
version_ok = FALSE;
- }
+ }
}
}
}
@@ -184,21 +184,21 @@
{
printf("GVA info: the GAP Video API was linked with "
" libmpeg3 %d.%d.%d (reqired version is 1.5.4 or better)\n"
- ,major
- ,minor
- ,release
- );
+ ,major
+ ,minor
+ ,release
+ );
}
}
else
{
printf("## GVA WARNING: the GAP Video API was linked with "
" an old version of libmpeg3 %d.%d.%d (reqired version is 1.5.4 or better)\n"
- " (the libmpeg3 based decoder is not available)"
- ,major
- ,minor
- ,release
- );
+ " (the libmpeg3 based decoder is not available)"
+ ,major
+ ,minor
+ ,release
+ );
return (FALSE);
}
@@ -275,7 +275,7 @@
{
if(gap_debug) printf("OPEN: additional tocfile: %s AVAILABLE (fast seek via mpeg3_set_frame is supported)\n", tocfile);
gvahand->emulate_seek = FALSE;
- filename = tocfile;
+ filename = tocfile;
}
else
{
@@ -335,9 +335,9 @@
gvahand->aspect_ratio = mpeg3_aspect_ratio(handle->main_handle, (int)gvahand->vid_track);
/* libmpeg3-1.5.4 has a bug and did always deliver apect ratio value 0.0
- * the aspect was not recognized when it was there
- * tested with some DVD and MPEG1 videofiles
- */
+ * the aspect was not recognized when it was there
+ * tested with some DVD and MPEG1 videofiles
+ */
/* printf("ASPECT RATIO: %f\n", (float)gvahand->aspect_ratio); */
if(gvahand->total_frames <= 1)
@@ -352,7 +352,7 @@
if(gap_debug) printf("GUESS TOTAL FRAMES %d\n", (int)gvahand->total_frames );
}
-
+
}
else
@@ -385,7 +385,7 @@
if(gap_debug) printf("GVA: mpeg3 after close attempt:%d\n", (int)repeat_count);
- handle->main_handle = NULL;
+ handle->main_handle = NULL;
mpeg3_check_sig(filename);
mpeg3_check_sig("dummy");
gvahand->decoder_handle = NULL;
@@ -402,8 +402,8 @@
if(gvahand->vindex->total_frames > 1)
{
/* we have a complete vindex and can
- * trust the total_frames in the vindex file
- */
+ * trust the total_frames in the vindex file
+ */
gvahand->total_frames = gvahand->vindex->total_frames;
gvahand->all_frames_counted = TRUE;
}
@@ -557,8 +557,8 @@
if (1==1) /* (gvahand->dirty_seek) */
{
/* fast seek
- * (older libmpeg3 versions had aProblem:
- * a following read may deliver more or less thrashed images
+ * (older libmpeg3 versions had aProblem:
+ * a following read may deliver more or less thrashed images
* until the next I frame is read in sequence)
*/
l_rc = mpeg3_set_frame(handle->main_handle, l_frame_pos, (int)gvahand->vid_track);
@@ -566,9 +566,9 @@
else
{
/* this dead code once was needed with older libmpeg3 versions
- * libmpeg3-1.5.4 seems to handle seek operations clean
- * without returning trash frames when seek to B or P frames
- */
+ * libmpeg3-1.5.4 seems to handle seek operations clean
+ * without returning trash frames when seek to B or P frames
+ */
l_rc = p_mpeg3_gopseek(handle->main_handle, l_frame_pos -1, gvahand);
}
}
@@ -759,23 +759,23 @@
/* for libmpeg3 implementation we need a 2.nd file,
* the .toc file that does the job for fast seek access by libmeg3 internal methods
- * (the videoindex_file is just used to store the total_frames information,
- * that is not available in the .toc file)
- */
+ * (the videoindex_file is just used to store the total_frames information,
+ * that is not available in the .toc file)
+ */
gvahand->vindex->tocfile = GVA_build_video_toc_filename(gvahand->filename, GVA_LIBMPEG3_DECODER_NAME);
if(p_check_libmpeg3_toc_file(gvahand->vindex->tocfile))
{
- /* close video and switch to the TOC file */
+ /* close video and switch to the TOC file */
if(gap_debug)
{
printf("gap_mpeg3_count_frames REOPEN using tocfile: %s\n"
- , gvahand->vindex->tocfile
- );
- fflush(stdout);
+ , gvahand->vindex->tocfile
+ );
+ fflush(stdout);
}
- p_wrapper_mpeg3_close(gvahand);
- p_wrapper_mpeg3_open_read(gvahand->vindex->tocfile, gvahand);
+ p_wrapper_mpeg3_close(gvahand);
+ p_wrapper_mpeg3_open_read(gvahand->vindex->tocfile, gvahand);
return(GVA_RET_OK);
}
}
@@ -802,7 +802,7 @@
vindex->track = gvahand->vid_track;
if(vindex->ofs_tab)
{
- vindex->tabsize_allocated = GVA_VIDINDEXTAB_BLOCK_SIZE;
+ vindex->tabsize_allocated = GVA_VIDINDEXTAB_BLOCK_SIZE;
}
}
}
@@ -821,31 +821,31 @@
fp = g_fopen(vindex->tocfile, "wb");
if(fp)
{
- int argc;
- char *argv[3];
+ int argc;
+ char *argv[3];
fclose(fp);
-
- argc = 3;
- argv[0] = g_strdup("GVA_mpeg3toc");
- argv[1] = g_strdup(gvahand->filename);
- argv[2] = g_strdup(vindex->tocfile);
-
+
+ argc = 3;
+ argv[0] = g_strdup("GVA_mpeg3toc");
+ argv[1] = g_strdup(gvahand->filename);
+ argv[2] = g_strdup(vindex->tocfile);
+
GVA_create_libmpeg3_toc(argc, argv, gvahand, &l_total_frames);
-
- g_free(argv[0]);
- g_free(argv[1]);
- g_free(argv[2]);
+
+ g_free(argv[0]);
+ g_free(argv[1]);
+ g_free(argv[2]);
}
else
{
l_errno = errno;
g_message(_("ERROR: Failed to write videoindex tocfile\n"
- "tocfile: '%s'\n"
- "%s")
- , vindex->tocfile
- , g_strerror (l_errno));
- gvahand->cancel_operation = TRUE;
+ "tocfile: '%s'\n"
+ "%s")
+ , vindex->tocfile
+ , g_strerror (l_errno));
+ gvahand->cancel_operation = TRUE;
}
}
@@ -988,9 +988,9 @@
/* Store the size in size and return a 1 if error. */
/* Stream defines the number of the multiplexed stream to read. */
l_rc = mpeg3_read_video_chunk(handle->raw_handle
- , buffer /* out: unsigned char *output */
- , &l_size /* out: size of the chunk */
- , (long) max_size
+ , buffer /* out: unsigned char *output */
+ , &l_size /* out: size of the chunk */
+ , (long) max_size
,(int)gvahand->vid_track /* stream */
);
@@ -1007,33 +1007,33 @@
if(handle->raw_pos == frame_nr)
{
unsigned char *chunk_ptr;
-
- /* got start code of next frame at the end of the buffer ? */
- if(handle->prev_code == MPEG3_PICTURE_START_CODE)
- {
- l_size -= 4;
- }
-
+
+ /* got start code of next frame at the end of the buffer ? */
+ if(handle->prev_code == MPEG3_PICTURE_START_CODE)
+ {
+ l_size -= 4;
+ }
+
*size = (gint32)l_size;
- chunk_ptr = chunk;
-
- if(handle->prev_code == MPEG3_PICTURE_START_CODE)
- {
- /* begin the chunk data with Picture start code
- * (from the end of prev. buffer)
- */
- *size += 4;
- chunk_ptr[0] = (handle->prev_code >> 24) & 0xff;
- chunk_ptr[1] = (handle->prev_code >> 16) & 0xff;
- chunk_ptr[2] = (handle->prev_code >> 8) & 0xff;
- chunk_ptr[3] = handle->prev_code & 0xff;
- chunk_ptr += 4;
- }
- memcpy(chunk_ptr, buffer, l_size);
+ chunk_ptr = chunk;
+
+ if(handle->prev_code == MPEG3_PICTURE_START_CODE)
+ {
+ /* begin the chunk data with Picture start code
+ * (from the end of prev. buffer)
+ */
+ *size += 4;
+ chunk_ptr[0] = (handle->prev_code >> 24) & 0xff;
+ chunk_ptr[1] = (handle->prev_code >> 16) & 0xff;
+ chunk_ptr[2] = (handle->prev_code >> 8) & 0xff;
+ chunk_ptr[3] = handle->prev_code & 0xff;
+ chunk_ptr += 4;
+ }
+ memcpy(chunk_ptr, buffer, l_size);
handle->prev_code = code;
-
- g_free(buffer);
-
+
+ g_free(buffer);
+
return(GVA_RET_OK);
}
@@ -1245,11 +1245,11 @@
if(gvahand->do_gimp_progress) { gimp_progress_update (gvahand->percentage_done); }
if(gvahand->fptr_progress_callback)
{
- gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
- if(gvahand->cancel_operation)
- {
+ gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
+ if(gvahand->cancel_operation)
+ {
return(-1);
- }
+ }
}
}
g_free(dummy_buffer);
@@ -1262,11 +1262,11 @@
/* The Y, U, and V planes are not copied but the _output pointers */
/* are redirected to the frame buffer. */
l_rc = mpeg3_read_yuvframe_ptr(seek_handle
- , &dummy_y
- , &dummy_u
- , &dummy_v
- ,(int)gvahand->vid_track
- );
+ , &dummy_y
+ , &dummy_u
+ , &dummy_v
+ ,(int)gvahand->vid_track
+ );
if(l_rc != 0)
{
break;
@@ -1277,11 +1277,11 @@
if(gvahand->do_gimp_progress) { gimp_progress_update (gvahand->percentage_done); }
if(gvahand->fptr_progress_callback)
{
- gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
- if(gvahand->cancel_operation)
- {
+ gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
+ if(gvahand->cancel_operation)
+ {
return(-1);
- }
+ }
}
}
@@ -1363,11 +1363,11 @@
if(gvahand->do_gimp_progress) { gimp_progress_update (gvahand->percentage_done); }
if(gvahand->fptr_progress_callback)
{
- gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
- if(gvahand->cancel_operation)
- {
+ gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
+ if(gvahand->cancel_operation)
+ {
return(-1);
- }
+ }
}
}
@@ -1390,11 +1390,11 @@
/* The Y, U, and V planes are not copied but the _output pointers */
/* are redirected to the frame buffer. */
l_rc = mpeg3_read_yuvframe_ptr(seek_handle
- , &dummy_y
- , &dummy_u
- , &dummy_v
- ,(int)gvahand->vid_track
- );
+ , &dummy_y
+ , &dummy_u
+ , &dummy_v
+ ,(int)gvahand->vid_track
+ );
if(l_rc != 0)
{
break;
@@ -1404,11 +1404,11 @@
if(gvahand->do_gimp_progress) { gimp_progress_update (gvahand->percentage_done); }
if(gvahand->fptr_progress_callback)
{
- gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
- if(gvahand->cancel_operation)
- {
+ gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
+ if(gvahand->cancel_operation)
+ {
return(-1);
- }
+ }
}
}
}
Modified: trunk/libgapvidapi/gap_vid_api_mpeg3toc.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api_mpeg3toc.c (original)
+++ trunk/libgapvidapi/gap_vid_api_mpeg3toc.c Sun Apr 5 06:47:07 2009
@@ -79,9 +79,9 @@
, t_GVA_Handle *gvahand
, int *ret_total_frames)
{
- int i, j, l;
- char *src = 0, *dst = 0;
- int verbose = 0;
+ int i, j, l;
+ char *src = 0, *dst = 0;
+ int verbose = 0;
gdouble progress_stepsize;
progress_stepsize = 1.0 / (gdouble)(MAX(gvahand->total_frames, 1000));
@@ -90,114 +90,114 @@
{
printf("GVA_create_libmpeg3_toc: gvahand->total_frames: %d stepsize:%.6f\n"
, (int)gvahand->total_frames
- , (float)progress_stepsize
- );
+ , (float)progress_stepsize
+ );
}
*ret_total_frames = -1; // hof:
- if(argc < 3)
- {
- fprintf(stderr, "Table of contents generator version %d.%d.%d\n"
- "Create a table of contents for a DVD or mpeg stream.\n"
- "Usage: mpeg3toc <path> <output>\n"
- "\n"
- "-v Print tracking information\n"
- "\n"
- "The path should be absolute unless you plan\n"
- "to always run your movie editor from the same directory\n"
- "as the filename. For renderfarms the filesystem prefix\n"
- "should be / and the movie directory mounted under the same\n"
- "directory on each node.\n\n"
- "Example: mpeg3toc -v /cdrom/video_ts/vts_01_0.ifo titanic.toc\n",
- mpeg3_major(),
- mpeg3_minor(),
- mpeg3_release());
- exit(1);
- }
-
- for(i = 1; i < argc; i++)
- {
- if(!strcmp(argv[i], "-v"))
- {
- verbose = 1;
- }
- else
- if(argv[i][0] == '-')
- {
- fprintf(stderr, "Unrecognized command %s\n", argv[i]);
- exit(1);
- }
- else
- if(!src)
- {
- src = argv[i];
- }
- else
- if(!dst)
- {
- dst = argv[i];
- }
- else
- {
- fprintf(stderr, "Ignoring argument \"%s\"\n", argv[i]);
- }
- }
-
- if(!src)
- {
- fprintf(stderr, "source path not supplied.\n");
- exit(1);
- }
-
- if(!dst)
- {
- fprintf(stderr, "destination path not supplied.\n");
- exit(1);
- }
-
-
-
- int64_t total_bytes;
- mpeg3_t *file = mpeg3_start_toc(src, dst, &total_bytes);
- if(!file)
+ if(argc < 3)
+ {
+ fprintf(stderr, "Table of contents generator version %d.%d.%d\n"
+ "Create a table of contents for a DVD or mpeg stream.\n"
+ "Usage: mpeg3toc <path> <output>\n"
+ "\n"
+ "-v Print tracking information\n"
+ "\n"
+ "The path should be absolute unless you plan\n"
+ "to always run your movie editor from the same directory\n"
+ "as the filename. For renderfarms the filesystem prefix\n"
+ "should be / and the movie directory mounted under the same\n"
+ "directory on each node.\n\n"
+ "Example: mpeg3toc -v /cdrom/video_ts/vts_01_0.ifo titanic.toc\n",
+ mpeg3_major(),
+ mpeg3_minor(),
+ mpeg3_release());
+ exit(1);
+ }
+
+ for(i = 1; i < argc; i++)
+ {
+ if(!strcmp(argv[i], "-v"))
+ {
+ verbose = 1;
+ }
+ else
+ if(argv[i][0] == '-')
+ {
+ fprintf(stderr, "Unrecognized command %s\n", argv[i]);
+ exit(1);
+ }
+ else
+ if(!src)
+ {
+ src = argv[i];
+ }
+ else
+ if(!dst)
+ {
+ dst = argv[i];
+ }
+ else
+ {
+ fprintf(stderr, "Ignoring argument \"%s\"\n", argv[i]);
+ }
+ }
+
+ if(!src)
+ {
+ fprintf(stderr, "source path not supplied.\n");
+ exit(1);
+ }
+
+ if(!dst)
+ {
+ fprintf(stderr, "destination path not supplied.\n");
+ exit(1);
+ }
+
+
+
+ int64_t total_bytes;
+ mpeg3_t *file = mpeg3_start_toc(src, dst, &total_bytes);
+ if(!file)
{
return 1;;
}
-
- while(1)
- {
- int64_t bytes_processed = 0;
- mpeg3_do_toc(file, &bytes_processed);
+
+ while(1)
+ {
+ int64_t bytes_processed = 0;
+ mpeg3_do_toc(file, &bytes_processed);
- /* hof: handle GUI user cancel request */
- {
+ /* hof: handle GUI user cancel request */
+ {
gvahand->percentage_done = CLAMP((bytes_processed / MAX(1, total_bytes)), 0.0, 1.0);
gvahand->cancel_operation = (*gvahand->fptr_progress_callback)(gvahand->percentage_done, gvahand->progress_cb_user_data);
if(gap_debug)
- {
- printf("MPEG3TOC: CANCEL(v):%d FPTR:%d\n"
- , (int)gvahand->cancel_operation
+ {
+ printf("MPEG3TOC: CANCEL(v):%d FPTR:%d\n"
+ , (int)gvahand->cancel_operation
, (int)gvahand->fptr_progress_callback
- );
- }
+ );
+ }
if(gvahand->cancel_operation)
{
mpeg3_stop_toc(file);
return 1;
}
- }
+ }
- if(bytes_processed >= total_bytes) break;
- }
+ if(bytes_processed >= total_bytes) break;
+ }
- mpeg3_stop_toc(file);
+ mpeg3_stop_toc(file);
*ret_total_frames = p_get_total_frames_from_toc(dst, (int)gvahand->vid_track);
- return 0;
+ return 0;
}
Modified: trunk/libgapvidapi/gap_vid_api_util.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api_util.c (original)
+++ trunk/libgapvidapi/gap_vid_api_util.c Sun Apr 5 06:47:07 2009
@@ -233,11 +233,11 @@
for (i = 0; i < 16; i++)
{
- n = (digest[i] >> 4) & 0xF;
- name[i * 2] = (n > 9) ? 'a' + n - 10 : '0' + n;
+ n = (digest[i] >> 4) & 0xF;
+ name[i * 2] = (n > 9) ? 'a' + n - 10 : '0' + n;
- n = digest[i] & 0xF;
- name[i * 2 + 1] = (n > 9) ? 'a' + n - 10 : '0' + n;
+ n = digest[i] & 0xF;
+ name[i * 2 + 1] = (n > 9) ? 'a' + n - 10 : '0' + n;
}
name[32] = '\0';
@@ -328,8 +328,8 @@
printf("GVA_util_check_mpg_frame_type: Frame type:%d local_picnum:%d l_idx:%d\n"
,(int)l_frame_type
,(int)l_picture_number
- ,(int)l_idx
- );
+ ,(int)l_idx
+ );
}
return(l_frame_type);
@@ -399,21 +399,21 @@
}
else
{
- /* Write a new time code */
- hour = (long)((float)(master_frame_nr - 1) / master_framerate / 3600);
- carry = hour * 3600 * master_framerate;
- minute = (long)((float)(master_frame_nr - 1 - carry) / master_framerate / 60);
- carry += minute * 60 * master_framerate;
- second = (long)((float)(master_frame_nr - 1 - carry) / master_framerate);
- carry += second * master_framerate;
- frame = (master_frame_nr - 1 - carry);
-
- buffer[l_idx] = ((code >> 24) & 0x80) | (hour << 2) | (minute >> 4);
- buffer[l_idx + 1] = ((code >> 16) & 0x08) | ((minute & 0xf) << 4) | (second >> 3);
- buffer[l_idx + 2] = ((second & 0x7) << 5) | (frame >> 1);
- buffer[l_idx + 3] = (code & 0x7f) | ((frame & 0x1) << 7);
+ /* Write a new time code */
+ hour = (long)((float)(master_frame_nr - 1) / master_framerate / 3600);
+ carry = hour * 3600 * master_framerate;
+ minute = (long)((float)(master_frame_nr - 1 - carry) / master_framerate / 60);
+ carry += minute * 60 * master_framerate;
+ second = (long)((float)(master_frame_nr - 1 - carry) / master_framerate);
+ carry += second * master_framerate;
+ frame = (master_frame_nr - 1 - carry);
+
+ buffer[l_idx] = ((code >> 24) & 0x80) | (hour << 2) | (minute >> 4);
+ buffer[l_idx + 1] = ((code >> 16) & 0x08) | ((minute & 0xf) << 4) | (second >> 3);
+ buffer[l_idx + 2] = ((second & 0x7) << 5) | (frame >> 1);
+ buffer[l_idx + 3] = (code & 0x7f) | ((frame & 0x1) << 7);
- if(gap_debug)
+ if(gap_debug)
{
printf("new: %02d:%02d:%02d:%02d\n", hour, minute, second, frame);
}
@@ -482,7 +482,7 @@
,(int)l_hdr_size
,(int)l_picture_number
,(int)l_frame_type
- );
+ );
}
return(l_hdr_size);
@@ -536,7 +536,7 @@
,(int)l_jpeg_magic_number_found
,(int)l_idx
,(int)*hdr_size
- );
+ );
}
return(l_jpeg_magic_number_found);
@@ -588,7 +588,7 @@
,(int)l_png_magic_number_found
,(int)l_idx
,(int)*hdr_size
- );
+ );
}
return(l_png_magic_number_found);
Modified: trunk/libgapvidapi/gap_vid_api_vidindex.c
==============================================================================
--- trunk/libgapvidapi/gap_vid_api_vidindex.c (original)
+++ trunk/libgapvidapi/gap_vid_api_vidindex.c Sun Apr 5 06:47:07 2009
@@ -314,13 +314,13 @@
for(l_idx=0; l_idx < vindex->tabsize_used; l_idx++)
{
printf("VINDEX: ofs_tab[%d]: ofs64: %lld seek_nr:%d flen:%d chk:%d dts:%lld\n"
- , (int)l_idx
- , vindex->ofs_tab[l_idx].uni.offset_gint64
- , (int)vindex->ofs_tab[l_idx].seek_nr
- , (int)vindex->ofs_tab[l_idx].frame_length
- , (int)vindex->ofs_tab[l_idx].checksum
- , vindex->ofs_tab[l_idx].timecode_dts
- );
+ , (int)l_idx
+ , vindex->ofs_tab[l_idx].uni.offset_gint64
+ , (int)vindex->ofs_tab[l_idx].seek_nr
+ , (int)vindex->ofs_tab[l_idx].frame_length
+ , (int)vindex->ofs_tab[l_idx].checksum
+ , vindex->ofs_tab[l_idx].timecode_dts
+ );
}
}
@@ -373,14 +373,14 @@
fp = g_fopen(vindex->videoindex_filename, "rb");
if(fp)
{
- gint32 rd_len;
- gint32 rd_size;
- gint l_flen;
- gint32 l_mtime;
-
- rd_len = fread(&vindex->hdr, 1, sizeof(vindex->hdr), fp);
- if(rd_len)
- {
+ gint32 rd_len;
+ gint32 rd_size;
+ gint l_flen;
+ gint32 l_mtime;
+
+ rd_len = fread(&vindex->hdr, 1, sizeof(vindex->hdr), fp);
+ if(rd_len)
+ {
vindex->stepsize = atol(vindex->hdr.val_step);
vindex->tabsize_used = atol(vindex->hdr.val_size);
vindex->track = atol(vindex->hdr.val_trak);
@@ -394,23 +394,23 @@
, vindex->hdr.val_mtim);
}
- l_mtime = gap_file_get_mtime(filename);
- if(p_equal_mtime(l_mtime, vindex->mtime) == TRUE)
- {
+ l_mtime = gap_file_get_mtime(filename);
+ if(p_equal_mtime(l_mtime, vindex->mtime) == TRUE)
+ {
l_flen = atol(vindex->hdr.val_flen);
- if(l_flen > 0)
- {
- /* read the videofile_uri of the videofile */
- vindex->videofile_uri = g_malloc0(l_flen);
- if(vindex->videofile_uri)
- {
- rd_len = fread(vindex->videofile_uri, 1, l_flen, fp);
- }
- else
- {
- fseek(fp, l_flen, SEEK_CUR);
- }
- }
+ if(l_flen > 0)
+ {
+ /* read the videofile_uri of the videofile */
+ vindex->videofile_uri = g_malloc0(l_flen);
+ if(vindex->videofile_uri)
+ {
+ rd_len = fread(vindex->videofile_uri, 1, l_flen, fp);
+ }
+ else
+ {
+ fseek(fp, l_flen, SEEK_CUR);
+ }
+ }
vindex->tabtype = GVA_IDX_TT_UNDEFINED;
if(strcmp(vindex->hdr.val_type, "GINT64") == 0)
@@ -432,7 +432,7 @@
rd_len = 0;
- rd_size = -1;
+ rd_size = -1;
switch(vindex->tabtype)
{
case GVA_IDX_TT_WITHOUT_TIMECODE_GINT64: /* old format */
@@ -488,28 +488,28 @@
printf("GVA_load_videoindex SUCCESS\n");
}
}
- }
- else
- {
+ }
+ else
+ {
delete_flag = TRUE;
if(gap_debug)
- {
- printf("\nGVA_load_videoindex TOO OLD videoindex_filename:%s\n"
+ {
+ printf("\nGVA_load_videoindex TOO OLD videoindex_filename:%s\n"
, vindex->videoindex_filename);
printf("GVA_load_videoindex MTIME_INDEX:%ld FILE:%ld\n"
, (long)vindex->mtime
, (long)l_mtime);
- }
- }
+ }
+ }
- }
- fclose(fp);
- if(delete_flag)
- {
- /* delete OLD videoindex
- * (that has become unusable because mtime does not match with videofile) */
- g_remove(vindex->videoindex_filename);
- }
+ }
+ fclose(fp);
+ if(delete_flag)
+ {
+ /* delete OLD videoindex
+ * (that has become unusable because mtime does not match with videofile) */
+ g_remove(vindex->videoindex_filename);
+ }
}
else
{
@@ -610,12 +610,12 @@
/* write VIDEOFILE_URI + terminating \0 character(s) */
{
- gchar *uri_buffer;
+ gchar *uri_buffer;
- uri_buffer = g_malloc0(l_flen);
- g_snprintf(uri_buffer, l_flen, "%s", vindex->videofile_uri);
- fwrite(uri_buffer, 1, l_flen, fp);
- g_free(uri_buffer);
+ uri_buffer = g_malloc0(l_flen);
+ g_snprintf(uri_buffer, l_flen, "%s", vindex->videofile_uri);
+ fwrite(uri_buffer, 1, l_flen, fp);
+ g_free(uri_buffer);
}
/* write offset table */
@@ -629,10 +629,10 @@
l_errno = errno;
g_message(_("ERROR: Failed to write videoindex file\n"
- "file: '%s'\n"
- "%s")
- , vindex->videoindex_filename
- , g_strerror (l_errno));
+ "file: '%s'\n"
+ "%s")
+ , vindex->videoindex_filename
+ , g_strerror (l_errno));
}
}
Modified: trunk/libgapvidutil/gap_gve_jpeg.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_jpeg.c (original)
+++ trunk/libgapvidutil/gap_gve_jpeg.c Sun Apr 5 06:47:07 2009
@@ -93,8 +93,8 @@
#if 0
struct jpeg_destination_mgr {
- JOCTET * next_output_byte; /* => next byte to write in buffer */
- size_t free_in_buffer; /* # of byte spaces remaining in buffer */
+ JOCTET * next_output_byte; /* => next byte to write in buffer */
+ size_t free_in_buffer; /* # of byte spaces remaining in buffer */
JMETHOD(void, init_destination, (j_compress_ptr cinfo));
JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
@@ -146,7 +146,7 @@
memjpeg_dest_mgr * dest = (memjpeg_dest_mgr *) cinfo->dest;
printf("EMERGENCY in gap_movtar: The jpeg memory compression\n is limited to 256 kb/frame !\n"
- "Consult gz lysator liu se to fix this problem !\n");
+ "Consult gz lysator liu se to fix this problem !\n");
ERREXIT(cinfo, JERR_FILE_WRITE);
dest->pub.next_output_byte = dest->buffer;
@@ -190,10 +190,10 @@
/* printf("GAP_MOVTAR: Running jpeg_memio_dest !\n");
*/
if (cinfo->dest == NULL)
- { /* first time for this JPEG object? */
+ { /* first time for this JPEG object? */
cinfo->dest = (struct jpeg_destination_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
- sizeof(memjpeg_dest_mgr));
+ (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+ sizeof(memjpeg_dest_mgr));
}
dest = (memjpeg_dest_mgr *) cinfo->dest;
@@ -218,8 +218,8 @@
guchar *
gap_gve_jpeg_drawable_encode_jpeg(GimpDrawable *drawable, gint32 jpeg_interlaced, gint32 *JPEG_size,
- gint32 jpeg_quality, gint32 odd_even, gint32 use_YUV411,
- void *app0_buffer, gint32 app0_length)
+ gint32 jpeg_quality, gint32 odd_even, gint32 use_YUV411,
+ void *app0_buffer, gint32 app0_length)
{
GimpPixelRgn pixel_rgn;
GimpImageType drawable_type;
@@ -301,7 +301,7 @@
cinfo.image_height = drawable->height;
/* colorspace of input image */
cinfo.in_color_space = (drawable_type == GIMP_RGB_IMAGE ||
- drawable_type == GIMP_RGBA_IMAGE)
+ drawable_type == GIMP_RGBA_IMAGE)
? JCS_RGB : JCS_GRAYSCALE;
/* Now use the library's routine to set default compression parameters.
* (You must set at least cinfo.in_color_space before calling this,
@@ -347,46 +347,46 @@
data = (guchar *) g_malloc0 (rowstride * gimp_tile_height ());
for (y = (odd_even) ? 1 : 0; (odd_even) ? (y >= 0) : (y <= 1); (odd_even) ? (y--) : (y++))
- {
- if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: interlaced picture, now coding %s lines\n",
- y ? "odd" : "even");
-
- jpeg_start_compress (&cinfo, TRUE);
-
- /* Step 4.1: Write the app0 marker out */
- if(app0_buffer)
- jpeg_write_marker(&cinfo,
- JPEG_APP0,
- app0_buffer,
- app0_length);
-
- while (cinfo.next_scanline < cinfo.image_height)
- {
- if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: Line %d !", cinfo.next_scanline);
- gimp_pixel_rgn_get_rect (&pixel_rgn, data, 0, 2 * cinfo.next_scanline + y,
- cinfo.image_width, 1);
-
- /* Get rid of all the bad stuff (tm) (= get the right pixel order for JPEG encoding) */
- t = temp;
- s = data;
- i = cinfo.image_width;
-
- while (i--)
- {
- for (j = 0; j < cinfo.input_components; j++)
- *t++ = *s++;
- if (has_alpha) /* ignore alpha channel */
- s++;
- }
-
- src += 2*rowstride;
- jpeg_write_scanlines (&cinfo, (JSAMPARRAY) &temp, 1);
- }
-
- jpeg_finish_compress(&cinfo);
- totalsize += (OUTPUT_BUF_SIZE - *JPEG_buf_remain);
- /* JPEG_data = (guchar *)realloc(JPEG_data, sizeof(guchar)* *JPEG_size); */
- }
+ {
+ if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: interlaced picture, now coding %s lines\n",
+ y ? "odd" : "even");
+
+ jpeg_start_compress (&cinfo, TRUE);
+
+ /* Step 4.1: Write the app0 marker out */
+ if(app0_buffer)
+ jpeg_write_marker(&cinfo,
+ JPEG_APP0,
+ app0_buffer,
+ app0_length);
+
+ while (cinfo.next_scanline < cinfo.image_height)
+ {
+ if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: Line %d !", cinfo.next_scanline);
+ gimp_pixel_rgn_get_rect (&pixel_rgn, data, 0, 2 * cinfo.next_scanline + y,
+ cinfo.image_width, 1);
+
+ /* Get rid of all the bad stuff (tm) (= get the right pixel order for JPEG encoding) */
+ t = temp;
+ s = data;
+ i = cinfo.image_width;
+
+ while (i--)
+ {
+ for (j = 0; j < cinfo.input_components; j++)
+ *t++ = *s++;
+ if (has_alpha) /* ignore alpha channel */
+ s++;
+ }
+
+ src += 2*rowstride;
+ jpeg_write_scanlines (&cinfo, (JSAMPARRAY) &temp, 1);
+ }
+
+ jpeg_finish_compress(&cinfo);
+ totalsize += (OUTPUT_BUF_SIZE - *JPEG_buf_remain);
+ /* JPEG_data = (guchar *)realloc(JPEG_data, sizeof(guchar)* *JPEG_size); */
+ }
/* fprintf(stderr, "2 fields written.\n"); */
}
else
@@ -401,10 +401,10 @@
/* Step 4.1: Write the app0 marker out */
if(app0_buffer)
- jpeg_write_marker(&cinfo,
- JPEG_APP0,
- app0_buffer,
- app0_length);
+ jpeg_write_marker(&cinfo,
+ JPEG_APP0,
+ app0_buffer,
+ app0_length);
/* Step 5: while (scan lines remain to be written) */
/* jpeg_write_scanlines(...); */
@@ -424,32 +424,32 @@
src = NULL;
while (cinfo.next_scanline < cinfo.image_height)
- {
- if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: Line %d !", cinfo.next_scanline);
- if ((cinfo.next_scanline % gimp_tile_height ()) == 0)
- {
- yend = cinfo.next_scanline + gimp_tile_height ();
- yend = MIN (yend, cinfo.image_height);
- gimp_pixel_rgn_get_rect (&pixel_rgn, data, 0, cinfo.next_scanline, cinfo.image_width,
- (yend - cinfo.next_scanline));
- src = data;
- }
-
- t = temp;
- s = src;
- i = cinfo.image_width;
-
- while (i--)
- {
- for (j = 0; j < cinfo.input_components; j++)
- *t++ = *s++;
- if (has_alpha) /* ignore alpha channel */
- s++;
- }
-
- src += rowstride;
- jpeg_write_scanlines (&cinfo, (JSAMPARRAY) &temp, 1);
- }
+ {
+ if (jpeg_debug) fprintf(stderr, "GAP_AVI: encode_jpeg: Line %d !", cinfo.next_scanline);
+ if ((cinfo.next_scanline % gimp_tile_height ()) == 0)
+ {
+ yend = cinfo.next_scanline + gimp_tile_height ();
+ yend = MIN (yend, cinfo.image_height);
+ gimp_pixel_rgn_get_rect (&pixel_rgn, data, 0, cinfo.next_scanline, cinfo.image_width,
+ (yend - cinfo.next_scanline));
+ src = data;
+ }
+
+ t = temp;
+ s = src;
+ i = cinfo.image_width;
+
+ while (i--)
+ {
+ for (j = 0; j < cinfo.input_components; j++)
+ *t++ = *s++;
+ if (has_alpha) /* ignore alpha channel */
+ s++;
+ }
+
+ src += rowstride;
+ jpeg_write_scanlines (&cinfo, (JSAMPARRAY) &temp, 1);
+ }
/* Step 6: Finish compression */
jpeg_finish_compress (&cinfo);
Modified: trunk/libgapvidutil/gap_gve_jpeg.h
==============================================================================
--- trunk/libgapvidutil/gap_gve_jpeg.h (original)
+++ trunk/libgapvidutil/gap_gve_jpeg.h Sun Apr 5 06:47:07 2009
@@ -33,8 +33,8 @@
*/
guchar *gap_gve_jpeg_drawable_encode_jpeg(GimpDrawable *drawable, gint32 jpeg_interlaced, gint32 *JPEG_size,
- gint32 jpeg_quality, gint32 odd_even, gint32 use_YUV411,
- void *app0_buffer, gint32 app0_length);
+ gint32 jpeg_quality, gint32 odd_even, gint32 use_YUV411,
+ void *app0_buffer, gint32 app0_length);
Modified: trunk/libgapvidutil/gap_gve_misc_util.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_misc_util.c (original)
+++ trunk/libgapvidutil/gap_gve_misc_util.c Sun Apr 5 06:47:07 2009
@@ -72,7 +72,7 @@
return_vals = gimp_run_procedure (l_called_proc,
&nreturn_vals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_DRAWABLE, dummy_layer_id,
GIMP_PDB_END);
Modified: trunk/libgapvidutil/gap_gve_png.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_png.c (original)
+++ trunk/libgapvidutil/gap_gve_png.c Sun Apr 5 06:47:07 2009
@@ -68,21 +68,21 @@
{
printf("GAP: PNG encode via call of %s on filename: %s, image_id:%d, drawable_id:%d %s\n"
, l_called_proc
- , filename
+ , filename
, image_id
, drawable_id
- );
+ );
}
return_vals = gimp_run_procedure (l_called_proc,
&nreturn_vals,
GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE /* runmode */,
- GIMP_PDB_IMAGE, image_id,
- GIMP_PDB_DRAWABLE, drawable_id,
- GIMP_PDB_STRING, filename,
- GIMP_PDB_STRING, filename,
- GIMP_PDB_INT32, png_interlaced,
- GIMP_PDB_INT32, png_compression,
+ GIMP_PDB_IMAGE, image_id,
+ GIMP_PDB_DRAWABLE, drawable_id,
+ GIMP_PDB_STRING, filename,
+ GIMP_PDB_STRING, filename,
+ GIMP_PDB_INT32, png_interlaced,
+ GIMP_PDB_INT32, png_compression,
GIMP_PDB_INT32, 0, /* Write bKGD chunk? */
GIMP_PDB_INT32, 0, /* Write gAMA chunk? */
GIMP_PDB_INT32, 0, /* Write oFFs chunk? */
@@ -101,12 +101,12 @@
gimp_destroy_params(return_vals, nreturn_vals);
printf("GAP: Error: PDB call of %s failed on filename: %s, image_id:%d, drawable_id:%d, d_status:%d %s\n"
, l_called_proc
- , filename
+ , filename
, image_id
, drawable_id
, (int)return_vals[0].data.d_status
, p_status_to_string(return_vals[0].data.d_status)
- );
+ );
return(FALSE);
} /* end p_save_as_tmp_png_file */
@@ -128,8 +128,8 @@
*/
guchar *
gap_gve_png_drawable_encode_png(GimpDrawable *drawable, gint32 png_interlaced, gint32 *PNG_size,
- gint32 png_compression,
- void *app0_buffer, gint32 app0_length)
+ gint32 png_compression,
+ void *app0_buffer, gint32 app0_length)
{
guchar *buffer;
guchar *PNG_data;
Modified: trunk/libgapvidutil/gap_gve_png.h
==============================================================================
--- trunk/libgapvidutil/gap_gve_png.h (original)
+++ trunk/libgapvidutil/gap_gve_png.h Sun Apr 5 06:47:07 2009
@@ -27,8 +27,8 @@
*/
guchar *gap_gve_png_drawable_encode_png(GimpDrawable *drawable, gint32 png_interlaced, gint32 *PNG_size,
- gint32 png_compression,
- void *app0_buffer, gint32 app0_length);
+ gint32 png_compression,
+ void *app0_buffer, gint32 app0_length);
Modified: trunk/libgapvidutil/gap_gve_raw.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_raw.c (original)
+++ trunk/libgapvidutil/gap_gve_raw.c Sun Apr 5 06:47:07 2009
@@ -114,7 +114,7 @@
gimp_pixel_rgn_get_rect (&pixel_rgn, pixelrow_data
, 0
, l_src_row
- , drawable->width
+ , drawable->width
, 1);
for(l_idx=0;l_idx < l_rowstride; l_idx += drawable->bpp)
{
@@ -186,7 +186,7 @@
gimp_pixel_rgn_get_rect (&pixel_rgn, pixelrow_data
, 0
, l_src_row
- , drawable->width
+ , drawable->width
, 1);
for(l_idx=0;l_idx < l_rowstride; l_idx += drawable->bpp)
{
@@ -350,7 +350,7 @@
#define SCALEBITS 8
#define ONE_HALF (1 << (SCALEBITS - 1))
-#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5))
+#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5))
void
gap_gve_raw_YUV420P_drawable_encode(GimpDrawable *drawable, guchar *yuv420_buffer)
@@ -399,7 +399,7 @@
gimp_pixel_rgn_get_rect (&srcPR, all_pixelrows
, 0
, 0
- , drawable->width
+ , drawable->width
, drawable->height /* get all rows */
);
Modified: trunk/libgapvidutil/gap_gve_sox.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_sox.c (original)
+++ trunk/libgapvidutil/gap_gve_sox.c Sun Apr 5 06:47:07 2009
@@ -110,14 +110,14 @@
/* check for WAV file or valid audio playlist, and get audio informations */
l_rc = gap_audio_playlist_wav_file_check(cval->audioname1
, &samplerate
- , &channels
+ , &channels
, &bytes_per_sample
- , &bits
- , &samples
- , &all_playlist_references
- , &valid_playlist_references
- , cval->samplerate
- );
+ , &bits
+ , &samples
+ , &all_playlist_references
+ , &valid_playlist_references
+ , cval->samplerate
+ );
if (valid_playlist_references > 0)
{
@@ -154,7 +154,7 @@
if(cval->run_mode == GIMP_RUN_INTERACTIVE)
{
g_message(l_msg);
- }
+ }
return -1;
}
@@ -168,15 +168,15 @@
if(!g_file_test(cval->tmp_audfile, G_FILE_TEST_EXISTS))
{
l_msg = g_strdup_printf(_("ERROR: Could not create resampled WAV workfile\n\n"
- "1.) check write permission on \n file: %s\n"
- "2.) check if SOX (version >= 12.16) is installed:\n prog: %s\n")
+ "1.) check write permission on \n file: %s\n"
+ "2.) check if SOX (version >= 12.16) is installed:\n prog: %s\n")
, cval->tmp_audfile
- , cval->util_sox
- );
+ , cval->util_sox
+ );
if(cval->run_mode == GIMP_RUN_INTERACTIVE)
{
g_message(l_msg);
- }
+ }
g_free(l_msg);
return -1;
}
Modified: trunk/libgapvidutil/gap_gve_xvid.c
==============================================================================
--- trunk/libgapvidutil/gap_gve_xvid.c (original)
+++ trunk/libgapvidutil/gap_gve_xvid.c Sun Apr 5 06:47:07 2009
@@ -87,11 +87,11 @@
totalsize = LONG_PACK('M','P','4','U');
if(*((char *)(&totalsize)) == 'M')
{
- bigendian = 1;
+ bigendian = 1;
}
else
{
- bigendian = 0;
+ bigendian = 0;
}
/* get legth of file */
@@ -137,59 +137,59 @@
gap_gve_xvid_algorithm_preset(GapGveXvidValues *xvid_val)
{
static int const motion_presets[7] = {
- /* quality 0 */
- 0,
+ /* quality 0 */
+ 0,
- /* quality 1 */
- XVID_ME_ADVANCEDDIAMOND16,
+ /* quality 1 */
+ XVID_ME_ADVANCEDDIAMOND16,
- /* quality 2 */
- XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16,
+ /* quality 2 */
+ XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16,
- /* quality 3 */
- XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
- XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8,
-
- /* quality 4 */
- XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
- XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
- XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
-
- /* quality 5 */
- XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
- XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
- XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
-
- /* quality 6 */
- XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
- XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 |
- XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
+ /* quality 3 */
+ XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+ XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8,
+
+ /* quality 4 */
+ XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+ XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
+ XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
+
+ /* quality 5 */
+ XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
+ XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
+ XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
+
+ /* quality 6 */
+ XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
+ XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 |
+ XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
};
static const int vop_presets[] = {
- /* quality 0 */
- 0,
+ /* quality 0 */
+ 0,
- /* quality 1 */
- 0,
+ /* quality 1 */
+ 0,
- /* quality 2 */
- XVID_VOP_HALFPEL,
+ /* quality 2 */
+ XVID_VOP_HALFPEL,
- /* quality 3 */
- XVID_VOP_HALFPEL | XVID_VOP_INTER4V,
+ /* quality 3 */
+ XVID_VOP_HALFPEL | XVID_VOP_INTER4V,
- /* quality 4 */
- XVID_VOP_HALFPEL | XVID_VOP_INTER4V,
+ /* quality 4 */
+ XVID_VOP_HALFPEL | XVID_VOP_INTER4V,
- /* quality 5 */
- XVID_VOP_HALFPEL | XVID_VOP_INTER4V |
- XVID_VOP_TRELLISQUANT,
+ /* quality 5 */
+ XVID_VOP_HALFPEL | XVID_VOP_INTER4V |
+ XVID_VOP_TRELLISQUANT,
- /* quality 6 */
- XVID_VOP_HALFPEL | XVID_VOP_INTER4V |
- XVID_VOP_TRELLISQUANT | XVID_VOP_HQACPRED,
+ /* quality 6 */
+ XVID_VOP_HALFPEL | XVID_VOP_INTER4V |
+ XVID_VOP_TRELLISQUANT | XVID_VOP_HQACPRED,
};
if((xvid_val->quality_preset >= 0) && (xvid_val->quality_preset < 7))
@@ -239,7 +239,7 @@
,(int)XVID_VERSION_MAJOR(xvid_gbl_init->version)
,(int)XVID_VERSION_MINOR(xvid_gbl_init->version)
,(int)XVID_VERSION_PATCH(xvid_gbl_init->version)
- );
+ );
}
Modified: trunk/vid_common/gap_cme_callbacks.c
==============================================================================
--- trunk/vid_common/gap_cme_callbacks.c (original)
+++ trunk/vid_common/gap_cme_callbacks.c Sun Apr 5 06:47:07 2009
@@ -330,7 +330,7 @@
{
if(gap_debug)
{
- printf("CB: on_cme__combo_encoder index: %d, %s, plugin: %s\n"
+ printf("CB: on_cme__combo_encoder index: %d, %s, plugin: %s\n"
, (int)l_ecp->menu_nr
, l_ecp->menu_name
, l_ecp->vid_enc_plugin);
@@ -1193,7 +1193,7 @@
if(g_file_test(gpp->val.storyboard_file, G_FILE_TEST_EXISTS))
{
gpp->storyboard_create_composite_audio = TRUE;
- gap_cme_gui_check_storyboard_file(gpp);
+ gap_cme_gui_check_storyboard_file(gpp);
}
}
}
Modified: trunk/vid_common/gap_cme_gui.c
==============================================================================
--- trunk/vid_common/gap_cme_gui.c (original)
+++ trunk/vid_common/gap_cme_gui.c Sun Apr 5 06:47:07 2009
@@ -105,7 +105,7 @@
static void p_replace_combo_encodername(GapCmeGlobalParams *gpp);
static void p_get_range_from_type (GapCmeGlobalParams *gpp
, GapLibTypeInputRange range_type
- , gint32 *lower
+ , gint32 *lower
, gint32 *upper
);
static void p_get_range_and_type (GapCmeGlobalParams *gpp
@@ -221,9 +221,9 @@
gpp->val.gui_proc_thread =
g_thread_create((GThreadFunc)gap_cme_gui_thread_async_pdb_call
, NULL /* data */
- , joinable
- , NULL /* GError **error (NULL dont report errors) */
- );
+ , joinable
+ , NULL /* GError **error (NULL dont report errors) */
+ );
if(gap_debug) printf("MASTER: After g_thread_create\n");
#else
@@ -723,7 +723,7 @@
static void
p_get_range_from_type (GapCmeGlobalParams *gpp
, GapLibTypeInputRange range_type
- , gint32 *lower
+ , gint32 *lower
, gint32 *upper
)
{
@@ -737,22 +737,22 @@
gstb = &global_stb;
*upper = gstb->total_stroyboard_frames;
- if(*upper > 0)
- {
+ if(*upper > 0)
+ {
*lower = 1;
- }
+ }
}
break;
case GAP_RNGTYPE_LAYER:
{
- gint l_nlayers;
- gint32 *l_layers_list;
+ gint l_nlayers;
+ gint32 *l_layers_list;
- l_layers_list = gimp_image_get_layers(gpp->val.image_ID, &l_nlayers);
- g_free(l_layers_list);
- *lower = 0;
- *upper = l_nlayers -1;
+ l_layers_list = gimp_image_get_layers(gpp->val.image_ID, &l_nlayers);
+ g_free(l_layers_list);
+ *lower = 0;
+ *upper = l_nlayers -1;
}
break;
default:
@@ -938,14 +938,14 @@
/* check for WAV file or valid audio playlist, and get audio informations */
l_rc = gap_audio_playlist_wav_file_check(audioname
, &samplerate
- , &channels
+ , &channels
, &bytes_per_sample
- , &bits
- , &samples
- , &all_playlist_references
- , &valid_playlist_references
- , gpp->val.samplerate /* desired_samplerate */
- );
+ , &bits
+ , &samples
+ , &all_playlist_references
+ , &valid_playlist_references
+ , gpp->val.samplerate /* desired_samplerate */
+ );
if(gap_debug)
{
@@ -970,10 +970,10 @@
if(all_playlist_references > 0)
{
/* audioname is a audio playlist with references to
- * audiofiles for multiple audio track encding
- * valid_playlist_references holds the number of valid tracks
- * (where samplerate matches the desired samplerate and bits == 16)
- */
+ * audiofiles for multiple audio track encding
+ * valid_playlist_references holds the number of valid tracks
+ * (where samplerate matches the desired samplerate and bits == 16)
+ */
g_snprintf(txt, sizeof(txt), _("List[%d] has [%d] valid tracks, Bit:%d Chan:%d Rate:%d")
, (int)all_playlist_references
, (int)valid_playlist_references
@@ -1084,7 +1084,7 @@
if((gstb->aud_total_sec > 0.0)
&& (gstb->vidhand_open_ok))
{
- sensitive = TRUE;
+ sensitive = TRUE;
}
}
}
@@ -1734,11 +1734,11 @@
vidhand = gap_gve_story_open_extended_video_handle
( FALSE /* dont ignore video */
, FALSE /* dont ignore audio */
- , l_create_audio_tmp_files
+ , l_create_audio_tmp_files
, &gstb->progress
, &gstb->status_msg[0]
, sizeof(gstb->status_msg)
- , GAP_RNGTYPE_STORYBOARD
+ , GAP_RNGTYPE_STORYBOARD
, NULL /* use no imagename */
, gpp->val.storyboard_file
, NULL /* use no basename */
@@ -1784,10 +1784,10 @@
gap_gve_story_create_composite_audiofile(vidhand, l_composite_audio);
if(g_file_test(l_composite_audio, G_FILE_TEST_EXISTS))
{
- g_snprintf(gstb->composite_audio, sizeof(gstb->composite_audio)
- , "%s"
- ,l_composite_audio
- );
+ g_snprintf(gstb->composite_audio, sizeof(gstb->composite_audio)
+ , "%s"
+ ,l_composite_audio
+ );
if(gap_debug) gap_gve_story_debug_print_audiorange_list(vidhand->aud_list, -1);
gap_gve_story_drop_audio_cache();
@@ -1920,9 +1920,9 @@
gpp->val.gui_proc_thread =
g_thread_create((GThreadFunc)p_thread_storyboard_file
, NULL /* data */
- , joinable
- , NULL /* GError **error (NULL dont report errors) */
- );
+ , joinable
+ , NULL /* GError **error (NULL dont report errors) */
+ );
if(gap_debug) printf("MASTER: After storyborad g_thread_create\n");
@@ -1955,8 +1955,8 @@
if(gap_arr_ok_cancel_dialog(_("Storyboardfile Check")
,_("Storyboardfile Check")
- ,1
- ,argv
+ ,1
+ ,argv
))
{
do_processing = TRUE;
@@ -2464,16 +2464,16 @@
l_radio_pressed = (gpp->val.input_mode == GAP_RNGTYPE_FRAMES);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Input is a sequence of frame images"), NULL);
gtk_widget_show (radio_button);
g_object_set_data (G_OBJECT (radio_button), RADIO_ITEM_INDEX_KEY
, (gpointer)GAP_RNGTYPE_FRAMES
- );
+ );
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_input_mode_radio_callback),
- gpp);
+ G_CALLBACK (p_input_mode_radio_callback),
+ gpp);
l_idx = 1;
@@ -2487,16 +2487,16 @@
l_radio_pressed = (gpp->val.input_mode == GAP_RNGTYPE_LAYER);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Input is all the layers of one image"), NULL);
gtk_widget_show (radio_button);
g_object_set_data (G_OBJECT (radio_button), RADIO_ITEM_INDEX_KEY
, (gpointer)GAP_RNGTYPE_LAYER
- );
+ );
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_input_mode_radio_callback),
- gpp);
+ G_CALLBACK (p_input_mode_radio_callback),
+ gpp);
@@ -2511,18 +2511,18 @@
l_radio_pressed = (gpp->val.input_mode == GAP_RNGTYPE_STORYBOARD);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
- l_radio_pressed);
+ l_radio_pressed);
gimp_help_set_help_data(radio_button, _("Input is videoclips and frames, defined via storyboard file. "
"(specify the storyboard filename in the extras tab)")
- , NULL);
+ , NULL);
gtk_widget_show (radio_button);
g_object_set_data (G_OBJECT (radio_button), RADIO_ITEM_INDEX_KEY
, (gpointer)GAP_RNGTYPE_STORYBOARD
- );
+ );
g_signal_connect ( G_OBJECT (radio_button), "toggled",
- G_CALLBACK (p_input_mode_radio_callback),
- gpp);
+ G_CALLBACK (p_input_mode_radio_callback),
+ gpp);
/* attach radio_table */
@@ -2598,7 +2598,7 @@
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0)
- , label);
+ , label);
/* the Audio Options notebook tab */
@@ -2610,7 +2610,7 @@
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1)
- , label);
+ , label);
/* the Audio Tool notebook tab */
@@ -2622,7 +2622,7 @@
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2)
- , label);
+ , label);
@@ -2635,7 +2635,7 @@
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3)
- , label);
+ , label);
/* add the Encoding notebook tab */
label = gtk_label_new (_("Encoding"));
@@ -2647,7 +2647,7 @@
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 4)
- , label);
+ , label);
/* the output frame */
@@ -3023,9 +3023,9 @@
gimp_help_set_help_data (button
, _("create a composite audiofile "
"as mixdown of all audio tracks in the "
- "storyboard file and use the created composite audiofile "
- "as input for encoding")
- , NULL);
+ "storyboard file and use the created composite audiofile "
+ "as input for encoding")
+ , NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (on_cme__button_stb_audio_clicked),
gpp);
@@ -3034,9 +3034,9 @@
/* the storyboard helptext & parsing report label */
label = gtk_label_new (_("Storyboardfiles are textfiles that are used to\n"
- "assemble a video from a list of single images,\n"
- "frameranges, videoclips, gif animations or audiofiles.\n"
- "(see STORYBOARD_FILE_DOC.txt for details)"));
+ "assemble a video from a list of single images,\n"
+ "frameranges, videoclips, gif animations or audiofiles.\n"
+ "(see STORYBOARD_FILE_DOC.txt for details)"));
gpp->cme__label_storyboard_helptext = label;
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table1), label, 0, 3, row, row+1,
@@ -3300,11 +3300,11 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data (entry
, _("Name of audiofile (.wav 16 bit mono or stereo samples preferred). "
- "Optionally you may select a textfile that contains a list "
- "of file names referring to audio files. "
- "Each of those audio files will be encoded as a separate audio track.")
- , NULL)
- ;
+ "Optionally you may select a textfile that contains a list "
+ "of file names referring to audio files. "
+ "Each of those audio files will be encoded as a separate audio track.")
+ , NULL)
+ ;
g_signal_connect (G_OBJECT (entry), "changed",
G_CALLBACK (on_cme__entry_audio1_changed),
gpp);
@@ -3447,10 +3447,10 @@
/* the resample general information label */
label = gtk_label_new (_("\nNote:\n"
"if you set samplerate lower than\n"
- "rate of the WAV file, you lose sound quality,\n"
- "but higher samplerates can not improve the\n"
- "quality of the original sound.")
- );
+ "rate of the WAV file, you lose sound quality,\n"
+ "but higher samplerates can not improve the\n"
+ "quality of the original sound.")
+ );
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1,
(GtkAttachOptions) (0),
@@ -4295,9 +4295,9 @@
gpp->productive_encoder_thread =
g_thread_create((GThreadFunc)gap_cme_encoder_worker_thread
, gpp /* data */
- , joinable
- , NULL /* GError **error (NULL dont report errors) */
- );
+ , joinable
+ , NULL /* GError **error (NULL dont report errors) */
+ );
if(gap_debug)
{
Modified: trunk/vid_common/gap_cme_gui.h
==============================================================================
--- trunk/vid_common/gap_cme_gui.h (original)
+++ trunk/vid_common/gap_cme_gui.h Sun Apr 5 06:47:07 2009
@@ -58,10 +58,10 @@
void gap_cme_gui_remove_poll_timer(GapCmeGlobalParams *gpp);
gboolean gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp);
-GtkWidget* gap_cme_gui_create_fss__fileselection (GapCmeGlobalParams *gpp);
-GtkWidget* gap_cme_gui_create_fsv__fileselection (GapCmeGlobalParams *gpp);
-GtkWidget* gap_cme_gui_create_fsb__fileselection (GapCmeGlobalParams *gpp);
-GtkWidget* gap_cme_gui_create_fsa__fileselection (GapCmeGlobalParams *gpp);
+GtkWidget* gap_cme_gui_create_fss__fileselection (GapCmeGlobalParams *gpp);
+GtkWidget* gap_cme_gui_create_fsv__fileselection (GapCmeGlobalParams *gpp);
+GtkWidget* gap_cme_gui_create_fsb__fileselection (GapCmeGlobalParams *gpp);
+GtkWidget* gap_cme_gui_create_fsa__fileselection (GapCmeGlobalParams *gpp);
void gap_cme_gui_update_encoder_status(GapCmeGlobalParams *gpp);
gint32 gap_cme_gui_start_video_encoder(GapCmeGlobalParams *gpp);
Modified: trunk/vid_common/gap_cme_main.c
==============================================================================
--- trunk/vid_common/gap_cme_main.c (original)
+++ trunk/vid_common/gap_cme_main.c Sun Apr 5 06:47:07 2009
@@ -129,12 +129,12 @@
},
{GIMP_PDB_STRING, "filtermacro_file", "macro to apply on each handled frame."
" filtermacro_files are textfiles with filter plugin names and LASTVALUE bufferdump,"
- " usually created by gimp-gap filermacro dialog "
- " (menu: Filters->Filtermacro)"},
+ " usually created by gimp-gap filermacro dialog "
+ " (menu: Filters->Filtermacro)"},
{GIMP_PDB_STRING, "storyboard_file", "textfile with list of one or more images, framesequences, videoclips or audioclips (see storyboard docs for more information)"},
{GIMP_PDB_INT32, "input_mode", "0 ... image is one of the frames to encode, range_from/to params refere to numberpart of the other frameimages on disc. \n"
"1 ... image is multilayer, range_from/to params refere to layer index. \n"
- "2 ... image is ignored, input is specified by storyboard_file parameter."},
+ "2 ... image is ignored, input is specified by storyboard_file parameter."},
};
static int nargs_qt_enc = sizeof(args_qt_enc) / sizeof(args_qt_enc[0]);
@@ -272,7 +272,7 @@
*/
if (n_params >= GAP_VENC_NUM_STANDARD_PARAM -1)
{
- l_copy_parameters = TRUE;
+ l_copy_parameters = TRUE;
}
else
{
@@ -281,26 +281,26 @@
}
else
{
- if(gpp->val.run_mode == GIMP_RUN_INTERACTIVE)
- {
+ if(gpp->val.run_mode == GIMP_RUN_INTERACTIVE)
+ {
if (n_params >= GAP_VENC_NUM_STANDARD_PARAM -1)
{
- l_copy_parameters = TRUE;
- }
- /* dont complain on less parameters at INTERCATIVE calls */
- }
- else
- {
+ l_copy_parameters = TRUE;
+ }
+ /* dont complain on less parameters at INTERCATIVE calls */
+ }
+ else
+ {
values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
- }
+ }
}
if(l_copy_parameters)
{
if(param[3].data.d_string)
- {
- g_snprintf(gpp->val.videoname, sizeof(gpp->val.videoname), "%s", param[3].data.d_string);
- }
+ {
+ g_snprintf(gpp->val.videoname, sizeof(gpp->val.videoname), "%s", param[3].data.d_string);
+ }
if (param[4].data.d_int32 >= 0) { gpp->val.range_from = param[4].data.d_int32; }
if (param[5].data.d_int32 >= 0) { gpp->val.range_to = param[5].data.d_int32; }
if (param[6].data.d_int32 > 0) { gpp->val.vid_width = param[6].data.d_int32; }
@@ -309,22 +309,22 @@
gpp->val.framerate = MAX(param[9].data.d_float, 1.0);
gpp->val.samplerate = param[10].data.d_int32;
if(param[11].data.d_string)
- {
- g_snprintf(gpp->val.audioname1, sizeof(gpp->val.audioname1), "%s", param[11].data.d_string);
- }
- if(param[12].data.d_string)
- {
+ {
+ g_snprintf(gpp->val.audioname1, sizeof(gpp->val.audioname1), "%s", param[11].data.d_string);
+ }
+ if(param[12].data.d_string)
+ {
g_snprintf(gpp->val.ecp_sel.vid_enc_plugin, sizeof(gpp->val.ecp_sel.vid_enc_plugin), "%s", param[12].data.d_string);
- }
- if(param[13].data.d_string)
- {
+ }
+ if(param[13].data.d_string)
+ {
g_snprintf(gpp->val.filtermacro_file, sizeof(gpp->val.filtermacro_file), "%s", param[13].data.d_string);
- }
- if(param[14].data.d_string)
- {
+ }
+ if(param[14].data.d_string)
+ {
g_snprintf(gpp->val.storyboard_file, sizeof(gpp->val.storyboard_file), "%s", param[14].data.d_string);
- }
-
+ }
+
if (param[15].data.d_int32 >= 0) { gpp->val.input_mode = param[15].data.d_int32; }
}
@@ -345,10 +345,10 @@
{
printf("MAIN after gap_cme_gui_master_encoder_dialog ------------------\n");
}
- if(l_rc < 0)
- {
+ if(l_rc < 0)
+ {
values[0].data.d_status = GIMP_PDB_CANCEL;
- }
+ }
}
else
Modified: trunk/vid_enc_avi/gap_enc_avi_gui.c
==============================================================================
--- trunk/vid_enc_avi/gap_enc_avi_gui.c (original)
+++ trunk/vid_enc_avi/gap_enc_avi_gui.c Sun Apr 5 06:47:07 2009
@@ -454,7 +454,7 @@
NULL, 0,
gimp_standard_help_func, GAP_HELP_ID_AVI_PARAMS,
- GIMP_STOCK_RESET, GAP_ENC_AVI_RESPONSE_RESET,
+ GIMP_STOCK_RESET, GAP_ENC_AVI_RESPONSE_RESET,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
@@ -847,7 +847,7 @@
/* the raw codec info label */
label = gtk_label_new (_("The RAW codec has no encoding options.\n"
"The resulting videoframes will be\n"
- "uncompressed."));
+ "uncompressed."));
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table_raw), label, 0, 3, raw_row, raw_row+1,
(GtkAttachOptions) (0),
@@ -880,8 +880,8 @@
, &epp->raw_vflip);
gimp_help_set_help_data (checkbutton
, _("Check if you want to encode frames vertically flipped "
- "(suitable for playback on WinDVD player) "
- "or as is (suitable for gmplayer on linux)")
+ "(suitable for playback on WinDVD player) "
+ "or as is (suitable for gmplayer on linux)")
, NULL);
Modified: trunk/vid_enc_avi/gap_enc_avi_main.c
==============================================================================
--- trunk/vid_enc_avi/gap_enc_avi_main.c (original)
+++ trunk/vid_enc_avi/gap_enc_avi_main.c Sun Apr 5 06:47:07 2009
@@ -140,7 +140,7 @@
{GIMP_PDB_STRING, "storyboard_file", "textfile with list of one or more framesequences"},
{GIMP_PDB_INT32, "input_mode", "0 ... image is one of the frames to encode, range_from/to params refere to numberpart of the other frameimages on disc. \n"
"1 ... image is multilayer, range_from/to params refere to layer index. \n"
- "2 ... image is ignored, input is specified by storyboard_file parameter."},
+ "2 ... image is ignored, input is specified by storyboard_file parameter."},
{GIMP_PDB_INT32, "master_encoder_id", "id of the master encoder that called this plug-in (typically the pid)"},
};
static int nargs_avi_enc = sizeof(args_avi_enc) / sizeof(args_avi_enc[0]);
@@ -689,7 +689,7 @@
gint32 l_total_framecount;
l_vidhand = gap_gve_story_open_vid_handle (gpp->val.input_mode
,gpp->val.image_ID
- ,gpp->val.storyboard_file
+ ,gpp->val.storyboard_file
,gpp->ainfo.basename
,gpp->ainfo.extension
,gpp->val.range_from
@@ -771,11 +771,11 @@
printf("AVI 4byte code for codec_name: %s\n", codec_name);
}
AVI_set_video( l_avifile
- , gpp->val.vid_width
- , gpp->val.vid_height
- , gpp->val.framerate
- , codec_name /* char *compressor one of "RGB", "JPEG" ... */
- );
+ , gpp->val.vid_width
+ , gpp->val.vid_height
+ , gpp->val.framerate
+ , codec_name /* char *compressor one of "RGB", "JPEG" ... */
+ );
g_free(codec_name);
}
@@ -885,8 +885,8 @@
, l_video_chunk_ptr
, &l_video_frame_chunk_size /* actual chunk size (incl. header) */
, l_maxSizeOfRawFrame /* IN max size */
- , gpp->val.framerate
- , l_max_master_frame_nr
+ , gpp->val.framerate
+ , l_max_master_frame_nr
, &l_video_frame_chunk_hdr_size
, l_check_flags
);
@@ -931,7 +931,7 @@
l_cnt_encoded_frames++;
if (gap_debug)
{
- printf("DEBUG: saving recoded frame %d (fetch as chunk FAILED)\n", (int)l_cur_frame_nr);
+ printf("DEBUG: saving recoded frame %d (fetch as chunk FAILED)\n", (int)l_cur_frame_nr);
}
l_keyframe = TRUE; /* TRUE: keyframe is independent image (I frame or uncompressed)
@@ -982,14 +982,14 @@
/* fill buffer with raw 24bit data, optional flipped.
* it seems that some AVI players (for instance the WinDVD player)
- * require the inverse row order than gimp,
- * and other players (like gmplayer on unix) does not need vflipped images.
+ * require the inverse row order than gimp,
+ * and other players (like gmplayer on unix) does not need vflipped images.
*/
l_vflip = FALSE;
if(epp->raw_vflip != 0)
- {
- l_vflip = TRUE;
- }
+ {
+ l_vflip = TRUE;
+ }
buffer = gap_gve_raw_BGR_drawable_encode(l_drawable, &l_FRAME_size, l_vflip, l_app0_buffer, l_app0_len);
}
#ifdef ENABLE_LIBXVIDCORE
@@ -1006,22 +1006,22 @@
{
/* store the compressed video frame */
if (gap_debug) printf("GAP_AVI: Writing frame nr. %d, size %d\n",
- (int)l_cur_frame_nr, (int)l_FRAME_size);
+ (int)l_cur_frame_nr, (int)l_FRAME_size);
AVI_write_frame(l_avifile, buffer, l_FRAME_size, l_keyframe);
/* free the (un)compressed Frame data buffer */
g_free(buffer);
}
- else
- {
- /* the CODEC delivered a NULL buffer
- * there is something essential wrong (TERMINATE)
- */
- g_message(_("ERROR: GAP AVI encoder CODEC %s delivered empty buffer at frame %d")
- , epp->codec_name
- , (int)l_cur_frame_nr
- );
- l_rc = -1;
- }
+ else
+ {
+ /* the CODEC delivered a NULL buffer
+ * there is something essential wrong (TERMINATE)
+ */
+ g_message(_("ERROR: GAP AVI encoder CODEC %s delivered empty buffer at frame %d")
+ , epp->codec_name
+ , (int)l_cur_frame_nr
+ );
+ l_rc = -1;
+ }
gimp_drawable_detach (l_drawable);
/* destroy the tmp image */
Modified: trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
==============================================================================
--- trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c (original)
+++ trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c Sun Apr 5 06:47:07 2009
@@ -236,16 +236,16 @@
if(gap_debug) printf("WGT is: gpp->ff_intra_checkbutton\n");
if (checkbutton->active)
{
- l_sensitive = FALSE;
+ l_sensitive = FALSE;
}
else
{
- l_sensitive = TRUE;
+ l_sensitive = TRUE;
}
if(gpp->ff_gop_size_spinbutton)
{
- gtk_widget_set_sensitive(gpp->ff_gop_size_spinbutton, l_sensitive);
- gtk_widget_set_sensitive(gpp->ff_b_frames_spinbutton, l_sensitive);
+ gtk_widget_set_sensitive(gpp->ff_gop_size_spinbutton, l_sensitive);
+ gtk_widget_set_sensitive(gpp->ff_b_frames_spinbutton, l_sensitive);
}
}
if((GtkWidget *)checkbutton == gpp->ff_aspect_checkbutton)
@@ -253,15 +253,15 @@
if(gap_debug) printf("WGT is: gpp->ff_aspect_checkbutton\n");
if (checkbutton->active)
{
- l_sensitive = TRUE;
+ l_sensitive = TRUE;
}
else
{
- l_sensitive = FALSE;
+ l_sensitive = FALSE;
}
if(gpp->ff_aspect_combo)
{
- gtk_widget_set_sensitive(gpp->ff_aspect_combo, l_sensitive);
+ gtk_widget_set_sensitive(gpp->ff_aspect_combo, l_sensitive);
}
}
@@ -458,8 +458,8 @@
{
printf("CB: on_ff_gint32_combo index: val_ptr: %d %d\n"
, (int)val_ptr
- , (int)value
- );
+ , (int)value
+ );
}
} /* end on_ff_gint32_combo */
@@ -651,8 +651,8 @@
gimp_set_data(GAP_FFPAR_FILE_KEY
,&gpp->ffpar_filename[0]
- ,sizeof(gpp->ffpar_filename)
- );
+ ,sizeof(gpp->ffpar_filename)
+ );
if(gpp->ffpar_save_flag)
{
@@ -721,7 +721,7 @@
if(gpp->ffpar_filename[0] != '\0')
{
gtk_file_selection_set_filename (GTK_FILE_SELECTION (ffpar_fileselection),
- gpp->ffpar_filename);
+ gpp->ffpar_filename);
}
ffpar_ok_button = GTK_FILE_SELECTION (ffpar_fileselection)->ok_button;
Modified: trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.h
==============================================================================
--- trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.h (original)
+++ trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.h Sun Apr 5 06:47:07 2009
@@ -61,7 +61,7 @@
void
on_ff_gint32_checkbutton_toggled (GtkToggleButton *checkbutton,
gint32 *dest_value_ptr);
-
+
Modified: trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
==============================================================================
--- trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c (original)
+++ trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c Sun Apr 5 06:47:07 2009
@@ -102,14 +102,14 @@
static gint gtab_coder[GAP_GVE_FFMPEG_CODER_TYPE_MAX_ELEMENTS] =
{ GAP_GVE_FFMPEG_CODER_TYPE_00_VLC
- , GAP_GVE_FFMPEG_CODER_TYPE_01_AC
- };
+ , GAP_GVE_FFMPEG_CODER_TYPE_01_AC
+ };
static gint gtab_predictor[GAP_GVE_FFMPEG_PREDICTOR_MAX_ELEMENTS] =
{ GAP_GVE_FFMPEG_PREDICTOR_00_LEFT
- , GAP_GVE_FFMPEG_PREDICTOR_01_PLANE
- , GAP_GVE_FFMPEG_PREDICTOR_02_MEDIAN
- };
+ , GAP_GVE_FFMPEG_PREDICTOR_01_PLANE
+ , GAP_GVE_FFMPEG_PREDICTOR_02_MEDIAN
+ };
static gint gtab_cmp_func[GAP_GVE_FFMPEG_CMP_MAX_ELEMENTS] =
{ GAP_GVE_FFMPEG_CMP_00_SAD
@@ -127,7 +127,7 @@
, GAP_GVE_FFMPEG_CMP_12_W97
, GAP_GVE_FFMPEG_CMP_13_DCTMAX
, GAP_GVE_FFMPEG_CMP_14_CHROMA
- };
+ };
/* lists of all available fileformats and codecs
* (lists are built at runtime by ffmpeg specific query)
@@ -243,9 +243,9 @@
}
g_object_set_data (G_OBJECT (gpp->ff_fileformat_combo)
- , GAP_ENC_FFGUI_COMBO_STRLIST
- , (gpointer)glist_fileformat
- );
+ , GAP_ENC_FFGUI_COMBO_STRLIST
+ , (gpointer)glist_fileformat
+ );
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (gpp->ff_fileformat_combo)
, l_active_idx,
@@ -293,9 +293,9 @@
if(gap_debug)
{
printf("p_replace_combo_vid_codec: val[%d]: %s\n"
- , (int)l_idx
- , menu_name
- );
+ , (int)l_idx
+ , menu_name
+ );
}
elem_vid_codec = (t_string_combo_elem *) g_malloc0(sizeof(t_string_combo_elem));
elem_vid_codec->menu_idx = l_idx;
@@ -317,9 +317,9 @@
}
g_object_set_data (G_OBJECT (gpp->ff_vid_codec_combo)
- , GAP_ENC_FFGUI_COMBO_STRLIST
- , (gpointer)glist_vid_codec
- );
+ , GAP_ENC_FFGUI_COMBO_STRLIST
+ , (gpointer)glist_vid_codec
+ );
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (gpp->ff_vid_codec_combo)
, l_active_idx,
G_CALLBACK (on_ff_vid_codec_combo),
@@ -367,9 +367,9 @@
if(gap_debug)
{
printf("p_replace_combo_aud_codec: val[%d]: %s\n"
- , (int)l_idx
- , menu_name
- );
+ , (int)l_idx
+ , menu_name
+ );
}
elem_aud_codec = (t_string_combo_elem *) g_malloc0(sizeof(t_string_combo_elem));
elem_aud_codec->menu_idx = l_idx;
@@ -391,9 +391,9 @@
}
g_object_set_data (G_OBJECT (gpp->ff_aud_codec_combo)
- , GAP_ENC_FFGUI_COMBO_STRLIST
- , (gpointer)glist_aud_codec
- );
+ , GAP_ENC_FFGUI_COMBO_STRLIST
+ , (gpointer)glist_aud_codec
+ );
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (gpp->ff_aud_codec_combo)
, l_active_idx,
G_CALLBACK (on_ff_aud_codec_combo),
@@ -486,11 +486,11 @@
&& (gpp->evl.pal_height > 0))
{
recomand_size = g_strdup_printf(" Recommanded Framesize : %d x %d (PAL) %d x %d (NTSC)"
- ,(int)gpp->evl.pal_width
- ,(int)gpp->evl.pal_height
- ,(int)gpp->evl.ntsc_width
- ,(int)gpp->evl.ntsc_height
- );
+ ,(int)gpp->evl.pal_width
+ ,(int)gpp->evl.pal_height
+ ,(int)gpp->evl.ntsc_width
+ ,(int)gpp->evl.ntsc_height
+ );
}
else
{
@@ -506,7 +506,7 @@
, default_vid_codec
, default_aud_codec
, ofmt->extensions
- , recomand_size
+ , recomand_size
);
g_free(recomand_size);
}
@@ -572,19 +572,19 @@
{
printf("gap_get_combo_string_by_idx: glist_vid_codec ptr:%d\n"
,(int)string_combo_elem_list
- );
+ );
}
if(string_combo_elem_list == (gpointer)glist_aud_codec)
{
printf("gap_get_combo_string_by_idx: glist_aud_codec ptr:%d\n"
,(int)string_combo_elem_list
- );
+ );
}
if(string_combo_elem_list == (gpointer)glist_fileformat)
{
printf("gap_get_combo_string_by_idx: glist_fileformat ptr:%d\n"
,(int)string_combo_elem_list
- );
+ );
}
}
@@ -1024,7 +1024,7 @@
printf("p_init_entry_widgets gpp:%d adr of evl: %d\n"
, (int)gpp
, (int)(&gpp->evl)
- );
+ );
printf("gpp->evl.passlogfile %s\n", gpp->evl.passlogfile);
}
@@ -1189,7 +1189,7 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data (combo
, _("The output multimedia fileformat")
- , NULL);
+ , NULL);
/* ff_fileformat_combo_menu and callback are replaced later
* in procedure p_replace_combo_file_format
@@ -1271,18 +1271,18 @@
/* the audio bitrate combo */
combo = gimp_int_combo_box_new ("32", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_00_32,
"40", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_01_40,
- "48", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_02_48,
- "56", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_03_56,
- "64", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_04_64,
- "80", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_05_80,
- "96", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_06_96,
- "112", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_07_112,
- "128", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_08_128,
- "160", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_09_160,
- "192", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_10_192,
- "224", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_11_224,
- "256", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_12_256,
- "320", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_13_320,
+ "48", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_02_48,
+ "56", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_03_56,
+ "64", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_04_64,
+ "80", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_05_80,
+ "96", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_06_96,
+ "112", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_07_112,
+ "128", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_08_128,
+ "160", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_09_160,
+ "192", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_10_192,
+ "224", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_11_224,
+ "256", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_12_256,
+ "320", GAP_GVE_FFMPEG_AUDIO_KBIT_RATE_13_320,
NULL);
gpp->ff_aud_bitrate_combo = combo;
@@ -2457,10 +2457,10 @@
(GtkAttachOptions) (0), 0, 0);
gimp_help_set_help_data (checkbutton
, _("Bypass the FFMPEG Vidoencoder where inputframes can "
- "be copied 1:1 from an input MPEG videofile."
- "This experimental feature provides lossless MPEG "
- "video cut, but works only for the MPEG Fileformats.")
- , NULL);
+ "be copied 1:1 from an input MPEG videofile."
+ "This experimental feature provides lossless MPEG "
+ "video cut, but works only for the MPEG Fileformats.")
+ , NULL);
g_object_set_data (G_OBJECT (checkbutton), GAP_ENC_FFGUI_GPP, (gpointer)gpp);
g_signal_connect (G_OBJECT (checkbutton), "toggled",
G_CALLBACK (on_ff_gint32_checkbutton_toggled),
@@ -3761,7 +3761,7 @@
gimp_standard_help_func, GAP_HELP_ID_FFMPEG_PARAMS,
GTK_STOCK_OPEN, GAP_ENC_FFMPEG_RESPONSE_OPEN,
- GTK_STOCK_SAVE, GAP_ENC_FFMPEG_RESPONSE_SAVE,
+ GTK_STOCK_SAVE, GAP_ENC_FFMPEG_RESPONSE_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
Modified: trunk/vid_enc_rawframes/gap_enc_rawframes_main.c
==============================================================================
--- trunk/vid_enc_rawframes/gap_enc_rawframes_main.c (original)
+++ trunk/vid_enc_rawframes/gap_enc_rawframes_main.c Sun Apr 5 06:47:07 2009
@@ -144,7 +144,7 @@
{GIMP_PDB_STRING, "storyboard_file", "textfile with list of one or more framesequences"},
{GIMP_PDB_INT32, "input_mode", "0 ... image is one of the frames to encode, range_from/to params refere to numberpart of the other frameimages on disc. \n"
"1 ... image is multilayer, range_from/to params refere to layer index. \n"
- "2 ... image is ignored, input is specified by storyboard_file parameter."},
+ "2 ... image is ignored, input is specified by storyboard_file parameter."},
{GIMP_PDB_INT32, "master_encoder_id", "id of the master encoder that called this plug-in (typically the pid)"},
};
static int nargs_raw_enc = sizeof(args_raw_enc) / sizeof(args_raw_enc[0]);
@@ -775,8 +775,8 @@
gint32 l_total_framecount;
l_vidhand = gap_gve_story_open_vid_handle (gpp->val.input_mode
,gpp->val.image_ID
- ,gpp->val.storyboard_file
- ,gpp->ainfo.basename
+ ,gpp->val.storyboard_file
+ ,gpp->ainfo.basename
,gpp->ainfo.extension
,gpp->val.range_from
,gpp->val.range_to
@@ -840,8 +840,8 @@
, l_video_chunk_ptr
, &l_video_frame_chunk_size /* actual chunk size (incl. header) */
, l_maxSizeOfRawFrame /* IN max size */
- , gpp->val.framerate
- , l_max_master_frame_nr
+ , gpp->val.framerate
+ , l_max_master_frame_nr
, &l_video_frame_chunk_hdr_size
, l_check_flags
);
@@ -863,7 +863,7 @@
l_cnt_reused_frames++;
if (gap_debug)
{
- printf("DEBUG: 1:1 copy of frame %d (fetch as chunk OK) chunk_ptr:%d chunk_size:%d chunk_hdr_size:%d\n"
+ printf("DEBUG: 1:1 copy of frame %d (fetch as chunk OK) chunk_ptr:%d chunk_size:%d chunk_hdr_size:%d\n"
, (int)l_cur_frame_nr
, (int)l_video_chunk_ptr
, (int)l_video_frame_chunk_size
@@ -883,14 +883,14 @@
l_cnt_encoded_frames++;
if (gap_debug)
{
- printf("DEBUG: saving recoded frame %d (fetch as chunk FAILED)\n", (int)l_cur_frame_nr);
+ printf("DEBUG: saving recoded frame %d (fetch as chunk FAILED)\n", (int)l_cur_frame_nr);
}
if(gpp->val.run_mode == GIMP_RUN_INTERACTIVE)
{
char *l_msg;
- l_msg = g_strdup_printf(_("SAVING: %s\n"), l_sav_name);
+ l_msg = g_strdup_printf(_("SAVING: %s\n"), l_sav_name);
gimp_progress_init(l_msg);
g_free(l_msg);
}
Modified: trunk/vid_enc_single/gap_enc_singleframes_main.c
==============================================================================
--- trunk/vid_enc_single/gap_enc_singleframes_main.c (original)
+++ trunk/vid_enc_single/gap_enc_singleframes_main.c Sun Apr 5 06:47:07 2009
@@ -141,7 +141,7 @@
{GIMP_PDB_STRING, "storyboard_file", "textfile with list of one or more framesequences"},
{GIMP_PDB_INT32, "input_mode", "0 ... image is one of the frames to encode, range_from/to params refere to numberpart of the other frameimages on disc. \n"
"1 ... image is multilayer, range_from/to params refere to layer index. \n"
- "2 ... image is ignored, input is specified by storyboard_file parameter."},
+ "2 ... image is ignored, input is specified by storyboard_file parameter."},
{GIMP_PDB_INT32, "master_encoder_id", "id of the master encoder that called this plug-in (typically the pid)"},
};
static int nargs_single_enc = sizeof(args_single_enc) / sizeof(args_single_enc[0]);
@@ -663,8 +663,8 @@
gint32 l_total_framecount;
l_vidhand = gap_gve_story_open_vid_handle (gpp->val.input_mode
,gpp->val.image_ID
- ,gpp->val.storyboard_file
- ,gpp->ainfo.basename
+ ,gpp->val.storyboard_file
+ ,gpp->ainfo.basename
,gpp->ainfo.extension
,gpp->val.range_from
,gpp->val.range_to
@@ -729,7 +729,7 @@
{
char *l_msg;
- l_msg = g_strdup_printf(_("SAVING: %s\n"), l_sav_name);
+ l_msg = g_strdup_printf(_("SAVING: %s\n"), l_sav_name);
gimp_progress_init(l_msg);
g_free(l_msg);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
