gimp-gap r706 - in branches/gap-2-4: . gap gap/iter_ALT/gen gap/iter_ALT/mod gap/iter_ALT/old libgapvidapi libgapvidutil
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp-gap r706 - in branches/gap-2-4: . gap gap/iter_ALT/gen gap/iter_ALT/mod gap/iter_ALT/old libgapvidapi libgapvidutil
- Date: Mon, 14 Jan 2008 19:33:55 +0000 (GMT)
Author: neo
Date: Mon Jan 14 19:33:53 2008
New Revision: 706
URL: http://svn.gnome.org/viewvc/gimp-gap?rev=706&view=rev
Log:
2008-01-05 Wolfgang Hofer <hof gimp org>
- modify frames support to expand layer to image size
(applied patch #488653)
Bugfixes to make GIMP-GAP usable with GIMP-2.4.x
- fixed bug #505001 (replaced calls to deprecated gimp_path_*
procedures)
- fixed crashes of the VCR Navigator plug-in
- fixed crashes when using GIMP-GAP frames in other image formats
than XCF.
- added checks for valid image id to avoid lots of GIMP error
messages
- Master Videoencoder did not recognize the registered encoder
plug-ins.
gimp-2.4 gimp_procedural_db_query does not accept the same wildcard
as gimp-2.2
(since switching to internal use of canonical names in the GIMP-2.4
core
underscore characters are no longer found via wildcard)
changed encoders and GAP_WILDCARD_VIDEO_ENCODERS name to use minus
character
to match the canonical naming style.
- Updated Iterator procedures to match structures of the supported
plug ins that are part of the GIMP-2.4.x distribution.
(and made them work with canonical names)
- tooltips are NOT active, even if enabled in GIMP preferences!
value_string = gimp_gimprc_query("show-tool-tips"); // 2.2
value_string = gimp_gimprc_query("show-tooltips"); // 2.4
Modified:
branches/gap-2-4/ChangeLog
branches/gap-2-4/NEWS
branches/gap-2-4/configure.in
branches/gap-2-4/gap/TESTPROT_iter_ALT
branches/gap-2-4/gap/gap_file_util.c
branches/gap-2-4/gap/gap_file_util.h
branches/gap-2-4/gap/gap_filter.h
branches/gap-2-4/gap/gap_filter_codegen.c
branches/gap-2-4/gap/gap_filter_foreach.c
branches/gap-2-4/gap/gap_filter_iterators.c
branches/gap-2-4/gap/gap_filter_pdb.c
branches/gap-2-4/gap/gap_filter_pdb.h
branches/gap-2-4/gap/gap_layer_copy.c
branches/gap-2-4/gap/gap_layer_copy.h
branches/gap-2-4/gap/gap_lib.c
branches/gap-2-4/gap/gap_lib.h
branches/gap-2-4/gap/gap_mod_layer.c
branches/gap-2-4/gap/gap_mod_layer.h
branches/gap-2-4/gap/gap_mod_layer_dialog.c
branches/gap-2-4/gap/gap_morph_dialog.c
branches/gap-2-4/gap/gap_morph_exec.c
branches/gap-2-4/gap/gap_mov_dialog.c
branches/gap-2-4/gap/gap_navigator_dialog.c
branches/gap-2-4/gap/gap_pdb_calls.c
branches/gap-2-4/gap/gap_player_dialog.c
branches/gap-2-4/gap/gap_split.c
branches/gap-2-4/gap/gap_wr_color_curve.c
branches/gap-2-4/gap/gap_wr_color_huesat.c
branches/gap-2-4/gap/gap_wr_color_levels.c
branches/gap-2-4/gap/gimplastvaldesc.h
branches/gap-2-4/gap/iter_ALT/gen/plug_in_CML_explorer_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_blinds_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_color_map_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_colorify_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_cubism_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_destripe_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_diffraction_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_displace_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_edge_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_engrave_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_flarefx_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_fractal_trace_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir2_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle2_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_gfig_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_glasstile_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_grid_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_jigsaw_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_mblur_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_mosaic_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_newsprint_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_noisify_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_pixelize_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_hurl_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_pick_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_slur_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_ripple_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_rotate_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_scatter_hsv_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_sharpen_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_shift_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_spread_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_video_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_vpropagate_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_waves_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_whirl_pinch_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/gen/plug_in_wind_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_Twist_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap2_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_apply_canvas_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_applylens_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_blur_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_cartoon_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_colors_channel_mixer_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_colortoalpha_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_deinterlace_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_despeckle_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_dog_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_emboss_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_exchange_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_flame_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_gauss_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_gimpressionist_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_illusion_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_lic_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_lighting_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_make_seamless_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_map_object_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_max_rgb_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_maze_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_neon_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_nlfilt_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_normalize_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_nova_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_oilify_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_pagecurl_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_papertile_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_photocopy_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_plasma_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_polar_coords_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_retinex_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_sample_colorize_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_sel_gauss_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_sinus_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_small_tiles_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_sobel_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_softglow_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_solid_noise_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_sparkle_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_unsharp_mask_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/mod/plug_in_vinvert_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_CentralReflection_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_anamorphose_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_blur2_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_colorify_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_encript_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_figures_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_gflare_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_holes_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_julia_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_magic_eye_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_mandelbrot_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_randomize_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_refract_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_struc_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_tileit_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_universal_filter_iter_ALT.inc
branches/gap-2-4/gap/iter_ALT/old/plug_in_warp_iter_ALT.inc
branches/gap-2-4/libgapvidapi/gap_vid_api.c
branches/gap-2-4/libgapvidutil/gap_gvetypes.h
Modified: branches/gap-2-4/NEWS
==============================================================================
--- branches/gap-2-4/NEWS (original)
+++ branches/gap-2-4/NEWS Mon Jan 14 19:33:53 2008
@@ -1,5 +1,34 @@
-Bugs fixed in GAP 2.2.2:
-------------------------
+GIMP-GAP 2.2.3:
+----------------------------
+This is a bugfix release that makes GIMP-GAP usable with GIMP-2.4.x releases.
+
+IMPORTANT:
+
+This release breaks backward compatibility with older
+GIMP releases than GIMP-2.4.x
+
+Users of GIMP-2-2.x shall update both GIMP and GIMP-GAP
+or do not update at all.
+
+new features:
+- modify frames support to expand layer to image size (feature request #488653)
+- Make Filter all Layers feature compatible to GIMP-2.4.
+ (Updated Iterator procedures to match structures of the supported
+ plug ins that are part of the GIMP-2.4.x distribution)
+
+fixed bugs:
+- fixed crashes of the VCR Navigator plug-in
+- fixed crashes when using GIMP-GAP frames in other image formats than XCF.
+- fixed lots of warnings about using invalid image/drawable id's
+- Master Videoencoder did not recognize the registered encoder plug-ins.
+- enable/disable tooltips now compatible with GIMP 2.4 preferences
+- replaced deprecated gimp-path-* PDB calls (fixed bug #505001)
+
+
+
+
+Bugs fixed in GIMP-GAP 2.2.2:
+----------------------------
- corrected handling of GimpDrawable to fix crashes with GIMP 2.3 (bug #451350)
- don't call gimp-image-get-filename on a closed image (bug #452080)
Modified: branches/gap-2-4/configure.in
==============================================================================
--- branches/gap-2-4/configure.in (original)
+++ branches/gap-2-4/configure.in Mon Jan 14 19:33:53 2008
@@ -6,10 +6,10 @@
GAP_MAJOR_VERSION=2
GAP_MINOR_VERSION=2
-GAP_MICRO_VERSION=2
+GAP_MICRO_VERSION=3
GAP_VERSION=$GAP_MAJOR_VERSION.$GAP_MINOR_VERSION.$GAP_MICRO_VERSION
VERSION=$GAP_VERSION
-GAP_VERSION_WITH_DATE="$GAP_VERSION; 2007/07/24"
+GAP_VERSION_WITH_DATE="$GAP_VERSION; 2007/12/02"
AC_SUBST(GAP_MAJOR_VERSION)
AC_SUBST(GAP_MINOR_VERSION)
@@ -51,7 +51,7 @@
AC_CHECK_FUNCS(bind_textdomain_codeset)
-PKG_CHECK_MODULES(GIMP, gimp-2.0 >= 2.2.0 gimpui-2.0 >= 2.2.0 gimpthumb-2.0)
+PKG_CHECK_MODULES(GIMP, gimp-2.0 >= 2.4.0 gimpui-2.0 >= 2.4.0 gimpthumb-2.0)
GIMP_DATA_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimpdatadir`
GIMP_PLUGIN_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimplibdir`
Modified: branches/gap-2-4/gap/TESTPROT_iter_ALT
==============================================================================
--- branches/gap-2-4/gap/TESTPROT_iter_ALT (original)
+++ branches/gap-2-4/gap/TESTPROT_iter_ALT Mon Jan 14 19:33:53 2008
@@ -11,166 +11,171 @@
---------------------------------------------------
Testresults
--------------------------------------------------
-20065.04.30
+2007.12.01
+
+ TODO: check for new plug ins that were added to gimp-2.4
+ (and that are not yet in this List)
Test with PDB-Procedures (Plugins) that came with
- gimp release 2.2.3, 2.2.8 and 2.2.11
+ gimp release 2.4.2
Test also includes PDB-Procedures provided by GIMP-GAP itself
-State:
-+ ... Full Supported, and passed simple "Apply Varying" Test OK
- (79 procedures)
-# ... Partly Supported, Apply constant OK,
- but Apply Varying not possible or does not make sense
- (21 procedures)
-- ... NOT supported (Failed Test)
-: ... Not supported (support would make no sense)
-. ... not tested
+State: (Column1 test 2007.12.01, Column2 older testresult with gimp-2.2.x and old GIMP-GAP version)
+ + ... Full Supported, and passed simple "Apply Varying" Test OK
+ (78 procedures)
+ # ... Partly Supported, Apply constant OK,
+ but Apply Varying not possible or does not make sense
+ (18 procedures)
+ - ... NOT supported (Failed Test)
+ : ... Not supported (support would make no sense)
+ . ... not tested
State Procedure/Iterator_ALT ame Testnotes
---------------------------------------------------------------------------
-+ plug_in_alienmap2_iter_ALT
-: plug_in_align_layers
-: plug_in_animationoptimize
-: plug_in_animationoptimize_diff
-: plug_in_animationplay
-: plug_in_animationunoptimize
-+ plug_in_apply_canvas_iter_ALT Uses wrong name "plug_in_struc" to store LAST_VAL's
-+ plug_in_applylens_iter_ALT
-: plug_in_autocrop
-- plug_in_autocrop_layer constant apply would make sense, but did not work
-# plug_in_autostretch_hsv
-+ plug_in_blinds_iter_ALT
-+ plug_in_bluebox
-# plug_in_blur has no dialog but works fine with defaults.
-+ plug_in_borderaverage_iter_ALT (?) runs, but produces no effect on the processed layers
-+ plug_in_bump_map_iter_ALT
-: plug_in_bump_map_tiled
-# plug_in_c_astretch
-+ plug_in_cartoon_iter_ALT
-: plug_in_ccanalyze
-+ plug_in_checkerboard_iter_ALT
-+ plug_in_cml_explorer_iter_ALT
-# plug_in_color_adjust
-# plug_in_color_enhance
-+ plug_in_color_map_iter_ALT
-+ plug_in_colorify_iter_ALT
-+ plug_in_colors_channel_mixer
-+ plug_in_colortoalpha_iter_ALT
-: plug_in_compose
-+ plug_in_convmatrix_iter_ALT
-+ plug_in_cubism_iter_ALT
-+ plug_in_curve_bend
-: plug_in_decompose
-# plug_in_deinterlace disabled the Iter_ALT proc (only const apply makes sense)
-+ plug_in_depth_merge_iter_ALT
-+ plug_in_despeckle_iter_ALT
-+ plug_in_destripe_iter_ALT
-+ plug_in_diffraction_iter_ALT
-# plug_in_dilate (?) noninteractive variante of plug_in_vpropagate
-+ plug_in_displace_iter_ALT
-+ plug_in_dog
-: plug_in_drawable_compose
-+ plug_in_edge_iter_ALT
-+ plug_in_emboss_iter_ALT
-+ plug_in_engrave_iter_ALT
-# plug_in_erode (?) noninteractive variante of plug_in_vpropagate with default values
-+ plug_in_exchange_iter_ALT
-: plug_in_film
-# plug_in_filter_macro
-: plug_in_filter_pack makes no sense because opens Dialog even in run_mode: GIMP_RUN_WITH_LAST_VALS
-+ plug_in_flame_iter_ALT (?) runs, but all layer were transparent when finished
-+ plug_in_flarefx_iter_ALT
-+ plug_in_fractal_trace_iter_ALT
-. plug_in_fractalexplorer
-+ plug_in_gauss_iter_ALT
-: plug_in_gauss_iir2 makes no sense (no dialog), use plug_in_gauss instead
-: plug_in_gauss_iir makes no sense (no dialog), use plug_in_gauss instead
-: plug_in_gauss_rle2 makes no sense (no dialog), use plug_in_gauss instead
-: plug_in_gauss_rle makes no sense (no dialog), use plug_in_gauss instead
-: plug_in_gfig makes no sense (is INTERACTIVE only and creates layer)
-+ plug_in_gflare_iter_ALT
-+ plug_in_gimpressionist
-+ plug_in_glasstile_iter_ALT
-# plug_in_gradmap
-+ plug_in_grid_iter_ALT
-: plug_in_guillotine
-# plug_in_hot
-: plug_in_ifs_compose
-+ plug_in_illusion_iter_ALT
-: plug_in_imagemap makes no sense (needs INTERACTIVE mode)
-: plug_in_iwarp makes no sense (needs INTERACTIVE mode, has its own animate option where layers are created)
-+ plug_in_jigsaw_iter_ALT
-# plug_in_laplace
-+ plug_in_lic_iter_ALT
-+ plug_in_lighting_iter_ALT
-: plug_in_mail_image
-# plug_in_make_seamless HAS no dialog and no LAST_VAL Buffer
-+ plug_in_map_object_iter_ALT
-# plug_in_max_rgb_iter_ALT
-+ plug_in_maze_iter_ALT
-+ plug_in_mblur_iter_ALT
-+ plug_in_mosaic_iter_ALT
-+ plug_in_name2layer
-+ plug_in_neon
-+ plug_in_newsprint_iter_ALT
-+ plug_in_nlfilt_iter_ALT (?) runs, but did not see any effect
-- plug_in_noisify_iter_ALT noisify has 2 names and uses the 2.nd name "plug_in_scatter_rgb" to store is values.
-+ plug_in_scatter_rgb
-# plug_in_normalize has no dialog, constant apply makes sense
-+ plug_in_nova_iter_ALT
-+ plug_in_oilify_iter_ALT
-: plug_in_onionskin_create_or_replace
-: plug_in_onionskin_del
-: plug_in_onionskin_toggle_visibility
-(1) plug_in_pagecurl_iter_ALT ERROR: creates a new layer
-+ plug_in_papertile_iter_ALT
-+ plug_in_photocopy
-+ plug_in_pixelize_iter_ALT
-# plug_in_pixelize2
-+ plug_in_plasma_iter_ALT
-+ plug_in_polar_coords_iter_ALT
-# plug_in_qbist
-+ plug_in_randomize_hurl_iter_ALT
-+ plug_in_randomize_pick_iter_ALT
-+ plug_in_randomize_slur_iter_ALT
-+ plug_in_retinex
-+ plug_in_ripple_iter_ALT
-- plug_in_rotate_iter_ALT does not make sense (has no dialog where to specify rotation angle)
-: plug_in_rotate_colormap makes no sense, because opens Dialog even in run_mode: GIMP_RUN_WITH_LAST_VALS
-- plug_in_sample_colorize_iter_ALT (?) iter size ok, but does not work for GIMP_RUN_WITH_LAST_VALS calls
-+ plug_in_scatter_hsv_iter_ALT
-+ plug_in_sel_gauss_iter_ALT
-: plug_in_sel2path
-: plug_in_sel2path_advanced
-: plug_in_semiflatten makes no sense
-+ plug_in_sharpen_iter_ALT
-+ plug_in_shift_iter_ALT
-+ plug_in_sinus_iter_ALT
-+ plug_in_small_tiles_iter_ALT Uses wrong name "plug_in_tileit" to store LAST_VAL's
-: plug_in_smooth_palette makes no sense (creates palette)
-+ plug_in_sobel_iter_ALT OK, but only constant apply makes sense
-+ plug_in_softglow
-+ plug_in_solid_noise_iter_ALT
-+ plug_in_sparkle_iter_ALT
-: plug_in_spheredesigner
-+ plug_in_spread_iter_ALT
-+ plug_in_unsharp_mask_iter_ALT
-# plug_in_video_iter_ALT varying values does not make sense, but keep iterator to get into gap_dbbrowser selection
-# plug_in_vinvert_iter_ALT
-+ plug_in_vpropagate_iter_ALT
-+ plug_in_warp_iter_ALT
-+ plug_in_waves_iter_ALT
-+ plug_in_whirl_pinch_iter_ALT
-+ plug_in_wind_iter_ALT
-+ plug_in_wr_color_levels
-+ plug_in_wr_curves
-+ plug_in_wr_huesat
-+ plug_in_wr_set_opacity
-: plug_in_zealouscrop
+++ plug-in-alienmap2-iter-ALT
+ : plug-in-align-layers
+ : plug-in-animationoptimize
+ : plug-in-animationoptimize-diff
+ : plug-in-animationplay
+ : plug-in-animationunoptimize
+++ plug-in-apply-canvas-iter-ALT Uses wrong name "plug-in-struc" to store LAST_VAL's
+++ plug-in-applylens-iter-ALT
+ : plug-in-autocrop
+ - plug-in-autocrop-layer constant apply would make sense, but did not work
+ # plug-in-autostretch-hsv
+++ plug-in-blinds-iter-ALT
+++ plug-in-bluebox
+## plug-in-blur has no dialog but works fine with defaults.
+++ plug-in-borderaverage-iter-ALT (?) runs, but produces no effect on the processed layers
+++ plug-in-bump-map-iter-ALT
+ : plug-in-bump-map-tiled
+## plug-in-c-astretch
+++ plug-in-cartoon-iter-ALT
+ : plug-in-ccanalyze
+++ plug-in-checkerboard-iter-ALT
+++ plug-in-cml-explorer-iter-ALT
+## plug-in-color-adjust
+## plug-in-color-enhance
+++ plug-in-color-map-iter-ALT
+++ plug-in-colorify-iter-ALT
+++ plug-in-colors-channel-mixer
+++ plug-in-colortoalpha-iter-ALT
+ : plug-in-compose
+++ plug-in-convmatrix-iter-ALT
+++ plug-in-cubism-iter-ALT
+++ plug-in-curve-bend
+ : plug-in-decompose
+## plug-in-deinterlace disabled the Iter_ALT proc (only const apply makes sense)
+++ plug-in-depth-merge-iter-ALT
+++ plug-in-despeckle-iter-ALT
+++ plug-in-destripe-iter-ALT
+++ plug-in-diffraction-iter-ALT
+## plug-in-dilate (?) noninteractive variante of plug_in_vpropagate
+++ plug-in-displace-iter-ALT
+++ plug-in-dog
+ : plug-in-drawable-compose
+++ plug-in-edge-iter-ALT
+++ plug-in-emboss-iter-ALT
+++ plug-in-engrave-iter-ALT
+## plug-in-erode (?) noninteractive variante of plug_in_vpropagate with default values
+++ plug-in-exchange-iter-ALT
+ : plug-in-film
+## plug-in-filter-macro
+ : plug-in-filter-pack makes no sense because opens Dialog even in run_mode: GIMP_RUN_WITH_LAST_VALS
+++ plug-in-flame-iter-ALT (?) runs, but all layer were transparent when finished
+++ plug-in-flarefx-iter-ALT
+++ plug-in-fractal-trace-iter-ALT
+ . plug-in-fractalexplorer
+++ plug-in-gauss-iter-ALT
+ : plug-in-gauss-iir2 makes no sense (no dialog), use plug_in_gauss instead
+ : plug-in-gauss-iir makes no sense (no dialog), use plug_in_gauss instead
+ : plug-in-gauss-rle2 makes no sense (no dialog), use plug_in_gauss instead
+ : plug-in-gauss-rle makes no sense (no dialog), use plug_in_gauss instead
+ : plug-in-gfig makes no sense (is INTERACTIVE only and creates layer)
+++ plug-in-gflare-iter-ALT
+++ plug-in-gimpressionist
+++ plug-in-glasstile-iter-ALT
+## plug-in-gradmap
+++ plug-in-grid-iter-ALT
+ : plug-in-guillotine
+## plug-in-hot
+ : plug-in-ifs-compose
+++ plug-in-illusion-iter-ALT
+ : plug-in-imagemap makes no sense (needs INTERACTIVE mode)
+ : plug-in-iwarp makes no sense (needs INTERACTIVE mode, has its own animate option where layers are created)
+++ plug-in-jigsaw-iter-ALT
+## plug-in-laplace
+++ plug-in-lic-iter-ALT
+++ plug-in-lighting-iter-ALT
+ : plug-in-mail-image
+## plug-in-make-seamless HAS no dialog and no LAST_VAL Buffer
+++ plug-in-map-object-iter-ALT
+## plug-in-max-rgb-iter-ALT
+++ plug-in-maze-iter-ALT
+++ plug-in-mblur-iter-ALT
+++ plug-in-mosaic-iter-ALT
+++ plug-in-name2layer
+++ plug-in-neon
+++ plug-in-newsprint-iter-ALT
+++ plug-in-nlfilt-iter-ALT (?) runs, but did not see any effect
+-- plug-in-noisify-iter-ALT noisify has 2 names and uses the 2.nd name "plug-in-rgb-noise" "plug_in_scatter_rgb" to store is values.
+ (runs but does not open 2nd dialog even when varying requested ?)
+-+ plug-in-hsv-noise register 2 names (old name plug-in-scatter-hsv)
+ (runs but does not open 2nd dialog even when varying requested ?)
+
+## plug-in-normalize has no dialog, constant apply makes sense
+++ plug-in-nova-iter-ALT
+++ plug-in-oilify-iter-ALT
+ : plug-in-onionskin-create-or-replace
+ : plug-in-onionskin-del
+ : plug-in-onionskin-toggle-visibility
+ (1) plug-in-pagecurl-iter-ALT ERROR: creates a new layer
+-+ plug-in-papertile-iter-ALT FAILED with floating point exception
+++ plug-in-photocopy
+++ plug-in-pixelize-iter-ALT
+## plug-in-pixelize2
+++ plug-in-plasma-iter-ALT
+++ plug-in-polar-coords-iter-ALT
+## plug-in-qbist
+++ plug-in-randomize-hurl-iter-ALT
+++ plug-in-randomize-pick-iter-ALT
+++ plug-in-randomize-slur-iter-ALT
+++ plug-in-retinex
+++ plug-in-ripple-iter-ALT
+ - plug-in-rotate-iter-ALT does not make sense (has no dialog where to specify rotation angle)
+ : plug-in-rotate-colormap makes no sense, because opens Dialog even in run_mode: GIMP_RUN_WITH_LAST_VALS
+ - plug-in-sample-colorize-iter-ALT (?) iter size ok, but does not work for GIMP_RUN_WITH_LAST_VALS calls
+++ plug-in-sel-gauss-iter-ALT
+ : plug-in-sel2path
+ : plug-in-sel2path-advanced
+ : plug-in-semiflatten makes no sense
+++ plug-in-sharpen-iter-ALT
+++ plug-in-shift-iter-ALT
+++ plug-in-sinus-iter-ALT
+++ plug-in-small-tiles-iter-ALT Uses wrong name "plug_in_tileit" to store LAST_VAL's
+ : plug-in-smooth-palette makes no sense (creates palette)
+++ plug-in-sobel-iter-ALT OK, but only constant apply makes sense
+++ plug-in-softglow
+++ plug-in-solid-noise-iter-ALT
+++ plug-in-sparkle-iter-ALT
+ : plug-in-spheredesigner
+++ plug-in-spread-iter-ALT
+++ plug-in-unsharp-mask-iter-ALT
+## plug-in-video-iter-ALT varying values does not make sense, but keep iterator to get into gap_dbbrowser selection
+## plug-in-vinvert-iter-ALT
+++ plug-in-vpropagate-iter-ALT
+++ plug-in-warp-iter-ALT
+++ plug-in-waves-iter-ALT
+++ plug-in-whirl-pinch-iter-ALT
+++ plug-in-wind-iter-ALT
+++ plug-in-wr-color-levels
+++ plug-in-wr-curves
+++ plug-in-wr-huesat
+++ plug-in-wr-set-opacity
+ : plug-in-zealouscrop
Additional notes:
@@ -188,7 +193,7 @@
-plug_in_map_object ol Testreport: (did not verfy that at the latest test)
+plug_in_map_object old Testreport: (did not verfy that at the latest test)
- The MapObject has an implicite feature:
If the handled layer has NO ALPHA Channel (as backgrounds often do)
Modified: branches/gap-2-4/gap/gap_file_util.c
==============================================================================
--- branches/gap-2-4/gap/gap_file_util.c (original)
+++ branches/gap-2-4/gap/gap_file_util.c Mon Jan 14 19:33:53 2008
@@ -205,22 +205,19 @@
{
int len;
len = strlen(buffer);
- while(TRUE)
+ while(len > 0)
{
- if(len > 0)
+ len--;
+ if((buffer[len] == '\n')
+ || (buffer[len] == '\r')
+ || (buffer[len] == '\t')
+ || (buffer[len] == ' '))
{
- len--;
- if((buffer[len] == '\n')
- || (buffer[len] == '\a')
- || (buffer[len] == '\t')
- || (buffer[len] == ' '))
- {
- buffer[len] = '\0';
- }
- else
- {
- break;
- }
+ buffer[len] = '\0';
+ }
+ else
+ {
+ break;
}
}
} /* end gap_file_chop_trailingspace_and_nl */
@@ -325,3 +322,19 @@
return (absolute);
} /* end gap_file_build_absolute_filename */
+/* --------------------------------
+ * gap_file_get_mtime
+ * --------------------------------
+ */
+gint32
+gap_file_get_mtime(const char *filename)
+{
+ struct stat l_stat;
+
+ if (0 == g_stat(filename, &l_stat))
+ {
+ return(l_stat.st_mtime);
+ }
+ return(0);
+
+} /* end gap_file_get_mtime */
Modified: branches/gap-2-4/gap/gap_file_util.h
==============================================================================
--- branches/gap-2-4/gap/gap_file_util.h (original)
+++ branches/gap-2-4/gap/gap_file_util.h Mon Jan 14 19:33:53 2008
@@ -82,6 +82,7 @@
, const char *container_file);
char * gap_file_build_absolute_filename(const char * filename);
+gint32 gap_file_get_mtime(const char *filename);
#endif /* GAP_FILE_UTIL_H */
Modified: branches/gap-2-4/gap/gap_filter.h
==============================================================================
--- branches/gap-2-4/gap/gap_filter.h (original)
+++ branches/gap-2-4/gap/gap_filter.h Mon Jan 14 19:33:53 2008
@@ -30,6 +30,28 @@
#include "libgimp/gimp.h"
#include "gap_filter_pdb.h"
+/* GIMP-GAP Suffix strings to identify iterator procedures.
+ * The iterator procedures have same name as the corresponding plug in
+ * extended by GAP_ITERATOR_SUFFIX or GAP_ITERATOR_SUFFIX
+ *
+ * Note: GIMP-2.4 changed naming style for pdb names from
+ * underscore to minus character.
+ * The GIMP-2.4 core uses
+ * canonicalized names that converts all characters that are no letter and no digit
+ * to minus character.
+ *
+ */
+#define GAP_ITERATOR_SUFFIX "-Iterator"
+#define GAP_ITERATOR_ALT_SUFFIX "-Iterator-ALT"
+
+/* GIMP-GAP suffixes for start and end value buffers
+ * (stored via gimp_set_data)
+ * those buffers are named like the corresponding plug in
+ * extended by suffixes GAP_ITER_FROM_SUFFIX and GAP_ITER_TO_SUFFIX.
+ *
+ */
+#define GAP_ITER_FROM_SUFFIX "-ITER-FROM"
+#define GAP_ITER_TO_SUFFIX "-ITER-TO"
/* ------------------------
* gap_filter_foreach.h
Modified: branches/gap-2-4/gap/gap_filter_codegen.c
==============================================================================
--- branches/gap-2-4/gap/gap_filter_codegen.c (original)
+++ branches/gap-2-4/gap/gap_filter_codegen.c Mon Jan 14 19:33:53 2008
@@ -39,6 +39,7 @@
#include "libgimp/gimp.h"
/* GAP includes */
+#include "gap_filter.h"
/* int gap_debug = 1; */ /* print debug infos */
/* int gap_debug = 0; */ /* 0: dont print debug infos */
@@ -231,13 +232,13 @@
fprintf(l_fp, "\n");
fprintf(l_fp, " if(len_struct != sizeof(t_%s_Vals)) \n", l_clean_proc_name);
fprintf(l_fp, " {\n");
- fprintf(l_fp, " fprintf(stderr, \"ERROR: p_\%s_iter_ALT stored Data missmatch in size %%d != %%d\\n\", \n", l_clean_proc_name);
+ fprintf(l_fp, " printf(\"ERROR: p_\%s_iter_ALT stored Data missmatch in size %%d != %%d\\n\", \n", l_clean_proc_name);
fprintf(l_fp, " (int)len_struct, sizeof(t_%s_Vals) ); \n", l_clean_proc_name);
fprintf(l_fp, " return -1; /* ERROR */ \n");
fprintf(l_fp, " }\n");
fprintf(l_fp, "\n");
- fprintf(l_fp, " gimp_get_data(\"%s_ITER_FROM\", g_plugin_data_from); \n", l_clean_proc_name);
- fprintf(l_fp, " gimp_get_data(\"%s_ITER_TO\", g_plugin_data_to); \n", l_clean_proc_name);
+ fprintf(l_fp, " gimp_get_data(\"%s%s\", g_plugin_data_from); \n", l_clean_proc_name, GAP_ITER_FROM_SUFFIX);
+ fprintf(l_fp, " gimp_get_data(\"%s%s\", g_plugin_data_to); \n", l_clean_proc_name, GAP_ITER_TO_SUFFIX);
fprintf(l_fp, "\n");
fprintf(l_fp, " buf_from = (t_%s_Vals *)&g_plugin_data_from[0]; \n", l_clean_proc_name);
fprintf(l_fp, " buf_to = (t_%s_Vals *)&g_plugin_data_to[0]; \n", l_clean_proc_name);
@@ -597,8 +598,8 @@
fprintf(l_fp, " return -1; /* ERROR */ \n");
fprintf(l_fp, " }\n");
fprintf(l_fp, "\n");
- fprintf(l_fp, " gimp_get_data(\"%s_ITER_FROM\", &buf_from); \n", l_clean_proc_name);
- fprintf(l_fp, " gimp_get_data(\"%s_ITER_TO\", &buf_to); \n", l_clean_proc_name);
+ fprintf(l_fp, " gimp_get_data(\"%s%s\", &buf_from); \n", l_clean_proc_name, GAP_ITER_FROM_SUFFIX);
+ fprintf(l_fp, " gimp_get_data(\"%s%s\", &buf_to); \n", l_clean_proc_name, GAP_ITER_TO_SUFFIX);
fprintf(l_fp, " memcpy(&buf, &buf_from, sizeof(buf));\n");
fprintf(l_fp, "\n");
@@ -645,7 +646,7 @@
fprintf(l_fp, "MAIN ()\n");
fprintf(l_fp, "\n");
fprintf(l_fp, "/* ----------------------------------------------------------------------\n");
- fprintf(l_fp, " * install (query) _Iterator\n");
+ fprintf(l_fp, " * install (query) %s\n", GAP_ITERATOR_SUFFIX);
fprintf(l_fp, " * ----------------------------------------------------------------------\n");
fprintf(l_fp, " */\n");
fprintf(l_fp, "\n");
@@ -667,7 +668,7 @@
fprintf(l_fp, "\n");
fprintf(l_fp, " g_snprintf(l_blurb_text, sizeof(l_blurb_text), \"This procedure calculates the modified values for one iterationstep for the call of %s\");\n", l_clean_proc_name);
fprintf(l_fp, "\n");
- fprintf(l_fp, " gimp_install_procedure(\"%s_Iterator\",\n", l_clean_proc_name);
+ fprintf(l_fp, " gimp_install_procedure(\"%s%s\",\n", l_clean_proc_name, GAP_ITERATOR_SUFFIX);
fprintf(l_fp, " l_blurb_text,\n");
fprintf(l_fp, " \"\",\n");
fprintf(l_fp, " \"Wolfgang Hofer\",\n");
Modified: branches/gap-2-4/gap/gap_filter_foreach.c
==============================================================================
--- branches/gap-2-4/gap/gap_filter_foreach.c (original)
+++ branches/gap-2-4/gap/gap_filter_foreach.c Mon Jan 14 19:33:53 2008
@@ -84,15 +84,36 @@
extern int gap_debug;
-void p_gdisplays_update_full(gint32 image_id)
+
+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);
+
+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);
+static int p_foreach_multilayer(GimpRunMode run_mode, gint32 image_id,
+ const char *plugin_name, GapFiltPdbApplyMode apply_mode);
+static int p_foreach_multilayer2(GimpRunMode run_mode, gint32 image_id,
+ char *canonical_plugin_name, GapFiltPdbApplyMode apply_mode);
+
+/* ------------------------
+ * p_gdisplays_update_full
+ * ------------------------
+ */
+static void
+p_gdisplays_update_full(gint32 image_id)
{
gimp_displays_flush();
}
-/* pitstop dialog
+/* ------------------------
+ * p_pitstop
+ * ------------------------
* return -1 on cancel, 0 .. on continue, 1 .. on skip
*/
-static gint p_pitstop(GimpRunMode run_mode, char *plugin_name, gint text_flag,
+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)
{
@@ -159,7 +180,13 @@
} /* end p_pitstop */
-static void p_visibilty_restore(gint32 image_id, gint nlayers, int *visible_tab, char *plugin_name)
+
+/* ------------------------
+ * p_visibilty_restore
+ * ------------------------
+ */
+static void
+p_visibilty_restore(gint32 image_id, gint nlayers, int *visible_tab, char *plugin_name)
{
gint32 *l_layers_list;
gint l_nlayers2;
@@ -184,7 +211,12 @@
g_free (l_layers_list);
}
-static gint32 p_get_indexed_layerid(gint32 image_id, gint *nlayers, gint32 idx, char *plugin_name)
+/* ------------------------
+ * p_get_indexed_layerid
+ * ------------------------
+ */
+static gint32
+p_get_indexed_layerid(gint32 image_id, gint *nlayers, gint32 idx, char *plugin_name)
{
gint32 *l_layers_list;
gint32 l_layer_id;
@@ -209,16 +241,40 @@
return (l_layer_id);
}
-/* ============================================================================
+/* ----------------------
* p_foreach_multilayer
+ * ----------------------
* apply the given plugin to each layer of the image.
* returns image_id of the new created multilayer image
* (or -1 on error)
- * ============================================================================
*/
-
-int p_foreach_multilayer(GimpRunMode run_mode, gint32 image_id,
- char *plugin_name, GapFiltPdbApplyMode apply_mode)
+static int
+p_foreach_multilayer(GimpRunMode run_mode, gint32 image_id,
+ const char *plugin_name, GapFiltPdbApplyMode apply_mode)
+{
+ char *canonical_plugin_name;
+ int rc;
+
+ canonical_plugin_name = gimp_canonicalize_identifier(plugin_name);
+ rc = p_foreach_multilayer2(run_mode, image_id, canonical_plugin_name, apply_mode);
+
+ g_free(canonical_plugin_name);
+
+ return (rc);
+
+} /* ennd p_foreach_multilayer */
+
+
+/* ----------------------
+ * p_foreach_multilayer2
+ * ----------------------
+ * apply the given plugin to each layer of the image.
+ * returns image_id of the new created multilayer image
+ * (or -1 on error)
+ */
+static int
+p_foreach_multilayer2(GimpRunMode run_mode, gint32 image_id,
+ char *canonical_plugin_name, GapFiltPdbApplyMode apply_mode)
{
static char l_key_from[512];
static char l_key_to[512];
@@ -228,8 +284,6 @@
gint32 l_idx;
gint l_nlayers;
gdouble l_percentage, l_percentage_step;
- GimpParam *l_params;
- gint l_retvals;
int l_rc;
gint l_plugin_data_len;
long l_child_pid;
@@ -247,16 +301,16 @@
/* check for the Plugin */
- l_rc = gap_filt_pdb_procedure_available(plugin_name, GAP_PTYP_CAN_OPERATE_ON_DRAWABLE);
+ l_rc = gap_filt_pdb_procedure_available(canonical_plugin_name, GAP_PTYP_CAN_OPERATE_ON_DRAWABLE);
if(l_rc < 0)
{
- fprintf(stderr, "ERROR: Plugin not available or wrong type %s\n", plugin_name);
+ printf("ERROR: Plugin not available or wrong type %s\n", canonical_plugin_name);
return -1;
}
/* check for matching Iterator PluginProcedures */
- l_plugin_iterator = gap_filt_pdb_get_iterator_proc(plugin_name, &l_count);
+ l_plugin_iterator = gap_filt_pdb_get_iterator_proc(canonical_plugin_name, &l_count);
l_percentage = 0.0;
if(run_mode == GIMP_RUN_INTERACTIVE)
@@ -264,12 +318,12 @@
gimp_progress_init( _("Applying filter to all layers..."));
}
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, 0, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, 0, canonical_plugin_name);
if(l_layer_id >= 0)
{
if(l_nlayers < 1)
{
- fprintf(stderr, "ERROR: need at least 1 Layers to apply plugin !\n");
+ printf("ERROR: need at least 1 Layers to apply plugin !\n");
}
else
{
@@ -281,7 +335,7 @@
/* save the visibility of all layers */
for(l_idx = 0; l_idx < l_nlayers; l_idx++)
{
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, canonical_plugin_name);
l_visible_tab[l_idx] = gimp_drawable_get_visible(l_layer_id);
/* make the backround visible, all others invisible
@@ -298,32 +352,35 @@
l_child_pid = 0; /* fork(); */
if(l_child_pid < 0)
{
- fprintf(stderr, "ERROR: fork failed !\n");
+ printf("ERROR: fork failed !\n");
return -1;
}
/* if(l_child_pid != 0) */
{
/* parent process: call plugin Interactive for background layer[n] */
- /* if(gap_debug) fprintf(stderr, "forked child process pid=%ld\n", l_child_pid); */
- if(gap_debug) fprintf(stderr, "DEBUG start 1.st Interactive call (_FROM values)\n");
+ /* if(gap_debug) printf("forked child process pid=%ld\n", l_child_pid); */
+ if(gap_debug)
+ {
+ printf("DEBUG start 1.st Interactive call (_FROM values)\n");
+ }
l_idx = l_nlayers -1;
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, canonical_plugin_name);
if(l_layer_id < 0)
{
l_rc = -1;
}
else
{
- if(gap_debug) fprintf(stderr, "DEBUG: apllying %s on Layerstack %d id=%d\n", plugin_name, (int)l_idx, (int)l_layer_id);
- l_rc = gap_filt_pdb_call_plugin(plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
+ if(gap_debug) printf("DEBUG: apllying %s on Layerstack %d id=%d\n", canonical_plugin_name, (int)l_idx, (int)l_layer_id);
+ l_rc = gap_filt_pdb_call_plugin(canonical_plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
- /* get values, then store with suffix "_ITER_FROM" */
- l_plugin_data_len = gap_filt_pdb_get_data(plugin_name);
+ /* get values, then store with suffix "-ITER-FROM" */
+ l_plugin_data_len = gap_filt_pdb_get_data(canonical_plugin_name);
if(l_plugin_data_len > 0)
{
- g_snprintf(l_key_from, sizeof(l_key_from), "%s_ITER_FROM", plugin_name);
+ g_snprintf(l_key_from, sizeof(l_key_from), "%s%s", canonical_plugin_name, GAP_ITER_FROM_SUFFIX);
gap_filt_pdb_set_data(l_key_from, l_plugin_data_len);
}
else l_rc = -1;
@@ -339,23 +396,23 @@
if((l_rc >= 0) && (l_nlayers > 1))
{
/* child process: call plugin Interactive for top layer [0] */
- if(gap_debug) fprintf(stderr, "DEBUG start 2.nd Interactive call (_TO values)\n");
+ if(gap_debug) printf("DEBUG start 2.nd Interactive call (_TO values)\n");
/* optional dialog between both calls (to see the effect of 1.call) */
- if(p_pitstop(run_mode, plugin_name, 0,
+ if(p_pitstop(run_mode, canonical_plugin_name, 0,
l_step_backup_file, sizeof(l_step_backup_file), 0
)
< 0)
{
- if(gap_debug) fprintf(stderr, "TERMINATED: by pitstop dialog\n");
+ if(gap_debug) printf("TERMINATED: by pitstop dialog\n");
/* restore the visibility of all layers */
- p_visibilty_restore(image_id, l_nlayers, l_visible_tab, plugin_name);
+ p_visibilty_restore(image_id, l_nlayers, l_visible_tab, canonical_plugin_name);
g_free(l_visible_tab);
return -1;
}
else
{
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, 0, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, 0, canonical_plugin_name);
if(l_layer_id < 0)
{
l_rc = -1;
@@ -366,14 +423,14 @@
gimp_drawable_set_visible(l_layer_id, TRUE);
p_gdisplays_update_full(image_id);
- if(gap_debug) fprintf(stderr, "DEBUG: apllying %s on Layerstack 0 id=%d\n", plugin_name, (int)l_layer_id);
- l_rc = gap_filt_pdb_call_plugin(plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
+ if(gap_debug) printf("DEBUG: apllying %s on Layerstack 0 id=%d\n", canonical_plugin_name, (int)l_layer_id);
+ l_rc = gap_filt_pdb_call_plugin(canonical_plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
- /* get values, then store with suffix "_ITER_TO" */
- l_plugin_data_len = gap_filt_pdb_get_data(plugin_name);
+ /* get values, then store with suffix "-ITER-TO" */
+ l_plugin_data_len = gap_filt_pdb_get_data(canonical_plugin_name);
if(l_plugin_data_len > 0)
{
- g_snprintf(l_key_to, sizeof(l_key_to), "%s_ITER_TO", plugin_name);
+ g_snprintf(l_key_to, sizeof(l_key_to), "%s%s", canonical_plugin_name, GAP_ITER_TO_SUFFIX);
gap_filt_pdb_set_data(l_key_to, l_plugin_data_len);
}
else l_rc = -1;
@@ -384,7 +441,7 @@
gimp_progress_update (l_percentage);
}
- /* if(gap_debug) fprintf(stderr, "DEBUG child process exit %d\n", (int)l_rc); */
+ /* if(gap_debug) printf("DEBUG child process exit %d\n", (int)l_rc); */
/* exit(l_rc); */ /* end of childprocess */
}
@@ -402,15 +459,15 @@
* for each layer
*/
/* call plugin only ONCE Interactive for background layer[n] */
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_nlayers -1, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_nlayers -1, canonical_plugin_name);
if(l_layer_id < 0)
{
l_rc = -1;
}
else
{
- if(gap_debug) fprintf(stderr, "DEBUG: NO Varying, apllying %s on Layer id=%d\n", plugin_name, (int)l_layer_id);
- l_rc = gap_filt_pdb_call_plugin(plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
+ if(gap_debug) printf("DEBUG: NO Varying, applying %s on Layer id=%d\n", canonical_plugin_name, (int)l_layer_id);
+ l_rc = gap_filt_pdb_call_plugin(canonical_plugin_name, image_id, l_layer_id, GIMP_RUN_INTERACTIVE);
l_top_layer = 0;
if(run_mode == GIMP_RUN_INTERACTIVE)
{
@@ -422,7 +479,6 @@
if((l_rc >= 0) && (l_nlayers > 2))
{
-
/* call plugin foreach layer inbetween
* with runmode GIMP_RUN_WITH_LAST_VALS
* and modify the last values
@@ -434,61 +490,49 @@
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, plugin_name, 1,
+ l_pit_rc = p_pitstop(run_mode, canonical_plugin_name, 1,
l_step_backup_file, sizeof(l_step_backup_file),
l_idx );
}
if(l_pit_rc < 0)
{
- if(gap_debug) fprintf(stderr, "TERMINATED: by pitstop dialog\n");
+ if(gap_debug) printf("TERMINATED: by pitstop dialog\n");
l_rc = -1;
}
- l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, plugin_name);
+ l_layer_id = p_get_indexed_layerid(image_id, &l_nlayers, l_idx, canonical_plugin_name);
if(l_layer_id < 0)
{
l_rc = -1;
break;
}
- if(gap_debug) fprintf(stderr, "DEBUG: apllying %s on Layerstack %d id=%d\n", plugin_name, (int)l_idx, (int)l_layer_id);
+ if(gap_debug)
+ {
+ printf("DEBUG: applying %s on Layerstack %d id=%d total_steps:%d current_step:%d\n"
+ , canonical_plugin_name
+ , (int)l_idx
+ , (int)l_layer_id
+ , (int)l_nlayers -1
+ , (int)l_idx
+ );
+ }
if((l_plugin_iterator != NULL) && (apply_mode == GAP_PAPP_VARYING_LINEAR ))
{
- /* call plugin-specific iterator (or the common iterator), to modify
- * the plugin's last_values
- */
- if(gap_debug) fprintf(stderr, "DEBUG: calling iterator %s current step:%d\n",
- l_plugin_iterator, (int)l_idx);
- if(strcmp(l_plugin_iterator, GIMP_PLUGIN_GAP_COMMON_ITER) == 0)
- {
- l_params = gimp_run_procedure (l_plugin_iterator,
- &l_retvals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_INT32, l_nlayers -1, /* total steps */
- GIMP_PDB_FLOAT, (gdouble)l_idx, /* current step */
- GIMP_PDB_INT32, l_plugin_data_len, /* length of stored data struct */
- GIMP_PDB_STRING, plugin_name, /* the common iterator needs the plugin name as additional param */
- GIMP_PDB_END);
- }
- else
- {
- l_params = gimp_run_procedure (l_plugin_iterator,
- &l_retvals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_INT32, l_nlayers -1, /* total steps */
- GIMP_PDB_FLOAT, (gdouble)l_idx, /* current step */
- GIMP_PDB_INT32, l_plugin_data_len, /* length of stored data struct */
- GIMP_PDB_END);
- }
- if (l_params[0].data.d_status != GIMP_PDB_SUCCESS)
- {
- fprintf(stderr, "ERROR: iterator %s failed\n", l_plugin_iterator);
- l_rc = -1;
- }
-
- gimp_destroy_params(l_params, l_retvals);
+ /* call plugin-specific iterator (or the common iterator), to modify
+ * the plugin's last_values
+ */
+ if(!gap_filter_iterator_call(l_plugin_iterator
+ , l_nlayers -1 /* total steps */
+ , (gdouble)l_idx /* current step */
+ , canonical_plugin_name
+ , l_plugin_data_len
+ ))
+ {
+ l_rc = -1;
+ }
}
if(l_rc < 0) break;
@@ -496,7 +540,7 @@
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(plugin_name, image_id, l_layer_id, GIMP_RUN_WITH_LAST_VALS);
+ 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] != ' '))
{
@@ -517,7 +561,7 @@
}
/* restore the visibility of all layers */
- p_visibilty_restore(image_id, l_nlayers, l_visible_tab, plugin_name);
+ p_visibilty_restore(image_id, l_nlayers, l_visible_tab, canonical_plugin_name);
g_free(l_visible_tab);
}
@@ -528,16 +572,15 @@
if(l_plugin_iterator != NULL) g_free(l_plugin_iterator);
return l_rc;
-} /* end p_foreach_multilayer */
+} /* end p_foreach_multilayer2 */
-
-/* ============================================================================
+/* ------------------------
* gap_proc_anim_apply
- * ============================================================================
+ * ------------------------
*/
-
-gint gap_proc_anim_apply(GimpRunMode run_mode, gint32 image_id, char *plugin_name
+gint
+gap_proc_anim_apply(GimpRunMode run_mode, gint32 image_id, char *plugin_name
, GapFiltPdbApplyMode apply_mode)
{
GapDbBrowserResult l_browser_result;
@@ -556,14 +599,14 @@
GAP_DB_BROWSER_FILTERALL_HELP_ID)
< 0)
{
- if(gap_debug) fprintf(stderr, "DEBUG: gap_db_browser_dialog cancelled\n");
+ if(gap_debug) printf("DEBUG: gap_db_browser_dialog cancelled\n");
return -1;
}
strcpy(plugin_name, l_browser_result.selected_proc_name);
if(l_browser_result.button_nr == 1) apply_mode = GAP_PAPP_VARYING_LINEAR;
- if(gap_debug) fprintf(stderr, "DEBUG: gap_db_browser_dialog SELECTED:%s\n", plugin_name);
+ if(gap_debug) printf("DEBUG: gap_db_browser_dialog SELECTED:%s\n", plugin_name);
}
Modified: branches/gap-2-4/gap/gap_filter_iterators.c
==============================================================================
--- branches/gap-2-4/gap/gap_filter_iterators.c (original)
+++ branches/gap-2-4/gap/gap_filter_iterators.c Mon Jan 14 19:33:53 2008
@@ -96,6 +96,7 @@
#include "gap_dbbrowser_utils.h"
+
static gchar *g_plugin_data_from = NULL;
static gchar *g_plugin_data_to = NULL;
@@ -703,8 +704,8 @@
if(gap_debug) printf("\ngap_common_iterator START: keyname: %s total_steps: %d, curent_step: %f\n", keyname, (int)total_steps, (float)current_step );
key_description = gimp_lastval_desc_keyname (keyname);
- key_from = g_strdup_printf("%s_ITER_FROM", keyname);
- key_to = g_strdup_printf("%s_ITER_TO", keyname);
+ key_from = g_strdup_printf("%s%s", keyname, GAP_ITER_FROM_SUFFIX);
+ key_to = g_strdup_printf("%s%s", keyname, GAP_ITER_TO_SUFFIX);
buf_size = gimp_get_data_size(keyname);
desc_size = gimp_get_data_size(key_description);
@@ -1249,141 +1250,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_scatter_rgb", 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_scatter_hsv", 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 */
@@ -1395,7 +1396,6 @@
* install (query) iterators_ALT
* ----------------------------------------------------------------------
*/
-
static void p_install_proc_iter_ALT(char *name)
{
gchar *l_iter_proc_name;
@@ -1412,7 +1412,7 @@
static GimpParamDef *return_vals = NULL;
static int nreturn_vals = 0;
- l_iter_proc_name = g_strdup_printf("%s_Iterator_ALT", name);
+ l_iter_proc_name = g_strdup_printf("%s%s", name, GAP_ITERATOR_ALT_SUFFIX);
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,
@@ -1420,7 +1420,7 @@
"",
"Wolfgang Hofer",
"Wolfgang Hofer",
- "Feb. 2000",
+ "Nov. 2007",
NULL, /* do not appear in menus */
NULL,
GIMP_PLUGIN,
@@ -1455,22 +1455,33 @@
char *l_name;
int l_cut;
+ if(gap_debug)
+ {
+ printf("gap_run_iterators_ALT START for name:%s\n", name);
+ }
+
l_name = g_strdup(name);
- l_cut = strlen(l_name) - strlen("_Iterator_ALT");
+ l_cut = strlen(l_name) - strlen(GAP_ITERATOR_ALT_SUFFIX);
if(l_cut < 1)
{
- fprintf(stderr, "ERROR: gap_run_iterators_ALT: proc_name ending _Iterator_ALT missing%s\n", name);
+ printf("ERROR: gap_run_iterators_ALT: proc_name ending %s missing%s\n"
+ , GAP_ITERATOR_ALT_SUFFIX
+ , name
+ );
return -1;
}
- if(strcmp(&l_name[l_cut], "_Iterator_ALT") != 0)
+ if(strcmp(&l_name[l_cut], GAP_ITERATOR_ALT_SUFFIX) != 0)
{
- fprintf(stderr, "ERROR: gap_run_iterators_ALT: proc_name ending _Iterator_ALT missing%s\n", name);
+ printf("ERROR: gap_run_iterators_ALT: proc_name ending %s missing%s\n"
+ , GAP_ITERATOR_ALT_SUFFIX
+ , name
+ );
return -1;
}
l_rc = -1;
- l_name[l_cut] = '\0'; /* cut off "_Iterator_ALT" from l_name end */
+ l_name[l_cut] = '\0'; /* cut off "-Iterator-ALT" from l_name end */
/* allocate from/to plugin_data buffers
* as big as needed for the current plugin named l_name
Modified: branches/gap-2-4/gap/gap_filter_pdb.c
==============================================================================
--- branches/gap-2-4/gap/gap_filter_pdb.c (original)
+++ branches/gap-2-4/gap/gap_filter_pdb.c Mon Jan 14 19:33:53 2008
@@ -75,10 +75,17 @@
static char *global_plugin_data = NULL;
+
+static char * p_filt_pdb_get_alternative_iterator_proc(char *plugin_name, gint *count);
+static gint p_count_iterable_params(gchar *key_description, gint desc_size);
+
+/* ------------------------
+ * gap_filt_pdb_call_plugin
+ * ------------------------
+ */
gint
gap_filt_pdb_call_plugin(char *plugin_name, gint32 image_id, gint32 layer_id, GimpRunMode run_mode)
{
- GimpDrawable *l_drawable;
GimpParam *l_ret_params;
GimpParam *l_argv;
gint l_retvals;
@@ -95,8 +102,6 @@
GimpParamDef *l_return_vals;
gint l_rc;
- l_drawable = gimp_drawable_get(layer_id); /* use the background layer */
-
/* query for plugin_name to get its argument types */
if (!gimp_procedural_db_proc_info (plugin_name,
&l_proc_blurb,
@@ -110,7 +115,7 @@
&l_params,
&l_return_vals))
{
- fprintf(stderr, "ERROR: Plugin not available, Name was %s\n", plugin_name);
+ printf("ERROR: Plugin not available, Name was %s\n", plugin_name);
return -1;
}
@@ -130,7 +135,7 @@
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_LAYER:
case GIMP_PDB_CHANNEL:
- l_argv[l_idx].data.d_drawable = l_drawable->drawable_id;
+ l_argv[l_idx].data.d_drawable = layer_id;
break;
case GIMP_PDB_IMAGE:
l_argv[l_idx].data.d_image = image_id;
@@ -156,7 +161,7 @@
/* init the standard parameters, that should be common to all plugins */
l_argv[0].data.d_int32 = run_mode;
l_argv[1].data.d_image = image_id;
- l_argv[2].data.d_drawable = l_drawable->drawable_id;
+ l_argv[2].data.d_drawable = layer_id;
/* run the plug-in procedure */
l_ret_params = gimp_run_procedure2 (plugin_name, &l_retvals, l_nparams, l_argv);
@@ -187,9 +192,13 @@
}
gimp_destroy_params(l_ret_params, l_retvals);
return(l_rc);
-}
+} /* end gap_filt_pdb_call_plugin */
+/* ------------------------
+ * gap_filt_pdb_save_xcf
+ * ------------------------
+ */
int
gap_filt_pdb_save_xcf(gint32 image_id, char *sav_name)
{
@@ -217,16 +226,17 @@
gimp_destroy_params (l_params, l_retvals);
return (l_rc);
-}
+} /* end gap_filt_pdb_save_xcf */
-/* ============================================================================
+/* ------------------------
+ * gap_filt_pdb_get_data
+ * ------------------------
* gap_filt_pdb_get_data
* try to get the plugin's data (key is usually the name of the plugin)
* and check for the length of the retrieved data.
* if all done OK return the length of the retrieved data,
* return -1 in case of errors.
- * ============================================================================
*/
gint
gap_filt_pdb_get_data(char *key)
@@ -236,7 +246,7 @@
l_len = gimp_get_data_size (key);
if(l_len < 1)
{
- fprintf(stderr, "ERROR: no stored data found for Key %s\n", key);
+ printf("ERROR gap_filt_pdb_get_data: no stored data found for Key %s\n", key);
return -1;
}
if(global_plugin_data)
@@ -248,13 +258,12 @@
if(gap_debug) printf("DEBUG gap_filt_pdb_get_data Key:%s retrieved bytes %d\n", key, (int)l_len);
return (l_len);
-}
+} /* end gap_filt_pdb_get_data */
-/* ============================================================================
+/* ------------------------
* gap_filt_pdb_set_data
- *
+ * ------------------------
* set global_plugin_data
- * ============================================================================
*/
void
gap_filt_pdb_set_data(char *key, gint plugin_data_len)
@@ -263,11 +272,12 @@
{
gimp_set_data(key, global_plugin_data, plugin_data_len);
}
-}
+} /* end gap_filt_pdb_set_data */
-/* ============================================================================
+
+/* --------------------------------
* gap_filt_pdb_procedure_available
- * ============================================================================
+ * --------------------------------
* return 0 if available, -1 if not available
*
* if ptype is GAP_PTYP_ITERATOR then check for typical iterator procedure PDB parameters
@@ -276,8 +286,8 @@
* if ptype is GAP_PTYP_CAN_OPERATE_ON_DRAWABLE:
* return -1 if procedure has not the 3 typical parameters INT32, IMAGE, DRAWABLE
*/
-
-gint gap_filt_pdb_procedure_available(char *proc_name, GapFiltPdbProcType ptype)
+gint
+gap_filt_pdb_procedure_available(char *proc_name, GapFiltPdbProcType ptype)
{
gint l_nparams;
gint l_nreturn_vals;
@@ -309,7 +319,10 @@
&l_return_vals))
{
/* procedure found in PDB */
- if(gap_debug) fprintf(stderr, "DEBUG: found in PDB %s\n", proc_name);
+ if(gap_debug)
+ {
+ printf("DEBUG: found in PDB %s\n", proc_name);
+ }
switch(ptype)
{
@@ -353,12 +366,12 @@
} /* end gap_filt_pdb_procedure_available */
-/* ============================================================================
+/* ------------------------
* p_count_iterable_params
+ * ------------------------
* Count iterable Parameters in the last_values_description.
- * ============================================================================
*/
-gint
+static gint
p_count_iterable_params(gchar *key_description, gint desc_size)
{
GimpLastvalDescType *lastval_desc_arr;
@@ -387,16 +400,75 @@
if (gap_debug) printf("p_count_iterable_params: %s COUNT: %d\n", key_description, (int)l_count);
return (l_count);
-}
+} /* end p_count_iterable_params */
+
+
+/* -----------------------------------------------
+ * p_filt_pdb_get_alternative_iterator_proc
+ * -----------------------------------------------
+ */
+static char *
+p_filt_pdb_get_alternative_iterator_proc(char *plugin_name, gint *count)
+{
+ char *l_plugin_iterator;
+ gchar *l_key_description;
+ gint l_desc_size;
+
+ l_plugin_iterator = NULL;
+
+ /* read all last value descriptions from file and set data in memory */
+ gimp_lastval_desc_update();
+
+ /* check for a description of LAST_VALUES buffer (we use a COMMON ITERATOR if available) */
+ l_key_description = gimp_lastval_desc_keyname (plugin_name);
+ l_desc_size = gimp_get_data_size(l_key_description);
+
+ if(l_desc_size > 0)
+ {
+ *count = p_count_iterable_params(l_key_description, l_desc_size);
+ l_plugin_iterator = g_strdup(GIMP_PLUGIN_GAP_COMMON_ITER);
+ }
+ g_free(l_key_description);
+
+ if(l_plugin_iterator == NULL)
+ {
+ l_plugin_iterator = g_strdup_printf("%s%s", plugin_name, GAP_ITERATOR_ALT_SUFFIX);
+
+ /* check for alternative Iterator -Iterator-ALT
+ * for gimp-1.3.x i made some Iterator Plugins using the ending -ALT,
+ * If New plugins were added or existing ones were updated
+ * the Authors should supply original _Iterator Procedures
+ * to be used instead of my Hacked versions without name conflicts.
+ * -Iterator-ALT procedures should be replaced by common iterator in future gimp releases
+ */
+ if(gap_filt_pdb_procedure_available(l_plugin_iterator, GAP_PTYP_ITERATOR) < 0)
+ {
+ /* no iterator available */
+ g_free(l_plugin_iterator);
+ l_plugin_iterator = NULL;
+ }
+ else
+ {
+ *count = 1;
+ }
+ }
+
+ return (l_plugin_iterator);
+
+} /* end p_filt_pdb_get_alternative_iterator_proc */
+
-/* ============================================================================
+/* --------------------------------
* gap_filt_pdb_get_iterator_proc
+ * --------------------------------
* check the PDB for Iterator Procedures in the following order:
- * 1.) a PDB procedurename with suffix "_Iterator" or
+ * 1.) a PDB procedurename with suffix "-Iterator" or
+ * 1.1) a PDB procedurename in old naming style with underscore character
+ * and suffix "-Iterator"
* 2.) search for a description of LAST_VALUES buffer in file
* (and set all available descriptions in memory,
* to speed up further searches in this session)
- * 3.) a PDB procedurename with suffix "_Iterator_ALT"
+ * 3.) a PDB procedurename with suffix "-Iterator-ALT"
* return Pointer to the name of the Iterator Procedure
* or NULL if not found
*
@@ -404,85 +476,58 @@
* is returned for
* the case when the description of LAST_VALUES buffer is available
* and there is no individual Iterator Procedure.
- * ============================================================================
*/
-char * gap_filt_pdb_get_iterator_proc(char *plugin_name, gint *count)
+char *
+gap_filt_pdb_get_iterator_proc(char *plugin_name, gint *count)
{
char *l_plugin_iterator;
-
+ char *canonical_name;
+
+ canonical_name = gimp_canonicalize_identifier(plugin_name);
+
/* check for matching Iterator PluginProcedures */
- l_plugin_iterator = g_strdup_printf("%s_Iterator", plugin_name);
-
- /* check if iterator is available in PDB */
+ l_plugin_iterator = g_strdup_printf("%s%s", canonical_name, GAP_ITERATOR_SUFFIX);
+
+ /* check if iterator (new naming style) is available in PDB */
if(gap_filt_pdb_procedure_available(l_plugin_iterator, GAP_PTYP_ITERATOR) < 0)
{
g_free(l_plugin_iterator);
- l_plugin_iterator = NULL;
- *count = 0;
- {
- gchar *l_key_description;
- gint l_desc_size;
-
- /* read all last value descriptions from file and set data in memory */
- gimp_lastval_desc_update();
-
- /* check for a description of LAST_VALUES buffer (we use a COMMON ITERATOR if available) */
- l_key_description = gimp_lastval_desc_keyname (plugin_name);
- l_desc_size = gimp_get_data_size(l_key_description);
-
- if(l_desc_size > 0)
- {
- *count = p_count_iterable_params(l_key_description, l_desc_size);
- l_plugin_iterator = g_strdup(GIMP_PLUGIN_GAP_COMMON_ITER);
- }
- g_free(l_key_description);
-
- if(l_plugin_iterator == NULL)
- {
- l_plugin_iterator = g_strdup_printf("%s_Iterator_ALT", plugin_name);
-
- /* check for alternative Iterator _Iterator_ALT
- * for gimp-1.3.x i made some Iterator Plugins using the ending _ALT,
- * If New plugins were added or existing ones were updated
- * the Authors should supply original _Iterator Procedures
- * to be used instead of my Hacked versions without name conflicts.
- * _Iterator_ALT procedures should be replaced by common iterator in future gimp releases
- */
- if(gap_filt_pdb_procedure_available(l_plugin_iterator, GAP_PTYP_ITERATOR) < 0)
- {
- /* no iterator available */
- g_free(l_plugin_iterator);
- l_plugin_iterator = NULL;
- }
- else
- {
- *count = 1;
- }
- }
- }
+ *count = 0;
+ l_plugin_iterator = p_filt_pdb_get_alternative_iterator_proc(canonical_name, count);
}
else
{
*count = 1;
}
- if(gap_debug) printf("gap_filt_pdb_get_iterator_proc: END %s %s\n", plugin_name, l_plugin_iterator);
-
+ if(gap_debug)
+ {
+ printf("gap_filt_pdb_get_iterator_proc: END\n plugin:%s\n canonical:%s\n iterator_proc:%s\n"
+ , plugin_name
+ , canonical_name
+ , l_plugin_iterator
+ );
+ }
+
+ g_free(canonical_name);
+
return (l_plugin_iterator);
} /* end gap_filt_pdb_get_iterator_proc */
-/* ============================================================================
+/* ---------------------------------
+ * gap_filt_pdb_constraint_proc_sel1
+ * ---------------------------------
* constraint procedures
*
* are responsible for:
* - sensitivity of the dbbrowser's Apply Buttons
* - filter for dbbrowser's listbox
- * ============================================================================
*/
-int gap_filt_pdb_constraint_proc_sel1(gchar *proc_name, gint32 image_id)
+int
+gap_filt_pdb_constraint_proc_sel1(gchar *proc_name, gint32 image_id)
{
/* here we should check, if proc_name
* can operate on the current Imagetype (RGB, INDEXED, GRAY)
@@ -533,9 +578,12 @@
}
return 0; /* 0 .. set "Apply Varying" Button in_sensitive */
-}
+} /* end */
-/* check for procedures that are able to run with filter all layers
+/* -------------------------------------------------
+ * gap_filt_pdb_check_additional_supported_procedure
+ * -------------------------------------------------
+ * check for procedures that are able to run with filter all layers
* (limited to Constant apply) without having an iterator.
* most of them have no dialog for the interactive runmode.
*
@@ -551,18 +599,18 @@
/* if(strcmp(proc_name, "plug_in_autocrop_layer") == 0) { return (TRUE); } */
- if(strcmp(proc_name, "plug_in_autostretch_hsv") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_blur") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_c_astretch") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_color_adjust") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_color_enhance") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_deinterlace") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_dilate") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_erode") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_gradmap") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_hot") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_laplace") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_make_seamless") == 0)
+ if(strcmp(proc_name, "plug-in-autostretch-hsv") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-blur") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-c-astretch") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-color-adjust") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-color-enhance") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-deinterlace") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-dilate") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-erode") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-gradmap") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-hot") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-laplace") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-make-seamless") == 0)
{
/* add a dummy LAST_VALUE buffer if there is none */
if(gimp_get_data_size(proc_name) == 0)
@@ -571,11 +619,11 @@
}
return (TRUE);
}
- if(strcmp(proc_name, "plug_in_max_rgb") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_normalize") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_pixelize2") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_qbist") == 0) { return (TRUE); }
- if(strcmp(proc_name, "plug_in_vinvert") == 0)
+ if(strcmp(proc_name, "plug-in-max-rgb") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-normalize") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-pixelize2") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-qbist") == 0) { return (TRUE); }
+ if(strcmp(proc_name, "plug-in-vinvert") == 0)
{
/* add a dummy LAST_VALUE buffer if there is none */
if(gimp_get_data_size(proc_name) == 0)
@@ -586,10 +634,20 @@
}
return (FALSE);
-}
+} /* end gap_filt_pdb_check_additional_supported_procedure */
-int gap_filt_pdb_constraint_proc(gchar *proc_name, gint32 image_id)
+/* ----------------------------
+ * gap_filt_pdb_constraint_proc
+ * ----------------------------
+ * checks if the specified proc_name
+ * is relevant to be available in the GIMP-GAP filter browser.
+ *
+ * returns 1 for relevant proc_names
+ * returns 0 for NON-relevant proc_names
+ */
+int
+gap_filt_pdb_constraint_proc(gchar *proc_name, gint32 image_id)
{
int l_rc;
char *l_plugin_iterator;
@@ -601,9 +659,14 @@
return 0;
}
+ if(strncmp(proc_name, "plug-in-gap-", 12) == 0)
+ {
+ /* Do not add GAP Plugins (check if name starts with "plug-in-gap-") */
+ return 0;
+ }
if(strncmp(proc_name, "plug_in_gap_", 12) == 0)
{
- /* Do not add GAP Plugins (check if name starts with "plug_in_gap_") */
+ /* Do not add GAP Plugins (check if name starts with "plug_in_gap_" (old name style)) */
return 0;
}
@@ -641,4 +704,73 @@
g_free(l_plugin_iterator);
return 1; /* 1 add the plugin procedure */
-}
+} /* end gap_filt_pdb_constraint_proc */
+
+
+
+/* ------------------------
+ * gap_filter_iterator_call
+ * ------------------------
+ * performs one iteration step
+ * for varying the last value buffer for the plug in plugin_name
+ * by calling the relevant terator procedure
+ * specified by iteratorname.
+ *
+ */
+gboolean
+gap_filter_iterator_call(const char *iteratorname
+ , gint32 total_steps
+ , gdouble current_step
+ , const char *plugin_name
+ , gint32 plugin_data_len
+)
+{
+ GimpParam *l_params;
+ gint l_retvals;
+ gboolean l_rc;
+
+ l_rc = TRUE;
+
+ /* call plugin-specific iterator (or the common iterator), to modify
+ * the plugin's last_values
+ */
+ if(gap_debug)
+ {
+ printf("DEBUG: calling iterator %s current step:%f total:%d\n"
+ , iteratorname
+ , (float)current_step
+ , (int)total_steps
+ );
+ }
+ if(strcmp(iteratorname, GIMP_PLUGIN_GAP_COMMON_ITER) == 0)
+ {
+ l_params = gimp_run_procedure (iteratorname,
+ &l_retvals,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_INT32, total_steps,
+ GIMP_PDB_FLOAT, current_step,
+ GIMP_PDB_INT32, plugin_data_len, /* length of stored data struct */
+ GIMP_PDB_STRING, plugin_name, /* the common iterator needs the plugin name as additional param */
+ GIMP_PDB_END);
+ }
+ else
+ {
+ l_params = gimp_run_procedure (iteratorname,
+ &l_retvals,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_INT32, total_steps,
+ GIMP_PDB_FLOAT, current_step,
+ GIMP_PDB_INT32, plugin_data_len, /* length of stored data struct */
+ GIMP_PDB_END);
+ }
+ if (l_params[0].data.d_status != GIMP_PDB_SUCCESS)
+ {
+ printf("ERROR: iterator %s failed\n", iteratorname);
+ l_rc = FALSE;
+ }
+
+ gimp_destroy_params(l_params, l_retvals);
+ return (l_rc);
+
+} /* end gap_filter_iterator_call */
+
Modified: branches/gap-2-4/gap/gap_filter_pdb.h
==============================================================================
--- branches/gap-2-4/gap/gap_filter_pdb.h (original)
+++ branches/gap-2-4/gap/gap_filter_pdb.h Mon Jan 14 19:33:53 2008
@@ -55,5 +55,12 @@
int gap_filt_pdb_constraint_proc_sel2(gchar *proc_name, gint32 image_id);
int gap_filt_pdb_constraint_proc(gchar *proc_name, gint32 image_id);
+gboolean gap_filter_iterator_call(const char *iteratorname
+ , gint32 total_steps
+ , gdouble current_step
+ , const char *plugin_name
+ , gint32 plugin_data_len
+ );
+
#endif
Modified: branches/gap-2-4/gap/gap_layer_copy.c
==============================================================================
--- branches/gap-2-4/gap/gap_layer_copy.c (original)
+++ branches/gap-2-4/gap/gap_layer_copy.c Mon Jan 14 19:33:53 2008
@@ -42,6 +42,7 @@
#include "string.h"
/* GIMP includes */
/* GAP includes */
+#include "gap_lib_common_defs.h"
#include "gap_layer_copy.h"
#include "gap_pdb_calls.h"
@@ -122,7 +123,6 @@
gap_layer_copy_to_image (gint32 dst_image_id, gint32 src_layer_id)
{
gint32 l_new_layer_id;
- GimpDrawable *src_drawable;
GimpImageType l_src_type;
gdouble l_src_opacity;
GimpLayerModeEffects l_src_mode;
@@ -131,7 +131,6 @@
/* create new layer in destination image */
l_src_type = gimp_drawable_type(src_layer_id);
- src_drawable = gimp_drawable_get (src_layer_id);
l_src_opacity = gimp_layer_get_opacity(src_layer_id);
l_src_mode = gimp_layer_get_mode(src_layer_id);
@@ -259,6 +258,8 @@
}
gimp_drawable_flush (dst_drawable);
+ gimp_drawable_detach(src_drawable);
+ gimp_drawable_detach(dst_drawable);
return TRUE;
} /* end gap_layer_copy_content */
@@ -406,6 +407,8 @@
}
gimp_drawable_update (dst_drawable_id, x1, y1, (x2 - x1), (y2 - y1));
+ gimp_drawable_detach(src_drawable);
+ gimp_drawable_detach(dst_drawable);
return TRUE;
} /* end gap_layer_copy_picked_channel */
@@ -481,6 +484,8 @@
/* update the processed region */
gimp_drawable_flush (dst_drawable);
+ gimp_drawable_detach(dst_drawable);
+
}
return(layer_id);
@@ -542,3 +547,59 @@
}
} /* end gap_layer_clear_to_color */
+
+
+
+/* ----------------------------------------------------
+ * gap_layer_flip
+ * ----------------------------------------------------
+ * flip layer according to flip_request,
+ * return the id of the flipped layer.
+ * NOTE: flip_request GAP_STB_FLIP_NONE returns the unchanged layer
+ */
+gint32
+gap_layer_flip(gint32 layer_id, gint32 flip_request)
+{
+ gint32 center_x;
+ gint32 center_y;
+ gdouble axis;
+
+
+ switch(flip_request)
+ {
+ case GAP_STB_FLIP_HOR:
+ 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 */
+ );
+ 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 */
+ );
+ break;
+ case GAP_STB_FLIP_BOTH:
+ center_x = gimp_drawable_width(layer_id) / 2;
+ center_y = gimp_drawable_height(layer_id) / 2;
+
+ layer_id = gimp_drawable_transform_rotate_simple(layer_id
+ ,GIMP_ROTATE_180
+ ,TRUE /* auto_center */
+ ,center_x
+ ,center_y
+ ,TRUE /* clip_result */
+ );
+ break;
+ default:
+ break;
+ }
+
+ return(layer_id);
+} /* end gap_layer_flip */
Modified: branches/gap-2-4/gap/gap_layer_copy.h
==============================================================================
--- branches/gap-2-4/gap/gap_layer_copy.h (original)
+++ branches/gap-2-4/gap/gap_layer_copy.h Mon Jan 14 19:33:53 2008
@@ -71,4 +71,7 @@
,gdouble blue
,gdouble alpha
);
+
+gint32 gap_layer_flip(gint32 layer_id, gint32 flip_request);
+
#endif
Modified: branches/gap-2-4/gap/gap_lib.c
==============================================================================
--- branches/gap-2-4/gap/gap_lib.c (original)
+++ branches/gap-2-4/gap/gap_lib.c Mon Jan 14 19:33:53 2008
@@ -1710,6 +1710,13 @@
return(-1);
}
+/* -------------------------------
+ * gap_lib_get_frame_nr
+ * -------------------------------
+ * return -1 if the specified image is
+ * NOT a gimp-gap typical frame image (e.g. has no number part in its filename)
+ * return the number part in case of valid frame image.
+ */
long
gap_lib_get_frame_nr(gint32 image_id)
{
@@ -1886,6 +1893,13 @@
gimp_get_data (l_key_save_as_mode, &l_save_as_mode);
+ if(gap_debug)
+ {
+ printf("DEBUG: p_decide_save_as l_save_as_mode: %d\n"
+ , l_save_as_mode
+ );
+ }
+
if(l_save_as_mode == -1)
{
gchar *l_key_gimprc;
@@ -1904,14 +1918,20 @@
}
l_key_gimprc = g_strdup_printf("video-save-flattened-%s", l_ext);
- if(gap_debug) printf("GIMPRC KEY:%s:\n", l_key_gimprc);
+ if(gap_debug)
+ {
+ printf("GIMPRC KEY:%s:\n", l_key_gimprc);
+ }
l_val_gimprc = gimp_gimprc_query(l_key_gimprc);
l_ask = TRUE;
if(l_val_gimprc)
{
- if(gap_debug) printf("GIMPRC VAL:%s:\n", l_val_gimprc);
+ if(gap_debug)
+ {
+ printf("GIMPRC VAL:%s:\n", l_val_gimprc);
+ }
if(strcmp(l_val_gimprc, "yes") == 0)
{
@@ -1928,7 +1948,10 @@
}
else
{
- if(gap_debug) printf("GIMPRC VAL:<NULL>\n");
+ if(gap_debug)
+ {
+ printf("GIMPRC VAL:<NULL>\n");
+ }
}
if(l_ask)
@@ -2030,39 +2053,51 @@
/* ============================================================================
* gap_lib_save_named_image / 2
* ============================================================================
+ * this procedure is typically used to save frame images in other image formats than
+ * gimp native XCF format.
*/
static gint32
p_lib_save_named_image2(gint32 image_id, const char *sav_name, GimpRunMode run_mode, gboolean enable_thumbnailsave)
{
- GimpDrawable *l_drawable;
+ gint32 l_drawable_id;
gint l_nlayers;
gint32 *l_layers_list;
gboolean l_rc;
- if(gap_debug) printf("DEBUG: before p_lib_save_named_image2: '%s'\n", sav_name);
+ if(gap_debug)
+ {
+ printf("DEBUG: before p_lib_save_named_image2: '%s'\n", sav_name);
+ }
l_layers_list = gimp_image_get_layers(image_id, &l_nlayers);
if(l_layers_list == NULL)
- return -1;
-
- l_drawable = gimp_drawable_get(l_layers_list[l_nlayers -1]); /* use the background layer */
- if(l_drawable == NULL)
{
- fprintf(stderr, "ERROR: p_lib_save_named_image2 gimp_drawable_get failed '%s' nlayers=%d\n",
- sav_name, (int)l_nlayers);
- g_free (l_layers_list);
+ printf("ERROR: gap_lib.c.p_lib_save_named_image2: failed to save '%s' because has no layers\n"
+ , sav_name
+ );
return -1;
}
+ l_drawable_id = l_layers_list[l_nlayers -1]; /* use the background layer */
+
l_rc = gimp_file_save(run_mode,
image_id,
- l_drawable->drawable_id,
+ l_drawable_id,
sav_name,
sav_name /* raw name ? */
);
- if(gap_debug) printf("DEBUG: after p_lib_save_named_image2: '%s' nlayers=%d image=%d drw=%d run_mode=%d\n", sav_name, (int)l_nlayers, (int)image_id, (int)l_drawable->drawable_id, (int)run_mode);
+ if(gap_debug)
+ {
+ printf("DEBUG: after p_lib_save_named_image2: '%s' nlayers=%d image=%d drawable_id=%d run_mode=%d\n"
+ , sav_name
+ , (int)l_nlayers
+ , (int)image_id
+ , (int)l_drawable_id
+ , (int)run_mode
+ );
+ }
if(enable_thumbnailsave)
{
@@ -2073,15 +2108,19 @@
g_free(l_sav_name);
}
- if(gap_debug) printf("DEBUG: after thumbmail save\n");
+ if(gap_debug)
+ {
+ printf("DEBUG: after thumbmail save\n");
+ }
g_free (l_layers_list);
- gimp_drawable_detach (l_drawable);
-
if (l_rc != TRUE)
{
- fprintf(stderr, "ERROR: p_lib_save_named_image2 gimp_file_save failed '%s'\n", sav_name);
+ printf("ERROR: p_lib_save_named_image2 gimp_file_save failed '%s' rc:%d\n"
+ , sav_name
+ ,(int)l_rc
+ );
return -1;
}
return image_id;
@@ -2125,7 +2164,13 @@
/* check extension to decide if savd file will be zipped */
l_ext = gap_lib_alloc_extension(sav_name);
- if(l_ext == NULL) return -1;
+ if(l_ext == NULL)
+ {
+ printf("gap_lib_save_named_frame failed for file:%s (because it has no extension)\n"
+ ,sav_name
+ );
+ return -1;
+ }
if(0 == strcmp(l_ext, ".xcf"))
{
@@ -2155,21 +2200,28 @@
g_free(l_ext);
- if(gap_debug)
- {
- l_ext = (gchar *) g_getenv("GAP_NO_SAVE");
- if(l_ext != NULL)
- {
- fprintf(stderr, "DEBUG: GAP_NO_SAVE is set: save is skipped: '%s'\n", l_tmpname);
- g_free(l_tmpname); /* free if it was a temporary name */
- return 0;
- }
- }
+ if(gap_debug)
+ {
+ char *env_no_save;
+ env_no_save = (gchar *) g_getenv("GAP_NO_SAVE");
+ if(env_no_save != NULL)
+ {
+ printf("DEBUG: GAP_NO_SAVE is set: save is skipped: '%s'\n", l_tmpname);
+ g_free(l_tmpname); /* free if it was a temporary name */
+ return 0;
+ }
+ }
- if(gap_debug) printf("DEBUG: before gap_lib_save_named_frame: '%s'\n", l_tmpname);
if(l_xcf != 0)
{
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame before gimp_xcf_save on file: '%s'\n"
+ , l_tmpname
+ );
+ }
+
/* save current frame as xcf image
* xcf_save does operate on the complete image,
* the drawable is ignored. (we can supply a dummy value)
@@ -2182,7 +2234,10 @@
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);
+ if(gap_debug)
+ {
+ printf("DEBUG: after xcf gap_lib_save_named_frame: '%s'\n", l_tmpname);
+ }
if (l_params[0].data.d_status == GIMP_PDB_SUCCESS)
{
@@ -2192,6 +2247,13 @@
}
else
{
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame before save NON-XCF file: '%s'\n"
+ , l_tmpname
+ );
+ }
+
/* let gimp try to save (and detect filetype by extension)
* Note: the most imagefileformats do not support multilayer
* images, and extra channels
@@ -2201,6 +2263,14 @@
*/
l_rc = p_decide_save_as(image_id, l_tmpname, sav_name);
+
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame after save NON-XCF file: '%s' rc:%d\n"
+ , l_tmpname
+ , (int)l_rc
+ );
+ }
}
if(l_rc < 0)
@@ -2220,15 +2290,21 @@
* rename will not work.
* so lets try a copy ; remove sequence
*/
- if(gap_debug) printf("DEBUG: gap_lib_save_named_frame: RENAME 2nd try\n");
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame: RENAME 2nd try\n");
+ }
+
if(0 == gap_lib_file_copy(l_tmpname, sav_name))
{
g_remove(l_tmpname);
}
else
{
- fprintf(stderr, "ERROR in gap_lib_save_named_frame: can't rename %s to %s\n",
- l_tmpname, sav_name);
+ printf("ERROR in gap_lib_save_named_frame: can't rename %s to %s\n"
+ , l_tmpname
+ , sav_name
+ );
return -1;
}
}
@@ -2245,8 +2321,18 @@
}
}
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame: before gap_thumb_cond_gimp_file_save_thumbnail\n");
+ }
+
gap_thumb_cond_gimp_file_save_thumbnail(image_id, sav_name);
+ if(gap_debug)
+ {
+ printf("DEBUG: gap_lib_save_named_frame: after gap_thumb_cond_gimp_file_save_thumbnail\n");
+ }
+
g_free(l_tmpname); /* free temporary name */
return l_rc;
@@ -2266,6 +2352,12 @@
*/
if(gap_lib_gap_check_save_needed(ainfo_ptr->image_id))
{
+ if(gap_debug)
+ {
+ printf("p_save_old_frame Save required for file:%s\n"
+ , ainfo_ptr->old_filename
+ );
+ }
/* check and perform automatic onionskinlayer remove */
if(vin_ptr)
{
@@ -2276,6 +2368,15 @@
}
return (gap_lib_save_named_frame(ainfo_ptr->image_id, ainfo_ptr->old_filename));
}
+ else
+ {
+ if(gap_debug)
+ {
+ printf("p_save_old_frame No save needed for file:%s OK\n"
+ , ainfo_ptr->old_filename
+ );
+ }
+ }
return 0;
} /* end p_save_old_frame */
@@ -2429,31 +2530,74 @@
gint32 ref_active_layer;
gint32 ref_layer_stackpos;
gchar *ref_layer_name;
+ int save_rc;
do_onionskin_crate = FALSE;
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image START\n");
+ }
+
ref_layer_name = p_get_active_layer_name(ainfo_ptr->image_id
,&ref_active_layer
,&ref_layer_stackpos
);
- if(ainfo_ptr->new_filename != NULL) g_free(ainfo_ptr->new_filename);
+ if(ainfo_ptr->new_filename != NULL)
+ {
+ g_free(ainfo_ptr->new_filename);
+ }
ainfo_ptr->new_filename = gap_lib_alloc_fname(ainfo_ptr->basename,
ainfo_ptr->frame_nr,
ainfo_ptr->extension);
if(ainfo_ptr->new_filename == NULL)
+ {
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image (1) return because ainfo_ptr->new_filename == NULL\n");
+ }
return -1;
-
+ }
+
if(0 == gap_lib_file_exists(ainfo_ptr->new_filename ))
+ {
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image (2) return because %s does not exist (or is empty)\n"
+ , ainfo_ptr->new_filename
+ );
+ }
return -1;
+ }
+
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image (3) ainfo_ptr->new_filename:%s OK\n"
+ , ainfo_ptr->new_filename
+ );
+ }
vin_ptr = gap_vin_get_all(ainfo_ptr->basename);
- if(p_save_old_frame(ainfo_ptr, vin_ptr) < 0)
+ save_rc = p_save_old_frame(ainfo_ptr, vin_ptr);
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image (4) automatic save: save_rc:%d, old_filename:%s\n"
+ , (int)save_rc
+ , ainfo_ptr->old_filename
+ );
+ }
+
+ if(save_rc < 0)
{
if(vin_ptr)
{
g_free(vin_ptr);
}
+ printf("gap_lib_replace_image (5) automatic save failed: save_rc:%d, old_filename:%s\n"
+ , (int)save_rc
+ , ainfo_ptr->old_filename
+ );
return -1;
}
@@ -2510,6 +2654,11 @@
g_free(ref_layer_name);
}
+ if(gap_debug)
+ {
+ printf("gap_lib_replace_image ENDED regular\n");
+ }
+
return(image_id);
} /* end gap_lib_replace_image */
@@ -3073,3 +3222,52 @@
return (l_cnt);
} /* end gap_lib_sscan_flt_numbers */
+
+
+/* --------------------------------
+ * gap_lib_check_tooltips
+ * --------------------------------
+ * check and enable/disable tooltips according to global gimprc settings
+ */
+gboolean
+gap_lib_check_tooltips(gboolean *old_state)
+{
+ char *value_string;
+ gboolean new_state;
+ gboolean changed;
+
+ new_state = TRUE;
+ changed = TRUE;
+
+ value_string = gimp_gimprc_query("show-tooltips");
+ if(value_string != NULL)
+ {
+ if (strcmp(value_string, "no") == 0)
+ {
+ new_state = FALSE;
+ }
+ }
+
+ if (old_state != NULL)
+ {
+ if(*old_state == new_state)
+ {
+ changed = FALSE;
+ }
+ }
+
+ if (changed == TRUE)
+ {
+ if(new_state == TRUE)
+ {
+ gimp_help_enable_tooltips ();
+ }
+ else
+ {
+ gimp_help_disable_tooltips ();
+ }
+ }
+
+ return (new_state);
+
+} /* end gap_lib_check_tooltips */
Modified: branches/gap-2-4/gap/gap_lib.h
==============================================================================
--- branches/gap-2-4/gap/gap_lib.h (original)
+++ branches/gap-2-4/gap/gap_lib.h Mon Jan 14 19:33:53 2008
@@ -51,62 +51,8 @@
#define _GAP_LIB_H
#include "libgimp/gimp.h"
+#include "gap_lib_common_defs.h"
-/* G_DIR_SEPARATOR (is defined in glib.h if you have glib-1.2.0 or later) */
-#ifdef G_OS_WIN32
-
-/* Filenames in WIN/DOS Style */
-#ifndef G_DIR_SEPARATOR
-#define G_DIR_SEPARATOR '\\'
-#endif
-#define DIR_ROOT ':'
-
-#else /* !G_OS_WIN32 */
-
-/* Filenames in UNIX Style */
-#ifndef G_DIR_SEPARATOR
-#define G_DIR_SEPARATOR '/'
-#endif
-#define DIR_ROOT '/'
-
-#endif /* !G_OS_WIN32 */
-
-/* GapLibAinfoType enum values are subset of GapStoryRecordType
- * from the sourcefile gap_story_file.h
- */
-typedef enum
-{
- GAP_AINFO_UNUSED_1
- ,GAP_AINFO_UNUSED_2
- ,GAP_AINFO_IMAGE
- ,GAP_AINFO_ANIMIMAGE
- ,GAP_AINFO_FRAMES
- ,GAP_AINFO_MOVIE
- ,GAP_AINFO_UNUSED_3
- ,GAP_AINFO_UNKNOWN
-} GapLibAinfoType;
-
-
-typedef struct GapAnimInfo {
- gint32 image_id;
- char *basename; /* may include path */
- long frame_nr;
- char *extension;
- char *new_filename;
- char *old_filename;
- GimpRunMode run_mode;
- long width;
- long height;
- long frame_cnt;
- long curr_frame_nr;
- long first_frame_nr;
- long last_frame_nr;
-
- GapLibAinfoType ainfo_type;
- gint32 seltrack; /* input videotrack (used only for GAP_AINFO_MOVIE) */
- gdouble delace; /* deinterlace params (used only for GAP_AINFO_MOVIE) */
- gdouble density;
-} GapAnimInfo;
/* procedures used in other gap*.c files */
char * gap_lib_shorten_filename(const char *prefix
@@ -158,13 +104,7 @@
void gap_lib_fprintf_gdouble(FILE *fp, gdouble value, gint digits, gint precision_digits, const char *pfx);
gint gap_lib_sscan_flt_numbers(gchar *buf, gdouble *farr, gint farr_max);
-
-#define GAP_VID_PASTE_REPLACE 0
-#define GAP_VID_PASTE_INSERT_BEFORE 1
-#define GAP_VID_PASTE_INSERT_AFTER 2
-
-#define GAP_LIB_MAX_DIGITS 8
-#define GAP_LIB_DEFAULT_DIGITS 6
+gboolean gap_lib_check_tooltips(gboolean *old_state);
#endif
Modified: branches/gap-2-4/gap/gap_mod_layer.c
==============================================================================
--- branches/gap-2-4/gap/gap_mod_layer.c (original)
+++ branches/gap-2-4/gap/gap_mod_layer.c Mon Jan 14 19:33:53 2008
@@ -487,7 +487,7 @@
gint l_vis_result;
char l_name_buff[MAX_LAYERNAME];
- if(gap_debug) fprintf(stderr, "gap: p_apply_action START\n");
+ if(gap_debug) printf("gap: p_apply_action START\n");
l_rc = 0;
@@ -586,7 +586,7 @@
/* apply function defined by action_mode */
if(layli_ptr[l_idx].selected != FALSE)
{
- if(gap_debug) fprintf(stderr, "gap: p_apply_action on selected LayerID:%d layerstack:%d\n",
+ if(gap_debug) printf("gap: p_apply_action on selected LayerID:%d layerstack:%d\n",
(int)l_layer_id, (int)l_idx);
switch(action_mode)
{
@@ -613,7 +613,7 @@
image_id,
l_layer_id,
GIMP_RUN_WITH_LAST_VALS);
- if(gap_debug) fprintf(stderr, "gap: p_apply_action FILTER:%s rc =%d\n",
+ if(gap_debug) printf("gap: p_apply_action FILTER:%s rc =%d\n",
filter_procname, (int)l_rc);
break;
case GAP_MOD_ACM_APPLY_FILTER_ON_LAYERMASK:
@@ -929,6 +929,9 @@
case GAP_MOD_ACM_SET_MODE_VALUE_MODE:
gimp_layer_set_mode(l_layer_id, GIMP_VALUE_MODE);
break;
+ case GAP_MOD_ACM_RESIZE_TO_IMG:
+ gimp_layer_resize_to_image_size (l_layer_id);
+ break;
default:
break;
}
@@ -962,6 +965,7 @@
int l_rc;
int l_idx;
static char l_key_from[512];
+ static char *canonical_proc_name;
/* GAP-PDB-Browser Dialog */
/* ---------------------- */
@@ -975,12 +979,16 @@
image_id,
GAP_DB_BROWSER_MODFRAMES_HELP_ID) < 0)
{
- if(gap_debug) fprintf(stderr, "DEBUG: gap_db_browser_dialog cancelled\n");
+ if(gap_debug) printf("DEBUG: gap_db_browser_dialog cancelled\n");
return -1;
}
- strncpy(filter_procname, l_browser_result.selected_proc_name, filt_len-1);
+ canonical_proc_name = gimp_canonicalize_identifier(l_browser_result.selected_proc_name);
+
+ strncpy(filter_procname, canonical_proc_name, filt_len-1);
filter_procname[filt_len-1] = '\0';
+ g_free(canonical_proc_name);
+
if(l_browser_result.button_nr == 1) *apply_mode = GAP_PAPP_VARYING_LINEAR;
else *apply_mode = GAP_PAPP_CONSTANT;
@@ -991,7 +999,7 @@
l_rc = gap_filt_pdb_procedure_available(filter_procname, GAP_PTYP_CAN_OPERATE_ON_DRAWABLE);
if(l_rc < 0)
{
- fprintf(stderr, "ERROR: Plugin not available or wrong type %s\n", filter_procname);
+ printf("ERROR: Plugin not available or wrong type %s\n", filter_procname);
return -1;
}
@@ -999,7 +1007,7 @@
l_idx = gap_mod_get_1st_selected(layli_ptr, nlayers);
if(l_idx < 0)
{
- fprintf(stderr, "ERROR: No layer selected in 1.st handled frame\n");
+ printf("ERROR: No layer selected in 1.st handled frame\n");
return (-1);
}
l_drawable_id = layli_ptr[l_idx].layer_id;
@@ -1008,7 +1016,7 @@
l_drawable_id = gimp_layer_get_mask(layli_ptr[l_idx].layer_id);
if(l_drawable_id < 0)
{
- fprintf(stderr, "ERROR: selected layer has no layermask\n");
+ printf("ERROR: selected layer has no layermask\n");
return -1;
}
}
@@ -1026,11 +1034,11 @@
*/
/* gimp_display_delete(*dpy_id); */
- /* get values, then store with suffix "_ITER_FROM" */
+ /* get values, then store with suffix "-ITER-FROM" */
*plugin_data_len = gap_filt_pdb_get_data(filter_procname);
if(*plugin_data_len > 0)
{
- g_snprintf(l_key_from, sizeof(l_key_from), "%s_ITER_FROM", filter_procname);
+ g_snprintf(l_key_from, sizeof(l_key_from), "%s%s", filter_procname, GAP_ITER_FROM_SUFFIX);
gap_filt_pdb_set_data(l_key_from, *plugin_data_len);
}
else
@@ -1135,25 +1143,34 @@
/* --------------------------------- */
l_rc = gap_filt_pdb_call_plugin(filter_procname, l_last_image_id, l_drawable_id, GIMP_RUN_INTERACTIVE);
- /* get values, then store with suffix "_ITER_TO" */
+ /* get values, then store with suffix "-ITER-TO" */
l_plugin_data_len = gap_filt_pdb_get_data(filter_procname);
if(l_plugin_data_len <= 0)
goto cleanup;
- g_snprintf(l_key_to, sizeof(l_key_to), "%s_ITER_TO", filter_procname);
+ g_snprintf(l_key_to, sizeof(l_key_to), "%s%s", filter_procname, GAP_ITER_TO_SUFFIX);
gap_filt_pdb_set_data(l_key_to, l_plugin_data_len);
/* get FROM values */
- g_snprintf(l_key_from, sizeof(l_key_from), "%s_ITER_FROM", filter_procname);
+ g_snprintf(l_key_from, sizeof(l_key_from), "%s%s", filter_procname, GAP_ITER_FROM_SUFFIX);
l_plugin_data_len = gap_filt_pdb_get_data(l_key_from);
gap_filt_pdb_set_data(filter_procname, l_plugin_data_len);
l_rc = p_pitstop_dialog(1, filter_procname);
cleanup:
- if(l_dpy_id >= 0) gimp_display_delete(l_dpy_id);
- if(l_last_image_id >= 0) gimp_image_delete(l_last_image_id);
- if(l_layli_ptr != NULL) g_free(l_layli_ptr);
+ if(l_last_image_id >= 0)
+ {
+ gimp_image_delete(l_last_image_id);
+ }
+ if(l_dpy_id >= 0)
+ {
+ gimp_display_delete(l_dpy_id);
+ }
+ if(l_layli_ptr != NULL)
+ {
+ g_free(l_layli_ptr);
+ }
return (l_rc);
@@ -1206,7 +1223,7 @@
- if(gap_debug) fprintf(stderr, "gap: p_frames_modify START, action_mode=%d sel_mode=%d case=%d, invert=%d patt:%s:\n",
+ if(gap_debug) printf("gap: p_frames_modify START, action_mode=%d sel_mode=%d case=%d, invert=%d patt:%s:\n",
(int)action_mode, (int)sel_mode, (int)sel_case, (int)sel_invert, sel_pattern);
l_operate_on_layermask = FALSE;
@@ -1263,7 +1280,7 @@
l_cur_frame_nr = l_begin;
while(1) /* loop foreach frame in range */
{
- if(gap_debug) fprintf(stderr, "p_frames_modify While l_cur_frame_nr = %d\n", (int)l_cur_frame_nr);
+ if(gap_debug) printf("p_frames_modify While l_cur_frame_nr = %d\n", (int)l_cur_frame_nr);
/* build the frame name */
if(ainfo_ptr->new_filename != NULL) g_free(ainfo_ptr->new_filename);
@@ -1398,7 +1415,7 @@
);
if(l_rc != 0)
{
- if(gap_debug) fprintf(stderr, "gap: p_frames_modify p_apply-action failed. rc=%d\n", (int)l_rc);
+ if(gap_debug) printf("gap: p_frames_modify p_apply-action failed. rc=%d\n", (int)l_rc);
goto error;
}
@@ -1429,7 +1446,7 @@
/* call plugin-specific iterator, to modify
* the plugin's last_values
*/
- if(gap_debug) fprintf(stderr, "DEBUG: calling iterator %s current frame:%d\n",
+ if(gap_debug) printf("DEBUG: calling iterator %s current frame:%d\n",
l_plugin_iterator, (int)l_cur_frame_nr);
if(strcmp(l_plugin_iterator, GIMP_PLUGIN_GAP_COMMON_ITER) == 0)
{
@@ -1454,7 +1471,7 @@
}
if (l_params[0].data.d_status != GIMP_PDB_SUCCESS)
{
- fprintf(stderr, "ERROR: iterator %s failed\n", l_plugin_iterator);
+ printf("ERROR: iterator %s failed\n", l_plugin_iterator);
l_rc = -1;
}
@@ -1462,6 +1479,12 @@
}
+ if(l_operating_on_current_image == FALSE)
+ {
+ /* destroy the tmp image */
+ gimp_image_delete(l_tmp_image_id);
+ }
+
/* close display (if open) */
if (l_dpy_id >= 0)
{
@@ -1469,11 +1492,6 @@
l_dpy_id = -1;
}
- if(l_operating_on_current_image == FALSE)
- {
- /* destroy the tmp image */
- gimp_image_delete(l_tmp_image_id);
- }
if(l_rc != 0)
goto error;
@@ -1522,22 +1540,22 @@
}
}
- if(gap_debug) fprintf(stderr, "p_frames_modify End OK\n");
+ if(gap_debug) printf("p_frames_modify End OK\n");
return 0;
error:
- if(gap_debug) fprintf(stderr, "gap: p_frames_modify exit with Error\n");
+ if(gap_debug) printf("gap: p_frames_modify exit with Error\n");
+ if((l_tmp_image_id >= 0) && (l_operating_on_current_image == FALSE))
+ {
+ gimp_image_delete(l_tmp_image_id);
+ }
if (l_dpy_id >= 0)
{
gimp_display_delete(l_dpy_id);
l_dpy_id = -1;
}
- if((l_tmp_image_id >= 0) && (l_operating_on_current_image == FALSE))
- {
- gimp_image_delete(l_tmp_image_id);
- }
if(l_layli_ptr != NULL) g_free(l_layli_ptr);
if(l_plugin_iterator != NULL) g_free(l_plugin_iterator);
return -1;
Modified: branches/gap-2-4/gap/gap_mod_layer.h
==============================================================================
--- branches/gap-2-4/gap/gap_mod_layer.h (original)
+++ branches/gap-2-4/gap/gap_mod_layer.h Mon Jan 14 19:33:53 2008
@@ -104,6 +104,8 @@
#define GAP_MOD_ACM_APPLY_FILTER_ON_LAYERMASK 57
#define GAP_MOD_ACM_SEL_ALPHA 58
+#define GAP_MOD_ACM_RESIZE_TO_IMG 59
+
typedef struct
{
gint32 layer_id;
Modified: branches/gap-2-4/gap/gap_mod_layer_dialog.c
==============================================================================
--- branches/gap-2-4/gap/gap_mod_layer_dialog.c (original)
+++ branches/gap-2-4/gap/gap_mod_layer_dialog.c Mon Jan 14 19:33:53 2008
@@ -814,6 +814,13 @@
,gmop
);
+ p_make_func_menu_item(_("Resize layer(s) to image size")
+ ,_("Resize selected layer(s) to image size")
+ ,GAP_MOD_ACM_RESIZE_TO_IMG
+ ,master_menu
+ ,gmop
+ );
+
p_make_func_menu_item(_("Add alpha channel")
,NULL
,GAP_MOD_ACM_ADD_ALPHA
Modified: branches/gap-2-4/gap/gap_morph_dialog.c
==============================================================================
--- branches/gap-2-4/gap/gap_morph_dialog.c (original)
+++ branches/gap-2-4/gap/gap_morph_dialog.c Mon Jan 14 19:33:53 2008
@@ -503,6 +503,10 @@
}
gimp_pixel_fetcher_destroy (src_pixfet);
gimp_pixel_fetcher_destroy (dst_pixfet);
+
+ gimp_drawable_detach(src_drawable);
+ gimp_drawable_detach(dst_drawable);
+
} /* end p_generate_outline_shape_workpoints */
@@ -514,31 +518,31 @@
p_add_4corner_workpoints(GapMorphGUIParams *mgup)
{
GapMorphWorkPoint *wp;
- GimpDrawable *dst_drawable;
- GimpDrawable *src_drawable;
+ gint32 dst_drawable_id;
+ gint32 src_drawable_id;
gdouble sx[4];
gdouble sy[4];
gdouble dx[4];
gdouble dy[4];
gint ii;
- src_drawable = gimp_drawable_get (mgup->mgpp->osrc_layer_id);
- dst_drawable = gimp_drawable_get (mgup->mgpp->fdst_layer_id);
+ src_drawable_id = mgup->mgpp->osrc_layer_id;
+ dst_drawable_id = mgup->mgpp->fdst_layer_id;
- sx[0] = src_drawable->width -1;
- sy[0] = src_drawable->height -1;
- dx[0] = dst_drawable->width -1;
- dy[0] = dst_drawable->height -1;
+ sx[0] = gimp_drawable_width(src_drawable_id) -1;
+ sy[0] = gimp_drawable_height(src_drawable_id) -1;
+ dx[0] = gimp_drawable_width(dst_drawable_id) -1;
+ dy[0] = gimp_drawable_height(dst_drawable_id) -1;
- sx[1] = src_drawable->width -1;
+ sx[1] = gimp_drawable_width(src_drawable_id) -1;
sy[1] = 0;
- dx[1] = dst_drawable->width -1;
+ dx[1] = gimp_drawable_width(dst_drawable_id) -1;
dy[1] = 0;
sx[2] = 0;
- sy[2] = src_drawable->height -1;
+ sy[2] = gimp_drawable_height(src_drawable_id) -1;
dx[2] = 0;
- dy[2] = dst_drawable->height -1;
+ dy[2] = gimp_drawable_height(dst_drawable_id) -1;
sx[3] = 0;
sy[3] = 0;
@@ -1888,6 +1892,10 @@
,height
);
g_free(buf_ptr);
+
+ gimp_drawable_detach(dst_drawable);
+ gimp_drawable_detach(src_drawable);
+
}
/* render the preview (this includes scaling to preview size) */
@@ -3040,7 +3048,7 @@
l_radio_pressed = (mgup->op_mode == GAP_MORPH_OP_MODE_SHOW);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), l_radio_pressed);
gimp_help_set_help_data(radio_button
- , _("Click: show warp pick koordinates in the source window")
+ , _("Click: show warp pick coordinates in the source window")
, NULL);
gtk_widget_show (radio_button);
@@ -3225,7 +3233,7 @@
0, 0);
gtk_widget_set_size_request (spinbutton, 60, -1);
- gimp_help_set_help_data (spinbutton, _("Morphpoint X koordinate"), NULL);
+ gimp_help_set_help_data (spinbutton, _("Morphpoint X coordinate"), NULL);
g_object_set_data( G_OBJECT(adj), "swp", swp);
g_signal_connect (G_OBJECT (adj), "value_changed"
, G_CALLBACK (on_koord_spinbutton_changed)
@@ -3257,7 +3265,7 @@
0, 0);
gtk_widget_set_size_request (spinbutton, 60, -1);
- gimp_help_set_help_data (spinbutton, _("Morphpoint Y koordinate"), NULL);
+ gimp_help_set_help_data (spinbutton, _("Morphpoint Y coordinate"), NULL);
g_object_set_data( G_OBJECT(adj), "swp", swp);
g_signal_connect (G_OBJECT (adj), "value_changed"
, G_CALLBACK (on_koord_spinbutton_changed)
@@ -3485,7 +3493,9 @@
mgup->src_win.layer_id_ptr = NULL;
mgup->dst_win.layer_id_ptr = NULL;
gimp_rgb_set(&mgup->pointcolor, 0.1, 1.0, 0.1); /* startup with GREEN pointcolor */
+ gimp_rgb_set_alpha(&mgup->pointcolor, 1.0);
gimp_rgb_set(&mgup->curr_pointcolor, 1.0, 1.0, 0.1); /* startup with YELLOW color */
+ gimp_rgb_set_alpha(&mgup->curr_pointcolor, 1.0);
mgup->old_src_layer_width = 0;
mgup->old_src_layer_height = 0;
mgup->old_dst_layer_width = 0;
@@ -3808,6 +3818,7 @@
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);
gtk_widget_show (color_button);
Modified: branches/gap-2-4/gap/gap_morph_exec.c
==============================================================================
--- branches/gap-2-4/gap/gap_morph_exec.c (original)
+++ branches/gap-2-4/gap/gap_morph_exec.c Mon Jan 14 19:33:53 2008
@@ -1970,6 +1970,8 @@
);
gimp_pixel_fetcher_destroy (src_pixfet);
+ gimp_drawable_detach(src_drawable);
+ gimp_drawable_detach(dst_drawable);
} /* end p_layer_warp_move */
/* ---------------------------------
@@ -2105,6 +2107,9 @@
, dst_drawable->height
);
+ gimp_drawable_detach(bg_drawable);
+ gimp_drawable_detach(top_drawable);
+ gimp_drawable_detach(dst_drawable);
return(dst_layer_id);
@@ -2380,6 +2385,7 @@
gap_morph_exec_free_workpoint_list(&curr_wp_list_1);
}
+ gimp_drawable_detach(dst_drawable);
if(mgpp->render_mode == GAP_MORPH_RENDER_MODE_WARP)
{
Modified: branches/gap-2-4/gap/gap_mov_dialog.c
==============================================================================
--- branches/gap-2-4/gap/gap_mov_dialog.c (original)
+++ branches/gap-2-4/gap/gap_mov_dialog.c Mon Jan 14 19:33:53 2008
@@ -315,8 +315,11 @@
static gint mov_path_prevw_preview_events ( GtkWidget *widget, GdkEvent *event );
static gint p_chk_keyframes(t_mov_gui_stuff *mgp);
-static gdouble mov_get_path_length (gint32 image_id);
-static void mov_grab_bezier_path(t_mov_gui_stuff *mgp);
+static void mov_grab_bezier_path(t_mov_gui_stuff *mgp
+ , gint32 vectors_id
+ , gint32 stroke_id
+ , const char *vectorname
+ );
static void mov_grab_anchorpoints_path(t_mov_gui_stuff *mgp
,gint num_path_point_details
,gdouble *points_details
@@ -1173,53 +1176,6 @@
}
-/* ------------------------
- * mov_get_path_length
- * ------------------------
- * get length of the path by checking
- * koords in steps of 1 pixel length.
- * at end the gimp_path_get_point_at_dist procedure
- * will return zero values for x,y and slope
- */
-
-static gdouble
-mov_get_path_length (gint32 image_id)
-{
- gint x_point;
- gint y_point;
- gdouble max_distance;
- gdouble distance;
- gdouble slope;
-
- if(gap_debug) printf("mov_get_path_length\n");
-
- max_distance = 0.0;
- for(distance = 0.0; distance < 90000; distance += 1)
- {
- x_point = gimp_path_get_point_at_dist (image_id
- , distance
- , &y_point
- , &slope
- );
-
- if((x_point == 0)
- && (y_point == 0)
- && (slope == 0.0))
- {
- break;
- }
- max_distance = distance;
- }
-
- if(gap_debug)
- {
- printf("mov_get_path_length max_distance: %f\n", (float)max_distance);
- }
-
- return(max_distance);
-
-} /* end mov_get_path_length */
-
/* --------------------------
* mov_grab_bezier_path
@@ -1231,20 +1187,17 @@
* (but constrain to the maximum allowed number of contolpoints)
*/
static void
-mov_grab_bezier_path(t_mov_gui_stuff *mgp)
+mov_grab_bezier_path(t_mov_gui_stuff *mgp, gint32 vectors_id, gint32 stroke_id, const char *vectorname)
{
gint32 image_id;
- gint x_point;
- gint y_point;
gint num_lines;
gint num_points;
gdouble max_distance;
gdouble distance;
- gdouble slope;
gdouble step_length;
+ gdouble precision;
gint l_ii;
-
image_id = mgp->ainfo_ptr->image_id;
step_length = 1.0;
@@ -1252,35 +1205,62 @@
num_points = MIN((GAP_MOV_MAX_POINT-2), num_points);
num_lines = num_points -1;
+ distance = 0.0;
+ precision = 1.0; /* shall give 1 pixel precision */
+
if(num_lines > 0)
{
- max_distance = mov_get_path_length(image_id);
+ max_distance = gimp_vectors_stroke_get_length(vectors_id, stroke_id, precision);
step_length = max_distance / ((gdouble)num_lines);
}
- distance = 0.0;
for(l_ii=0; l_ii < num_points ; l_ii++)
{
- x_point = gimp_path_get_point_at_dist (image_id
- , distance
- , &y_point
- , &slope
- );
+ gdouble xdouble;
+ gdouble ydouble;
+ gdouble slope;
+ gboolean valid;
+ gboolean success;
+
+
+ success = gimp_vectors_stroke_get_point_at_dist(vectors_id
+ , stroke_id
+ , distance
+ , precision
+ , &xdouble
+ , &ydouble
+ , &slope
+ , &valid
+ );
+
+
+ p_clear_one_point(l_ii);
+ pvals->point[l_ii].p_x = rint(xdouble);
+ pvals->point[l_ii].p_y = rint(ydouble);
+
if(gap_debug)
{
- printf("PATH distance: %.3f, X:%03d Y: %03d slope:%.3f\n"
+ printf("PATH distance: %.3f, (%.4f / %.4f) X:%03d Y: %03d slope:%.3f valid:%d success:%d\n"
, (float)distance
- , (int)x_point
- , (int)y_point
+ , (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))
+ {
+ /* stop because we already reached the end of the path.
+ * (distance in pixles is greater than number of the frames to handle)
+ */
+ return;
+ }
pvals->point_idx_max = l_ii;
- p_clear_one_point(l_ii);
- pvals->point[l_ii].p_x = x_point;
- pvals->point[l_ii].p_y = y_point;
distance += step_length;
}
@@ -1308,7 +1288,12 @@
gint l_idx;
gint point_x;
gint point_y;
- gint point_type;
+#define GAP_BEZIER_CTRL1_X_INDEX 0
+#define GAP_BEZIER_CTRL1_Y_INDEX 1
+#define GAP_BEZIER_ANCHOR_X_INDEX 2
+#define GAP_BEZIER_ANCHOR_Y_INDEX 3
+#define GAP_BEZIER_CTRL2_X_INDEX 4
+#define GAP_BEZIER_CTRL12Y_INDEX 5
point_x = 0;
point_y = 0;
@@ -1326,17 +1311,24 @@
);
}
- point_type = -44; /* private marker for the last point that usually is delivered without type detail */
+ /* this implemenatation just fetches the bezier ancor points
+ * and ignores bezier control points
+ * Each Bezier segment endpoint (anchor, A) has two
+ * additional control points (C) associated. They are specified in the
+ * order CACCACCAC...
+ * where each point consists of 2 flaot values in order x y.
+ *
+ */
switch (l_ti)
{
- case 0: point_x = (gint)points_details[l_ii]; break;
- case 1: point_y = (gint)points_details[l_ii]; break;
- case 2: point_type = (gint)points_details[l_ii]; 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++;
l_ii++;
- if((l_ti > 2) || (l_ii == num_path_point_details))
+ if((l_ti >= 6) || (l_ii == num_path_point_details))
{
if(gap_debug)
{
@@ -1345,29 +1337,19 @@
l_ti=0;
- /* this implemenatation just fetches the BEZIER_ANCHOR points
- * and ignores BEZIER_CONTROL (type 2 points)
- * and ignores BEZIER_MOVE (type 3 points)
- */
-
- if((point_type == 1) /* 1 == BEZIER_ANCHOR */
- || (point_type == -44))
+ if(gap_debug)
{
- if(gap_debug)
- {
- printf("x:%d y:%d: type:%d\n\n"
- ,(int)point_x
- ,(int)point_y
- ,(int)point_type
- );
- }
-
- 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++;
+ 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[l_idx].p_x = point_x;
+ pvals->point[l_idx].p_y = point_y;
+ l_idx++;
}
if (l_ii >= num_path_point_details)
{
@@ -1392,56 +1374,105 @@
{
t_mov_gui_stuff *mgp = data;
gint32 image_id;
- gchar *pathname;
+ gint32 vectors_id;
if(gap_debug) printf("mov_pgrab_callback\n");
/* get the image where MovePath was invoked from */
image_id = mgp->ainfo_ptr->image_id;
- pathname = gimp_path_get_current(image_id);
- if(pathname)
+ vectors_id = gimp_image_get_active_vectors(image_id);
+ if(vectors_id >= 0)
{
- gint pathtype;
- gint path_closed;
+ GimpVectorsStrokeType pathtype;
+ gboolean path_closed;
gint num_path_point_details;
gdouble *points_details;
+ gchar *vectorname;
+ gint num_stroke_ids;
+ gint *stroke_ids;
+
+ vectorname = gimp_vectors_get_name(vectors_id);
+
points_details = NULL;
- path_closed = -44;
+ num_path_point_details = 0;
if(gap_debug)
{
- printf("pathname :%s\n", pathname);
+ printf("vectorname :%s\n", vectorname);
+ }
+
+ stroke_ids = gimp_vectors_get_strokes(vectors_id, &num_stroke_ids);
+
+ if(gap_debug)
+ {
+ printf("num_stroke_ids:%d\n"
+ , (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
+ );
+ return;
}
- pathtype = gimp_path_get_points(image_id
- ,pathname
- ,&path_closed
- ,&num_path_point_details
- ,&points_details
- );
+
+ /* TODO how to handle path that has more than one stroke_id.
+ * the current implementation uses only the 1.st stroke_id
+ */
+
+
+ pathtype = gimp_vectors_stroke_get_points(vectors_id
+ , stroke_ids[0]
+ , &num_path_point_details
+ , &points_details
+ , &path_closed
+ );
+
+
+
if(gap_debug)
{
- printf("pathtype:%d path_closed flag :%d\n"
+ 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
);
}
- if((pathtype != 1) || (path_closed == -44))
+ 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
- ,pathname
+ ,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
+ );
+ return;
+ }
if(bevent->state & GDK_SHIFT_MASK)
@@ -1450,7 +1481,7 @@
* the path will be divided in n-parts to get
* one controlpoint per handled frame.
*/
- mov_grab_bezier_path(mgp);
+ mov_grab_bezier_path(mgp, vectors_id, stroke_ids[0], vectorname);
}
else
{
@@ -1461,6 +1492,7 @@
}
+ g_free(stroke_ids);
g_free(points_details);
pvals->point_idx = 0;
@@ -4183,6 +4215,7 @@
GtkWidget *color_button;
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,
Modified: branches/gap-2-4/gap/gap_navigator_dialog.c
==============================================================================
--- branches/gap-2-4/gap/gap_navigator_dialog.c (original)
+++ branches/gap-2-4/gap/gap_navigator_dialog.c Mon Jan 14 19:33:53 2008
@@ -133,6 +133,8 @@
#define NAVI_CHECK_SIZE 4
#define MAX_DYN_ROWS 400
+#define KEY_NAVI_DIALOG_TO_FRONT "plug_in_gap_navigator_to_front"
+
/*
* OpsButton code was inspired by gimp-1.2 core code,
* but was changed for gap_navigator_dialog use and ported to gtk+2.2
@@ -319,6 +321,9 @@
* procedure declarations
* -----------------------
*/
+static void p_set_data_to_front_request(gboolean dialog_to_front_request);
+static void p_check_dialog_to_front_request(void);
+
int gap_navigator(gint32 image_id);
static void navi_preview_extents (void);
static void frames_dialog_flush (void);
@@ -588,6 +593,7 @@
if(gap_debug) printf("\n\ngap_navigator: debug name = %s\n", name);
l_active_image = param[1].data.d_image;
+ p_set_data_to_front_request(TRUE);
/* check for other Video navigator Dialog Process */
if (sizeof(pid_t) == gimp_get_data_size(PLUGIN_NAME))
@@ -709,6 +715,55 @@
navi_vid_copy_and_cut(TRUE /* cut_flag */);
}
+/* ---------------------------------
+ * p_set_data_to_front_request
+ * ---------------------------------
+ */
+static void
+p_set_data_to_front_request(gboolean dialog_to_front_request)
+{
+ gimp_set_data(KEY_NAVI_DIALOG_TO_FRONT, &dialog_to_front_request, sizeof (gboolean));
+} /* end p_set_data_to_front_request */
+
+/* ---------------------------------
+ * p_check_dialog_to_front_request
+ * ---------------------------------
+ * check for request to present the (already open) naviagtor dialog
+ * window (in front of screen)
+ * typically used on attempt to start a 2nd instance (which is not allowed)
+ */
+static void
+p_check_dialog_to_front_request(void)
+{
+ gint data_size;
+ if (naviD == NULL)
+ {
+ return;
+ }
+ if (naviD->shell == NULL)
+ {
+ return;
+ }
+ if (GTK_WIDGET(naviD->shell)->window == NULL)
+ {
+ return;
+ }
+
+ data_size = gimp_get_data_size(KEY_NAVI_DIALOG_TO_FRONT);
+ if (data_size == sizeof (gboolean))
+ {
+ gboolean dialog_to_front_request;
+
+ gimp_get_data(KEY_NAVI_DIALOG_TO_FRONT, &dialog_to_front_request);
+ if(dialog_to_front_request == TRUE)
+ {
+ gtk_window_present(GTK_WINDOW(naviD->shell));
+ p_set_data_to_front_request(FALSE);
+ }
+ }
+
+} /* end p_check_dialog_to_front_request */
+
/* ---------------------------------
* p_edit_paste_call
@@ -726,10 +781,13 @@
return; /* invalid frame_nr do not paste here */
}
- if(gap_debug) printf("p_edit_paste_call: paste_at_frame:%d active_image_id:%d\n"
- , (int)naviD->paste_at_frame
- , (int)naviD->active_imageid
- );
+ if(gap_debug)
+ {
+ printf("p_edit_paste_call: paste_at_frame:%d active_image_id:%d\n"
+ , (int)naviD->paste_at_frame
+ , (int)naviD->active_imageid
+ );
+ }
/* goto the first selected frame */
dummy_layer_id = gap_image_get_any_layer(naviD->active_imageid);
@@ -1104,8 +1162,23 @@
{
GapAnimInfo *old_ainfo_ptr;
char frame_nr_to_char[20];
-
- if(gap_debug) printf("navi_reload_ainfo_force image_id:%d\n", (int)image_id);
+ gboolean is_alive;
+
+ is_alive = gap_image_is_alive(image_id);
+
+ if(gap_debug)
+ {
+ printf("navi_reload_ainfo_force image_id:%d is_alive:%d\n"
+ , (int)image_id
+ , (int)is_alive
+ );
+ }
+
+ if (is_alive != TRUE)
+ {
+ return;
+ }
+
old_ainfo_ptr = naviD->ainfo_ptr;
naviD->active_imageid = image_id;
naviD->ainfo_ptr = navi_get_ainfo(image_id, old_ainfo_ptr);
@@ -1179,8 +1252,15 @@
{
if(naviD->vin_ptr) g_free(naviD->vin_ptr);
naviD->vin_ptr = gap_vin_get_all(naviD->ainfo_ptr->basename);
- gtk_adjustment_set_value(GTK_ADJUSTMENT(naviD->framerate_adj), (gfloat)naviD->vin_ptr->framerate);
- gtk_adjustment_set_value(GTK_ADJUSTMENT(naviD->timezoom_adj), (gfloat)naviD->vin_ptr->timezoom);
+
+ if(naviD->framerate_adj != NULL)
+ {
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(naviD->framerate_adj), (gfloat)naviD->vin_ptr->framerate);
+ }
+ if(naviD->timezoom_adj != NULL)
+ {
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(naviD->timezoom_adj), (gfloat)naviD->vin_ptr->timezoom);
+ }
p_set_acl_tracking_radio_buttons(naviD);
}
} /* end navi_reload_ainfo */
@@ -1252,6 +1332,7 @@
navi_set_waiting_cursor(void)
{
if(naviD == NULL) return;
+ if(GTK_WIDGET(naviD->shell)->window == NULL) return;
naviD->waiting_cursor = TRUE;
gdk_window_set_cursor(GTK_WIDGET(naviD->shell)->window, naviD->cursor_wait);
@@ -1271,6 +1352,7 @@
navi_set_active_cursor(void)
{
if(naviD == NULL) return;
+ if(GTK_WIDGET(naviD->shell)->window == NULL) return;
naviD->waiting_cursor = FALSE;
gdk_window_set_cursor(GTK_WIDGET(naviD->shell)->window, naviD->cursor_acitve);
@@ -1371,35 +1453,10 @@
static void
navi_dialog_tooltips(void)
{
- char *value_string;
- gint tooltip_on;
-
- if(naviD == NULL) return;
-
- tooltip_on = TRUE;
- value_string = gimp_gimprc_query("show-tool-tips");
-
- if(value_string != NULL)
- {
- if (strcmp(value_string, "no") == 0)
- {
- tooltip_on = FALSE;
- }
- }
+ if(naviD == NULL) { return; }
- if(naviD->tooltip_on != tooltip_on)
- {
- naviD->tooltip_on = tooltip_on;
+ naviD->tooltip_on = gap_lib_check_tooltips(&naviD->tooltip_on);
- if(tooltip_on)
- {
- gimp_help_enable_tooltips ();
- }
- else
- {
- gimp_help_disable_tooltips ();
- }
- }
} /* end navi_dialog_tooltips */
@@ -2416,12 +2473,15 @@
if(gap_debug) printf("navi_render_preview START\n");
+
+
l_th_data = NULL;
l_th_bpp = 3; /* l_th_bpp always 3 for thumbnail_file data, but can be 4 for the actual image */
if(naviD == NULL) { return; }
if(fw == NULL) { return; }
if(fw->pv_ptr == NULL) { return; }
if(naviD->ainfo_ptr == NULL) { return; }
+ if(!gap_image_is_alive(naviD->active_imageid)) {return; }
if((fw->pv_ptr->pv_width != naviD->image_width)
|| (fw->pv_ptr->pv_height != naviD->image_height))
@@ -2754,9 +2814,28 @@
/* check and enable/disable tooltips */
navi_dialog_tooltips ();
- frame_nr = gap_lib_get_frame_nr(naviD->active_imageid);
+ /* check request to present dialog window */
+ p_check_dialog_to_front_request();
+
+ /* check if active image is still valid and is a frame image */
+ if(gap_image_is_alive(naviD->active_imageid))
+ {
+ frame_nr = gap_lib_get_frame_nr(naviD->active_imageid);
+ }
+ else
+ {
+ frame_nr = -1;
+ }
+
if(frame_nr < 0 )
{
+ if(gap_debug)
+ {
+ printf("TIMER POLL active_imageid:%d is now invalid\n"
+ ,(int)naviD->active_imageid
+ );
+ }
+
/* no valid frame number, maybe frame was closed
*/
naviD->active_imageid = -1;
@@ -2855,7 +2934,14 @@
{
gint32 width, height;
if (!naviD)
+ {
return;
+ }
+
+ if (!gap_image_is_alive(naviD->active_imageid))
+ {
+ return;
+ }
naviD->gimage_width = gimp_image_width(naviD->active_imageid);
naviD->gimage_height = gimp_image_height(naviD->active_imageid);
@@ -4004,6 +4090,8 @@
/* init the global naviD structure */
naviD->del_button = NULL;
naviD->dup_button = NULL;
+ naviD->framerate_adj = NULL;
+ naviD->timezoom_adj = NULL;
naviD->acl_trace_off_toggle = NULL;
naviD->acl_trace_by_name_toggle = NULL;
naviD->acl_trace_by_pos_toggle = NULL;
Modified: branches/gap-2-4/gap/gap_pdb_calls.c
==============================================================================
--- branches/gap-2-4/gap/gap_pdb_calls.c (original)
+++ branches/gap-2-4/gap/gap_pdb_calls.c Mon Jan 14 19:33:53 2008
@@ -52,13 +52,37 @@
extern int gap_debug;
/* ============================================================================
+ * p_status_to_string
+ * ============================================================================
+ */
+const char *
+p_status_to_string(int status)
+{
+ switch (status)
+ {
+ case GIMP_PDB_EXECUTION_ERROR:
+ return ("GIMP_PDB_EXECUTION_ERROR");
+ case GIMP_PDB_CALLING_ERROR:
+ return ("GIMP_PDB_CALLING_ERROR");
+ case GIMP_PDB_PASS_THROUGH:
+ return ("GIMP_PDB_PASS_THROUGH");
+ case GIMP_PDB_SUCCESS:
+ return ("GIMP_PDB_SUCCESS");
+ case GIMP_PDB_CANCEL:
+ return ("GIMP_PDB_CANCEL");
+ default:
+ return ("* unknown *");
+ }
+} /* end p_status_to_string */
+
+
+/* ============================================================================
* gap_pdb_procedure_available
* if requested procedure is available in the PDB return the number of args
* (0 upto n) that are needed to call the procedure.
* if not available return -1
* ============================================================================
*/
-
gint
gap_pdb_procedure_available(char *proc_name)
{
@@ -158,7 +182,11 @@
return (TRUE); /* OK */
}
gimp_destroy_params(return_vals, nreturn_vals);
- printf("GAP: Error: PDB call of %s failed\n", l_called_proc);
+ printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
+ , l_called_proc
+ , (int)return_vals[0].data.d_status
+ , p_status_to_string(return_vals[0].data.d_status)
+ );
return(FALSE);
} /* end gap_pdb_gimp_displays_reconnect */
@@ -192,7 +220,11 @@
return(layer_id); /* return the resulting layer_id */
}
gimp_destroy_params(return_vals, nreturn_vals);
- printf("GAP: Error: PDB call of %s failed\n", l_called_proc);
+ printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
+ , l_called_proc
+ , (int)return_vals[0].data.d_status
+ , p_status_to_string(return_vals[0].data.d_status)
+ );
return(-1);
} /* end gap_pdb_gimp_layer_new_from_drawable */
@@ -225,10 +257,12 @@
}
gimp_destroy_params(return_vals, nreturn_vals);
- printf("GAP: Error: PDB call of %s failed on file: %s (image_id:%d)\n"
+ 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
+ , (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 */
@@ -313,6 +347,10 @@
return(TRUE); /* OK */
}
gimp_destroy_params(return_vals, nreturn_vals);
- printf("GAP: Error: PDB call of %s failed\n", l_called_proc);
+ printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n"
+ , l_called_proc
+ , (int)return_vals[0].data.d_status
+ , p_status_to_string(return_vals[0].data.d_status)
+ );
return(FALSE);
} /* end gap_pdb_gimp_image_thumbnail */
Modified: branches/gap-2-4/gap/gap_player_dialog.c
==============================================================================
--- branches/gap-2-4/gap/gap_player_dialog.c (original)
+++ branches/gap-2-4/gap/gap_player_dialog.c Mon Jan 14 19:33:53 2008
@@ -320,29 +320,11 @@
static void
p_check_tooltips(void)
{
- char *value_string;
-
- value_string = gimp_gimprc_query("show-tool-tips");
-
- if(value_string != NULL)
- {
- if (strcmp(value_string, "no") == 0)
- {
- gimp_help_disable_tooltips ();
- }
- else
- {
- gimp_help_enable_tooltips ();
- }
- }
- else
- {
- gimp_help_enable_tooltips ();
- }
-
+ gap_lib_check_tooltips(NULL);
} /* end p_check_tooltips */
+
/* -----------------------------
* p_audio_errfunc
* -----------------------------
Modified: branches/gap-2-4/gap/gap_split.c
==============================================================================
--- branches/gap-2-4/gap/gap_split.c (original)
+++ branches/gap-2-4/gap/gap_split.c Mon Jan 14 19:33:53 2008
@@ -126,6 +126,7 @@
{
/* destroy the tmp image (it was saved to disk before) */
gimp_image_delete(l_new_image_id);
+ l_new_image_id = -1;
}
if(invers == TRUE) l_layer_idx = l_idx;
@@ -191,6 +192,7 @@
* (regardless if image was flattened or not)
*/
l_rc = gap_lib_save_named_image(l_new_image_id, l_sav_name, l_run_mode);
+
if(l_rc < 0)
{
gap_arr_msg_win(ainfo_ptr->run_mode, _("Split Frames: Save operation failed.\n"
@@ -210,9 +212,6 @@
g_free(l_sav_name);
}
- /* save as frame */
-
-
/* show progress bar */
if(ainfo_ptr->run_mode == GIMP_RUN_INTERACTIVE)
{
Modified: branches/gap-2-4/gap/gap_wr_color_curve.c
==============================================================================
--- branches/gap-2-4/gap/gap_wr_color_curve.c (original)
+++ branches/gap-2-4/gap/gap_wr_color_curve.c Mon Jan 14 19:33:53 2008
@@ -65,15 +65,15 @@
/* Defines */
-#define PLUG_IN_NAME "plug_in_wr_curves"
+#define PLUG_IN_NAME "plug-in-wr-curves"
#define PLUG_IN_IMAGE_TYPES "RGB*, GRAY*"
#define PLUG_IN_AUTHOR "Wolfgang Hofer (hof gimp org)"
#define PLUG_IN_COPYRIGHT "Wolfgang Hofer"
#define PLUG_IN_DESCRIPTION "Wrapper for GIMP Curves Tool call based on Curves file"
-#define PLUG_IN_ITER_NAME "plug_in_wr_curves_Iterator"
-#define PLUG_IN_DATA_ITER_FROM "plug_in_wr_curves_ITER_FROM"
-#define PLUG_IN_DATA_ITER_TO "plug_in_wr_curves_ITER_TO"
+#define PLUG_IN_ITER_NAME "plug-in-wr-curves-Iterator"
+#define PLUG_IN_DATA_ITER_FROM "plug-in-wr-curves-ITER-FROM"
+#define PLUG_IN_DATA_ITER_TO "plug-in-wr-curves-ITER-TO"
#define PLUG_IN_HELP_ID "plug-in-wr-curves"
Modified: branches/gap-2-4/gap/gap_wr_color_huesat.c
==============================================================================
--- branches/gap-2-4/gap/gap_wr_color_huesat.c (original)
+++ branches/gap-2-4/gap/gap_wr_color_huesat.c Mon Jan 14 19:33:53 2008
@@ -1,4 +1,4 @@
-/* wr_color_hue_saturation.c
+/* gap_wr_color_hue_saturation.c
* 2002.Jan.01 hof (Wolfgang Hofer)
*
* Wrapper Plugin for GIMP Hue Saturation tool
@@ -54,15 +54,15 @@
#include "gap-intl.h"
/* Defines */
-#define PLUG_IN_NAME "plug_in_wr_huesat"
+#define PLUG_IN_NAME "plug-in-wr-huesat"
#define PLUG_IN_IMAGE_TYPES "RGB*, GRAY*"
#define PLUG_IN_AUTHOR "Wolfgang Hofer (hof gimp org)"
#define PLUG_IN_COPYRIGHT "Wolfgang Hofer"
#define PLUG_IN_DESCRIPTION "Wrapper call for GIMP Hue Saturation Color Tool"
-#define PLUG_IN_ITER_NAME "plug_in_wr_huesat_Iterator"
-#define PLUG_IN_DATA_ITER_FROM "plug_in_wr_huesat_ITER_FROM"
-#define PLUG_IN_DATA_ITER_TO "plug_in_wr_huesat_ITER_TO"
+#define PLUG_IN_ITER_NAME "plug-in-wr-huesat-Iterator"
+#define PLUG_IN_DATA_ITER_FROM "plug-in-wr-huesat-ITER-FROM"
+#define PLUG_IN_DATA_ITER_TO "plug-in-wr-huesat-ITER-TO"
#define PLUG_IN_HELP_ID "plug-in-wr-huesat"
Modified: branches/gap-2-4/gap/gap_wr_color_levels.c
==============================================================================
--- branches/gap-2-4/gap/gap_wr_color_levels.c (original)
+++ branches/gap-2-4/gap/gap_wr_color_levels.c Mon Jan 14 19:33:53 2008
@@ -1,4 +1,4 @@
-/* wr_color_levels.c
+/* gap_wr_color_levels.c
* 2002.Oct.27 hof (Wolfgang Hofer)
*
* Wrapper Plugin for GIMP Color Levels tool
@@ -53,15 +53,15 @@
#include "gap-intl.h"
/* Defines */
-#define PLUG_IN_NAME "plug_in_wr_color_levels"
+#define PLUG_IN_NAME "plug-in-wr-color-levels"
#define PLUG_IN_IMAGE_TYPES "RGB*, GRAY*"
#define PLUG_IN_AUTHOR "Wolfgang Hofer (hof gimp org)"
#define PLUG_IN_COPYRIGHT "Wolfgang Hofer"
#define PLUG_IN_DESCRIPTION "Wrapper call for GIMP Levels Color Tool"
-#define PLUG_IN_ITER_NAME "plug_in_wr_color_levels_Iterator"
-#define PLUG_IN_DATA_ITER_FROM "plug_in_wr_color_levels_ITER_FROM"
-#define PLUG_IN_DATA_ITER_TO "plug_in_wr_color_levels_ITER_TO"
+#define PLUG_IN_ITER_NAME "plug-in-wr-color-levels-Iterator"
+#define PLUG_IN_DATA_ITER_FROM "plug-in-wr-color-levels-ITER-FROM"
+#define PLUG_IN_DATA_ITER_TO "plug-in-wr-color-levels-ITER-TO"
#define PLUG_IN_HELP_ID "plug-in-wr-color-levels"
Modified: branches/gap-2-4/gap/gimplastvaldesc.h
==============================================================================
--- branches/gap-2-4/gap/gimplastvaldesc.h (original)
+++ branches/gap-2-4/gap/gimplastvaldesc.h Mon Jan 14 19:33:53 2008
@@ -151,7 +151,7 @@
#define GIMP_DDESC_END "END"
-#define GIMP_PLUGIN_GAP_COMMON_ITER "plug_in_gap_COMMON_ITERATOR"
+#define GIMP_PLUGIN_GAP_COMMON_ITER "plug-in-gap-COMMON-ITERATOR"
#define GIMP_ITER_TRUE 1
#define GIMP_ITER_FALSE 0
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_CML_explorer_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_CML_explorer_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_CML_explorer_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -26,8 +26,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_cml_explorer_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_cml_explorer_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-cml-explorer-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-cml-explorer-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_cml_explorer_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_cml_explorer_Vals *)&g_plugin_data_to[0];
@@ -42,7 +42,7 @@
p_delta_gint(&buf.start_offset, buf_from->start_offset, buf_to->start_offset, total_steps, current_step);
p_delta_gint(&buf.seed, buf_from->seed, buf_to->seed, total_steps, current_step);
- gimp_set_data("plug_in_cml_explorer", &buf, sizeof(buf));
+ gimp_set_data("plug-in-cml-explorer", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_alpha2color_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_alpha2color_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-alpha2color-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-alpha2color-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_alpha2color_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_alpha2color_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_color(&buf.Color, &buf_from->Color, &buf_to->Color, total_steps, current_step);
- gimp_set_data("plug_in_alpha2color", &buf, sizeof(buf));
+ gimp_set_data("plug-in-alpha2color", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_blinds_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_blinds_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_blinds_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -10,7 +10,6 @@
gint numsegs;
gint orientation;
gboolean bg_trans;
- gboolean preview;
} t_plug_in_blinds_Vals;
t_plug_in_blinds_Vals buf, *buf_from, *buf_to;
@@ -22,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_blinds_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_blinds_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-blinds-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-blinds-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_blinds_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_blinds_Vals *)&g_plugin_data_to[0];
@@ -33,7 +32,7 @@
p_delta_gint(&buf.numsegs, buf_from->numsegs, buf_to->numsegs, total_steps, current_step);
p_delta_gint(&buf.orientation, buf_from->orientation, buf_to->orientation, total_steps, current_step);
- gimp_set_data("plug_in_blinds", &buf, sizeof(buf));
+ gimp_set_data("plug-in-blinds", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_borderaverage_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_borderaverage_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-borderaverage-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-borderaverage-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_borderaverage_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_borderaverage_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_long(&buf.thickness, buf_from->thickness, buf_to->thickness, total_steps, current_step);
p_delta_long(&buf.bucket_exponent, buf_from->bucket_exponent, buf_to->bucket_exponent, total_steps, current_step);
- gimp_set_data("plug_in_borderaverage", &buf, sizeof(buf));
+ gimp_set_data("plug-in-borderaverage", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_checkerboard_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_checkerboard_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-checkerboard-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-checkerboard-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_checkerboard_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_checkerboard_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_long(&buf.check_mode, buf_from->check_mode, buf_to->check_mode, total_steps, current_step);
p_delta_long(&buf.check_size, buf_from->check_size, buf_to->check_size, total_steps, current_step);
- gimp_set_data("plug_in_checkerboard", &buf, sizeof(buf));
+ gimp_set_data("plug-in-checkerboard", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_color_map_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_color_map_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_color_map_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_color_map_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_color_map_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-color-map-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-color-map-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_color_map_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_color_map_Vals *)&g_plugin_data_to[0];
@@ -37,7 +37,7 @@
buf.preview = FALSE;
- gimp_set_data("plug_in_color_map", &buf, sizeof(buf));
+ gimp_set_data("plug-in-color-map", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_colorify_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_colorify_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_colorify_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -7,7 +7,6 @@
typedef struct t_plug_in_colorify_Vals
{
GimpRGB color;
- gboolean preview;
} t_plug_in_colorify_Vals;
t_plug_in_colorify_Vals buf, *buf_from, *buf_to;
@@ -19,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_colorify_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_colorify_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-colorify-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-colorify-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_colorify_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_colorify_Vals *)&g_plugin_data_to[0];
@@ -28,9 +27,7 @@
p_delta_GimpRGB(&buf.color, &buf_from->color, &buf_to->color, total_steps, current_step);
- buf.preview = FALSE;
-
- gimp_set_data("plug_in_colorify", &buf, sizeof(buf));
+ gimp_set_data("plug-in-colorify", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_cubism_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_cubism_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_cubism_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,7 @@
{
gdouble tile_size;
gdouble tile_saturation;
- long bg_color;
+ gint bg_color;
gboolean preview;
} t_plug_in_cubism_Vals;
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_cubism_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_cubism_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-cubism-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-cubism-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_cubism_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_cubism_Vals *)&g_plugin_data_to[0];
@@ -30,10 +30,10 @@
p_delta_gdouble(&buf.tile_size, buf_from->tile_size, buf_to->tile_size, total_steps, current_step);
p_delta_gdouble(&buf.tile_saturation, buf_from->tile_saturation, buf_to->tile_saturation, total_steps, current_step);
- p_delta_long(&buf.bg_color, buf_from->bg_color, buf_to->bg_color, total_steps, current_step);
+ p_delta_gint(&buf.bg_color, buf_from->bg_color, buf_to->bg_color, total_steps, current_step);
buf.preview = FALSE;
- gimp_set_data("plug_in_cubism", &buf, sizeof(buf));
+ gimp_set_data("plug-in-cubism", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_destripe_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_destripe_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_destripe_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_destripe_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_destripe_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-destripe-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-destripe-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_destripe_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_destripe_Vals *)&g_plugin_data_to[0];
@@ -30,7 +30,7 @@
p_delta_gint(&buf.avg_width, buf_from->avg_width, buf_to->avg_width, total_steps, current_step);
buf.preview = FALSE;
- gimp_set_data("plug_in_destripe", &buf, sizeof(buf));
+ gimp_set_data("plug-in-destripe", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_diffraction_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_diffraction_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_diffraction_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_diffraction_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_diffraction_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-diffraction-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-diffraction-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_diffraction_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_diffraction_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_gdouble(&buf.scattering, buf_from->scattering, buf_to->scattering, total_steps, current_step);
p_delta_gdouble(&buf.polarization, buf_from->polarization, buf_to->polarization, total_steps, current_step);
- gimp_set_data("plug_in_diffraction", &buf, sizeof(buf));
+ gimp_set_data("plug-in-diffraction", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_displace_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_displace_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_displace_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -4,16 +4,23 @@
*/
gint p_plug_in_displace_iter_ALT(GimpRunMode run_mode, gint32 total_steps, gdouble current_step, gint32 len_struct)
{
+ typedef enum
+ {
+ CARTESIAN_MODE = 0,
+ POLAR_MODE = 1
+ } t_DisplaceMode;
+
typedef struct t_plug_in_displace_Vals
{
- gdouble amount_x;
- gdouble amount_y;
- long do_x;
- long do_y;
- gint32 displace_map_x;
- gint32 displace_map_y;
- long displace_type;
- gboolean preview;
+ gdouble amount_x;
+ gdouble amount_y;
+ gint do_x;
+ gint do_y;
+ gint displace_map_x;
+ gint displace_map_y;
+ gint displace_type;
+ t_DisplaceMode mode;
+
} t_plug_in_displace_Vals;
t_plug_in_displace_Vals buf, *buf_from, *buf_to;
@@ -25,8 +32,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_displace_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_displace_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-displace-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-displace-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_displace_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_displace_Vals *)&g_plugin_data_to[0];
@@ -34,14 +41,13 @@
p_delta_gdouble(&buf.amount_x, buf_from->amount_x, buf_to->amount_x, total_steps, current_step);
p_delta_gdouble(&buf.amount_y, buf_from->amount_y, buf_to->amount_y, total_steps, current_step);
- p_delta_long(&buf.do_x, buf_from->do_x, buf_to->do_x, total_steps, current_step);
- p_delta_long(&buf.do_y, buf_from->do_y, buf_to->do_y, total_steps, current_step);
- p_delta_drawable(&buf.displace_map_x, buf_from->displace_map_x, buf_to->displace_map_x, total_steps, current_step);
- p_delta_drawable(&buf.displace_map_y, buf_from->displace_map_y, buf_to->displace_map_y, total_steps, current_step);
- p_delta_long(&buf.displace_type, buf_from->displace_type, buf_to->displace_type, total_steps, current_step);
+ p_delta_gint(&buf.do_x, buf_from->do_x, buf_to->do_x, total_steps, current_step);
+ p_delta_gint(&buf.do_y, buf_from->do_y, buf_to->do_y, total_steps, current_step);
+ p_delta_gintdrawable(&buf.displace_map_x, buf_from->displace_map_x, buf_to->displace_map_x, total_steps, current_step);
+ p_delta_gintdrawable(&buf.displace_map_y, buf_from->displace_map_y, buf_to->displace_map_y, total_steps, current_step);
+ p_delta_gint(&buf.displace_type, buf_from->displace_type, buf_to->displace_type, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_displace", &buf, sizeof(buf));
+ gimp_set_data("plug-in-displace", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_edge_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_edge_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_edge_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gdouble amount;
gint edgemode;
gint wrapmode;
- gboolean update_preview;
} t_plug_in_edge_Vals;
t_plug_in_edge_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_edge_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_edge_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-edge-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-edge-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_edge_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_edge_Vals *)&g_plugin_data_to[0];
@@ -32,8 +31,7 @@
p_delta_gint(&buf.wrapmode, buf_from->wrapmode, buf_to->wrapmode, total_steps, current_step);
p_delta_gint(&buf.edgemode, buf_from->edgemode, buf_to->edgemode, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_edge", &buf, sizeof(buf));
+ gimp_set_data("plug-in-edge", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_engrave_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_engrave_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_engrave_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,6 @@
{
gint height;
gboolean limit;
- gboolean preview;
} t_plug_in_engrave_Vals;
t_plug_in_engrave_Vals buf, *buf_from, *buf_to;
@@ -20,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_engrave_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_engrave_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-engrave-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-engrave-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_engrave_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_engrave_Vals *)&g_plugin_data_to[0];
@@ -29,8 +28,7 @@
p_delta_gint(&buf.height, buf_from->height, buf_to->height, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_engrave", &buf, sizeof(buf));
+ gimp_set_data("plug-in-engrave", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_flarefx_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_flarefx_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_flarefx_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,8 +8,7 @@
{
gint posx;
gint posy;
- gboolean preview;
- } t_plug_in_flarefx_Vals;
+ } t_plug_in_flarefx_Vals;
t_plug_in_flarefx_Vals buf, *buf_from, *buf_to;
@@ -20,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_flarefx_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_flarefx_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-flarefx-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-flarefx-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_flarefx_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_flarefx_Vals *)&g_plugin_data_to[0];
@@ -30,8 +29,7 @@
p_delta_gint(&buf.posx, buf_from->posx, buf_to->posx, total_steps, current_step);
p_delta_gint(&buf.posy, buf_from->posy, buf_to->posy, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_flarefx", &buf, sizeof(buf));
+ gimp_set_data("plug-in-flarefx", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_fractal_trace_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_fractal_trace_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_fractal_trace_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -23,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_fractal_trace_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_fractal_trace_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-fractal-trace-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-fractal-trace-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_fractal_trace_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_fractal_trace_Vals *)&g_plugin_data_to[0];
@@ -37,7 +37,7 @@
p_delta_long(&buf.depth, buf_from->depth, buf_to->depth, total_steps, current_step);
p_delta_long(&buf.outside_type, buf_from->outside_type, buf_to->outside_type, total_steps, current_step);
- gimp_set_data("plug_in_fractal_trace", &buf, sizeof(buf));
+ gimp_set_data("plug-in-fractal-trace", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir2_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir2_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir2_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gauss_iir2_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gauss_iir2_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gauss-iir2-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gauss-iir2-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gauss_iir2_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gauss_iir2_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_gdouble(&buf.horizontal, buf_from->horizontal, buf_to->horizontal, total_steps, current_step);
p_delta_gdouble(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
- gimp_set_data("plug_in_gauss_iir2", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gauss-iir2", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_iir_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gauss_iir_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gauss_iir_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gauss-iir-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gauss-iir-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gauss_iir_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gauss_iir_Vals *)&g_plugin_data_to[0];
@@ -31,7 +31,7 @@
p_delta_long(&buf.horizontal, buf_from->horizontal, buf_to->horizontal, total_steps, current_step);
p_delta_long(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
- gimp_set_data("plug_in_gauss_iir", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gauss-iir", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle2_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle2_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle2_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gauss_rle2_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gauss_rle2_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gauss-rle2-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gauss-rle2-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gauss_rle2_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gauss_rle2_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_gdouble(&buf.horizontal, buf_from->horizontal, buf_to->horizontal, total_steps, current_step);
p_delta_gdouble(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
- gimp_set_data("plug_in_gauss_rle2", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gauss-rle2", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_gauss_rle_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gauss_rle_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gauss_rle_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gauss-rle-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gauss-rle-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gauss_rle_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gauss_rle_Vals *)&g_plugin_data_to[0];
@@ -31,7 +31,7 @@
p_delta_long(&buf.horizontal, buf_from->horizontal, buf_to->horizontal, total_steps, current_step);
p_delta_long(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
- gimp_set_data("plug_in_gauss_rle", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gauss-rle", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_gfig_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_gfig_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_gfig_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gfig_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gfig_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gfig-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gfig-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gfig_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gfig_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_long(&buf.dummy, buf_from->dummy, buf_to->dummy, total_steps, current_step);
- gimp_set_data("plug_in_gfig", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gfig", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_glasstile_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_glasstile_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_glasstile_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,6 @@
{
gint tilex;
gint tiley;
- gboolean preview;
/* interface only */
gint constrain;
} t_plug_in_glasstile_Vals;
@@ -22,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_glasstile_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_glasstile_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-glasstile-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-glasstile-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_glasstile_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_glasstile_Vals *)&g_plugin_data_to[0];
@@ -32,7 +31,7 @@
p_delta_gint(&buf.tilex, buf_from->tilex, buf_to->tilex, total_steps, current_step);
p_delta_gint(&buf.tiley, buf_from->tiley, buf_to->tiley, total_steps, current_step);
- gimp_set_data("plug_in_glasstile", &buf, sizeof(buf));
+ gimp_set_data("plug-in-glasstile", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_grid_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_grid_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_grid_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_grid_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_grid_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-grid-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-grid-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_grid_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_grid_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_gint(&buf.ioffset, buf_from->ioffset, buf_to->ioffset, total_steps, current_step);
p_delta_GimpRGB(&buf.icolor, &buf_from->icolor, &buf_to->icolor, total_steps, current_step);
- gimp_set_data("plug_in_grid", &buf, sizeof(buf));
+ gimp_set_data("plug-in-grid", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_jigsaw_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_jigsaw_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_jigsaw_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,7 +18,6 @@
t_jigsaw_style style;
gint blend_lines;
gdouble blend_amount;
- gboolean preview;
} t_plug_in_jigsaw_Vals;
@@ -31,8 +30,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_jigsaw_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_jigsaw_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-jigsaw-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-jigsaw-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_jigsaw_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_jigsaw_Vals *)&g_plugin_data_to[0];
@@ -44,8 +43,7 @@
p_delta_gint(&buf.blend_lines, buf_from->blend_lines, buf_to->blend_lines, total_steps, current_step);
p_delta_gdouble(&buf.blend_amount, buf_from->blend_amount, buf_to->blend_amount, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_jigsaw", &buf, sizeof(buf));
+ gimp_set_data("plug-in-jigsaw", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_mblur_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_mblur_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_mblur_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -11,7 +11,7 @@
gint32 angle;
gdouble center_x;
gdouble center_y;
- gboolean preview;
+ gboolean blur_outward;
} t_plug_in_mblur_Vals;
@@ -24,8 +24,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_mblur_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_mblur_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-mblur-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-mblur-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_mblur_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_mblur_Vals *)&g_plugin_data_to[0];
@@ -38,8 +38,7 @@
p_delta_gdouble(&buf.center_x, buf_from->center_x, buf_to->center_x, total_steps, current_step);
p_delta_gdouble(&buf.center_y, buf_from->center_y, buf_to->center_y, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_mblur", &buf, sizeof(buf));
+ gimp_set_data("plug-in-mblur", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_mosaic_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_mosaic_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_mosaic_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_mosaic_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_mosaic_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-mosaic-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-mosaic-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_mosaic_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_mosaic_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_long(&buf.tile_surface, buf_from->tile_surface, buf_to->tile_surface, total_steps, current_step);
p_delta_long(&buf.grout_color, buf_from->grout_color, buf_to->grout_color, total_steps, current_step);
- gimp_set_data("plug_in_mosaic", &buf, sizeof(buf));
+ gimp_set_data("plug-in-mosaic", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_newsprint_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_newsprint_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_newsprint_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_newsprint_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_newsprint_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-newsprint-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-newsprint-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_newsprint_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_newsprint_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_long(&buf.blu_spotfn, buf_from->blu_spotfn, buf_to->blu_spotfn, total_steps, current_step);
p_delta_long(&buf.oversample, buf_from->oversample, buf_to->oversample, total_steps, current_step);
- gimp_set_data("plug_in_newsprint", &buf, sizeof(buf));
+ gimp_set_data("plug-in-newsprint", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_noisify_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_noisify_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_noisify_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -2,11 +2,11 @@
* p_plug_in_noisify_iter_ALT
* ----------------------------------------------------------------------
* this plug-in registers 2 procedures named
- * plug_in_scatter_rgb and
- * plug_in_noisify
+ * plug-in-rgb-noise and
+ * plug-in-noisify
*
- * the Last values Buffer is always stored with the name "plug_in_scatter_rgb"
- * therefore the iterator must use the plug_in_scatter_rgb based names.
+ * the Last values Buffer is always stored with the name "plug-in-rgb-noise" (old name: "plug_in_scatter_rgb")
+ * therefore the iterator must use the plug-in-rgb-noise based names.
* (there is no iterator support possible for the other API named plug_in_noisify)
*/
gint p_plug_in_noisify_iter_ALT(GimpRunMode run_mode, gint32 total_steps, gdouble current_step, gint32 len_struct)
@@ -28,8 +28,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_scatter_rgb_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_scatter_rgb_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-rgb-noise-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-rgb-noise-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_noisify_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_noisify_Vals *)&g_plugin_data_to[0];
@@ -40,7 +40,7 @@
p_delta_gdouble(&buf.noise[ii], buf_from->noise[ii], buf_to->noise[ii], total_steps, current_step);
}
- gimp_set_data("plug_in_scatter_rgb", &buf, sizeof(buf));
+ gimp_set_data("plug-in-rgb-noise", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_pixelize_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_pixelize_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_pixelize_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_pixelize_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_pixelize_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-pixelize-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-pixelize-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_pixelize_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_pixelize_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_gint(&buf.pixelwidth, buf_from->pixelwidth, buf_to->pixelwidth, total_steps, current_step);
p_delta_gint(&buf.pixelheight, buf_from->pixelheight, buf_to->pixelheight, total_steps, current_step);
- gimp_set_data("plug_in_pixelize", &buf, sizeof(buf));
+ gimp_set_data("plug-in-pixelize", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_hurl_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_hurl_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_hurl_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_randomize_hurl_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_randomize_hurl_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-randomize-hurl-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-randomize-hurl-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_randomize_hurl_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_randomize_hurl_Vals *)&g_plugin_data_to[0];
@@ -32,7 +32,7 @@
p_delta_gdouble(&buf.rndm_rcount, buf_from->rndm_rcount, buf_to->rndm_rcount, total_steps, current_step);
p_delta_guint(&buf.seed, buf_from->seed, buf_to->seed, total_steps, current_step);
- gimp_set_data("plug_in_randomize_hurl", &buf, sizeof(buf));
+ gimp_set_data("plug-in-randomize-hurl", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_pick_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_pick_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_pick_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_randomize_pick_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_randomize_pick_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-randomize-pick-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-randomize-pick-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_randomize_pick_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_randomize_pick_Vals *)&g_plugin_data_to[0];
@@ -32,7 +32,7 @@
p_delta_gdouble(&buf.rndm_rcount, buf_from->rndm_rcount, buf_to->rndm_rcount, total_steps, current_step);
p_delta_guint(&buf.seed, buf_from->seed, buf_to->seed, total_steps, current_step);
- gimp_set_data("plug_in_randomize_pick", &buf, sizeof(buf));
+ gimp_set_data("plug-in-randomize-pick", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_slur_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_slur_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_randomize_slur_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_randomize_slur_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_randomize_slur_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-randomize-slur-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-randomize-slur-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_randomize_slur_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_randomize_slur_Vals *)&g_plugin_data_to[0];
@@ -32,7 +32,7 @@
p_delta_gdouble(&buf.rndm_rcount, buf_from->rndm_rcount, buf_to->rndm_rcount, total_steps, current_step);
p_delta_guint(&buf.seed, buf_from->seed, buf_to->seed, total_steps, current_step);
- gimp_set_data("plug_in_randomize_slur", &buf, sizeof(buf));
+ gimp_set_data("plug-in-randomize-slur", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_ripple_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_ripple_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_ripple_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -13,7 +13,6 @@
gint waveform;
gboolean antialias;
gboolean tile;
- gboolean preview;
} t_plug_in_ripple_Vals;
t_plug_in_ripple_Vals buf, *buf_from, *buf_to;
@@ -25,8 +24,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_ripple_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_ripple_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-ripple-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-ripple-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_ripple_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_ripple_Vals *)&g_plugin_data_to[0];
@@ -39,8 +38,7 @@
p_delta_gint(&buf.waveform, buf_from->waveform, buf_to->waveform, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_ripple", &buf, sizeof(buf));
+ gimp_set_data("plug-in-ripple", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_rotate_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_rotate_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_rotate_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_rotate_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_rotate_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-rotate-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-rotate-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_rotate_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_rotate_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_long(&buf.angle, buf_from->angle, buf_to->angle, total_steps, current_step);
p_delta_long(&buf.everything, buf_from->everything, buf_to->everything, total_steps, current_step);
- gimp_set_data("plug_in_rotate", &buf, sizeof(buf));
+ gimp_set_data("plug-in-rotate", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_scatter_hsv_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_scatter_hsv_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_scatter_hsv_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -1,6 +1,8 @@
/* ----------------------------------------------------------------------
* p_plug_in_scatter_hsv_iter_ALT
* ----------------------------------------------------------------------
+ * "plug-in-hsv-noise"
+ * (registers a 2nd name "plug-in-scatter-hsv" (old name) but set_gimp_data with name "plug-in-hsv-noise"
*/
gint p_plug_in_scatter_hsv_iter_ALT(GimpRunMode run_mode, gint32 total_steps, gdouble current_step, gint32 len_struct)
{
@@ -10,7 +12,6 @@
gint hue_distance;
gint saturation_distance;
gint value_distance;
- gboolean preview;
} t_plug_in_scatter_hsv_Vals;
t_plug_in_scatter_hsv_Vals buf, *buf_from, *buf_to;
@@ -22,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_scatter_hsv_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_scatter_hsv_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-hsv-noise-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-hsv-noise-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_scatter_hsv_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_scatter_hsv_Vals *)&g_plugin_data_to[0];
@@ -34,8 +35,7 @@
p_delta_gint(&buf.saturation_distance, buf_from->saturation_distance, buf_to->saturation_distance, total_steps, current_step);
p_delta_gint(&buf.value_distance, buf_from->value_distance, buf_to->value_distance, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_scatter_hsv", &buf, sizeof(buf));
+ gimp_set_data("plug-in-hsv-noise", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_sharpen_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_sharpen_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_sharpen_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -7,7 +7,6 @@
typedef struct t_plug_in_sharpen_Vals
{
gint percent;
- gboolean update_preview;
} t_plug_in_sharpen_Vals;
t_plug_in_sharpen_Vals buf, *buf_from, *buf_to;
@@ -19,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sharpen_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sharpen_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sharpen-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sharpen-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sharpen_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sharpen_Vals *)&g_plugin_data_to[0];
@@ -28,8 +27,7 @@
p_delta_gint(&buf.percent, buf_from->percent, buf_to->percent, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_sharpen", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sharpen", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_shift_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_shift_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_shift_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,6 @@
{
gint shift_amount;
gint orientation;
- gboolean preview;
} t_plug_in_shift_Vals;
t_plug_in_shift_Vals buf, *buf_from, *buf_to;
@@ -20,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_shift_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_shift_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-shift-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-shift-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_shift_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_shift_Vals *)&g_plugin_data_to[0];
@@ -30,8 +29,7 @@
p_delta_gint(&buf.shift_amount, buf_from->shift_amount, buf_to->shift_amount, total_steps, current_step);
p_delta_gint(&buf.orientation, buf_from->orientation, buf_to->orientation, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_shift", &buf, sizeof(buf));
+ gimp_set_data("plug-in-shift", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_spread_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_spread_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_spread_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,6 @@
{
gdouble spread_amount_x;
gdouble spread_amount_y;
- gboolean preview;
} t_plug_in_spread_Vals;
t_plug_in_spread_Vals buf, *buf_from, *buf_to;
@@ -20,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_spread_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_spread_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-spread-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-spread-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_spread_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_spread_Vals *)&g_plugin_data_to[0];
@@ -30,8 +29,7 @@
p_delta_gdouble(&buf.spread_amount_x, buf_from->spread_amount_x, buf_to->spread_amount_x, total_steps, current_step);
p_delta_gdouble(&buf.spread_amount_y, buf_from->spread_amount_y, buf_to->spread_amount_y, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_spread", &buf, sizeof(buf));
+ gimp_set_data("plug-in-spread", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_video_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_video_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_video_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_video_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_video_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-video-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-video-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_video_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_video_Vals *)&g_plugin_data_to[0];
@@ -31,7 +31,7 @@
p_delta_long(&buf.additive, buf_from->additive, buf_to->additive, total_steps, current_step);
p_delta_long(&buf.rotated, buf_from->rotated, buf_to->rotated, total_steps, current_step);
- gimp_set_data("plug_in_video", &buf, sizeof(buf));
+ gimp_set_data("plug-in-video", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_vpropagate_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_vpropagate_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_vpropagate_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -12,7 +12,6 @@
gint direction_mask;
gint lower_limit;
gint upper_limit;
- gboolean preview;
} t_plug_in_vpropagate_Vals;
t_plug_in_vpropagate_Vals buf, *buf_from, *buf_to;
@@ -24,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_vpropagate_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_vpropagate_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-vpropagate-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-vpropagate-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_vpropagate_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_vpropagate_Vals *)&g_plugin_data_to[0];
@@ -38,8 +37,7 @@
p_delta_gint(&buf.lower_limit, buf_from->lower_limit, buf_to->lower_limit, total_steps, current_step);
p_delta_gint(&buf.upper_limit, buf_from->upper_limit, buf_to->upper_limit, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_vpropagate", &buf, sizeof(buf));
+ gimp_set_data("plug-in-vpropagate", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_waves_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_waves_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_waves_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -11,7 +11,6 @@
gdouble wavelength;
gint32 type;
gboolean reflective;
- gboolean preview;
} t_plug_in_waves_Vals;
t_plug_in_waves_Vals buf, *buf_from, *buf_to;
@@ -23,8 +22,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_waves_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_waves_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-waves-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-waves-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_waves_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_waves_Vals *)&g_plugin_data_to[0];
@@ -35,8 +34,7 @@
p_delta_gdouble(&buf.wavelength, buf_from->wavelength, buf_to->wavelength, total_steps, current_step);
p_delta_gint32(&buf.type, buf_from->type, buf_to->type, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_waves", &buf, sizeof(buf));
+ gimp_set_data("plug-in-waves", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_whirl_pinch_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_whirl_pinch_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_whirl_pinch_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gdouble whirl;
gdouble pinch;
gdouble radius;
- gboolean preview;
} t_plug_in_whirl_pinch_Vals;
t_plug_in_whirl_pinch_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_whirl_pinch_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_whirl_pinch_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-whirl-pinch-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-whirl-pinch-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_whirl_pinch_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_whirl_pinch_Vals *)&g_plugin_data_to[0];
@@ -32,8 +31,7 @@
p_delta_gdouble(&buf.pinch, buf_from->pinch, buf_to->pinch, total_steps, current_step);
p_delta_gdouble(&buf.radius, buf_from->radius, buf_to->radius, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_whirl_pinch", &buf, sizeof(buf));
+ gimp_set_data("plug-in-whirl-pinch", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/gen/plug_in_wind_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/gen/plug_in_wind_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/gen/plug_in_wind_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -31,7 +31,6 @@
gint strength;
t_wind_algorithm alg;
t_wind_edge edge;
- gboolean update_preview;
} t_plug_in_wind_Vals;
t_plug_in_wind_Vals buf, *buf_from, *buf_to;
@@ -43,8 +42,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_wind_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_wind_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-wind-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-wind-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_wind_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_wind_Vals *)&g_plugin_data_to[0];
@@ -53,8 +52,7 @@
p_delta_gint(&buf.threshold, buf_from->threshold, buf_to->threshold, total_steps, current_step);
p_delta_gint(&buf.strength, buf_from->strength, buf_to->strength, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_wind", &buf, sizeof(buf));
+ gimp_set_data("plug-in-wind", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_Twist_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_Twist_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_Twist_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -38,8 +38,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_Twist_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_Twist_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-Twist-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-Twist-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_Twist_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_Twist_Vals *)&g_plugin_data_to[0];
@@ -58,7 +58,7 @@
p_delta_float(&buf.dr, buf_from->dr, buf_to->dr, total_steps, current_step);
p_delta_gint(&buf.current_function, buf_from->current_function, buf_to->current_function, total_steps, current_step);
- gimp_set_data("plug_in_Twist", &buf, sizeof(buf));
+ gimp_set_data("plug-in-Twist", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap2_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap2_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap2_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -4,19 +4,24 @@
*/
gint p_plug_in_alienmap2_iter_ALT(GimpRunMode run_mode, gint32 total_steps, gdouble current_step, gint32 len_struct)
{
+ typedef enum
+ {
+ RGB_MODEL = 0,
+ HSL_MODEL = 1
+ } t_plug_in_alienmap2_ColorModel;
+
typedef struct t_plug_in_alienmap2_Vals
{
- gdouble redfrequency;
- gdouble redangle;
- gdouble greenfrequency;
- gdouble greenangle;
- gdouble bluefrequency;
- gdouble blueangle;
- gint colormodel;
- gint redmode;
- gint greenmode;
- gint bluemode;
- gboolean preview;
+ gdouble redfrequency;
+ gdouble redangle;
+ gdouble greenfrequency;
+ gdouble greenangle;
+ gdouble bluefrequency;
+ gdouble blueangle;
+ t_plug_in_alienmap2_ColorModel colormodel;
+ gboolean redmode;
+ gboolean greenmode;
+ gboolean bluemode;
} t_plug_in_alienmap2_Vals;
t_plug_in_alienmap2_Vals buf, *buf_from, *buf_to;
@@ -28,8 +33,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_alienmap2_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_alienmap2_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-alienmap2-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-alienmap2-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_alienmap2_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_alienmap2_Vals *)&g_plugin_data_to[0];
@@ -41,12 +46,8 @@
p_delta_gdouble(&buf.greenangle, buf_from->greenangle, buf_to->greenangle, total_steps, current_step);
p_delta_gdouble(&buf.bluefrequency, buf_from->bluefrequency, buf_to->bluefrequency, total_steps, current_step);
p_delta_gdouble(&buf.blueangle, buf_from->blueangle, buf_to->blueangle, total_steps, current_step);
- p_delta_gint(&buf.colormodel, buf_from->colormodel, buf_to->colormodel, total_steps, current_step);
- p_delta_gint(&buf.redmode, buf_from->redmode, buf_to->redmode, total_steps, current_step);
- p_delta_gint(&buf.greenmode, buf_from->greenmode, buf_to->greenmode, total_steps, current_step);
- p_delta_gint(&buf.bluemode, buf_from->bluemode, buf_to->bluemode, total_steps, current_step);
- gimp_set_data("plug_in_alienmap2", &buf, sizeof(buf));
+ gimp_set_data("plug-in-alienmap2", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_alienmap_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -23,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_alienmap_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_alienmap_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-alienmap-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-alienmap-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_alienmap_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_alienmap_Vals *)&g_plugin_data_to[0];
@@ -37,7 +37,7 @@
p_delta_gint(&buf.greenmode, buf_from->greenmode, buf_to->greenmode, total_steps, current_step);
p_delta_gint(&buf.bluemode, buf_from->bluemode, buf_to->bluemode, total_steps, current_step);
- gimp_set_data("plug_in_alienmap", &buf, sizeof(buf));
+ gimp_set_data("plug-in-alienmap", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_apply_canvas_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_apply_canvas_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_apply_canvas_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,8 +8,7 @@
{
gint direction;
gint depth;
- gboolean update_preview;
- } t_plug_in_apply_canvas_Vals;
+ } t_plug_in_apply_canvas_Vals;
t_plug_in_apply_canvas_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
}
- gimp_get_data("plug_in_apply_canvas_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_apply_canvas_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-apply-canvas-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-apply-canvas-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_apply_canvas_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_apply_canvas_Vals *)&g_plugin_data_to[0];
@@ -31,7 +30,6 @@
p_delta_gint(&buf.direction, buf_from->direction, buf_to->direction, total_steps, current_step);
p_delta_gint(&buf.depth, buf_from->depth, buf_to->depth, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_apply_canvas", &buf, sizeof(buf));
+ gimp_set_data("plug-in-apply-canvas", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_applylens_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_applylens_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_applylens_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_applylens_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_applylens_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-applylens-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-applylens-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_applylens_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_applylens_Vals *)&g_plugin_data_to[0];
@@ -33,7 +33,7 @@
p_delta_long(&buf.set_background, buf_from->set_background, buf_to->set_background, total_steps, current_step);
p_delta_long(&buf.set_transparent, buf_from->set_transparent, buf_to->set_transparent, total_steps, current_step);
- gimp_set_data("plug_in_applylens", &buf, sizeof(buf));
+ gimp_set_data("plug-in-applylens", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_blur_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_blur_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_blur_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_blur_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_blur_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-blur-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-blur-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_blur_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_blur_Vals *)&g_plugin_data_to[0];
@@ -32,7 +32,7 @@
p_delta_gdouble(&buf.blur_rcount, buf_from->blur_rcount, buf_to->blur_rcount, total_steps, current_step);
p_delta_guint(&buf.blur_seed, buf_from->blur_seed, buf_to->blur_seed, total_steps, current_step);
- gimp_set_data("plug_in_blur", &buf, sizeof(buf));
+ gimp_set_data("plug-in-blur", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_bump_map_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_bump_map_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-bump-map-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-bump-map-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_bump_map_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_bump_map_Vals *)&g_plugin_data_to[0];
@@ -48,7 +48,7 @@
p_delta_long(&buf.invert, buf_from->invert, buf_to->invert, total_steps, current_step);
p_delta_long(&buf.type, buf_from->type, buf_to->type, total_steps, current_step);
- gimp_set_data("plug_in_bump_map", &buf, sizeof(buf));
+ gimp_set_data("plug-in-bump-map", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_cartoon_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_cartoon_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_cartoon_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gdouble mask_radius;
gdouble threshold;
gdouble pct_black;
- gboolean update_preview;
} t_plug_in_cartoon_Vals;
t_plug_in_cartoon_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_cartoon_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_cartoon_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-cartoon-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-cartoon-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_cartoon_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_cartoon_Vals *)&g_plugin_data_to[0];
@@ -32,7 +31,7 @@
p_delta_gdouble(&buf.threshold, buf_from->threshold, buf_to->threshold, total_steps, current_step);
p_delta_gdouble(&buf.pct_black, buf_from->pct_black, buf_to->pct_black, total_steps, current_step);
- gimp_set_data("plug_in_cartoon", &buf, sizeof(buf));
+ gimp_set_data("plug-in-cartoon", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_colors_channel_mixer_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_colors_channel_mixer_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_colors_channel_mixer_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -47,8 +47,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_colors_channel_mixer_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_colors_channel_mixer_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-colors-channel-mixer-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-colors-channel-mixer-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_colors_channel_mixer_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_colors_channel_mixer_Vals *)&g_plugin_data_to[0];
@@ -61,7 +61,7 @@
buf.preview = FALSE;
- gimp_set_data("plug_in_colors_channel_mixer", &buf, sizeof(buf));
+ gimp_set_data("plug-in-colors-channel-mixer", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_colortoalpha_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_colortoalpha_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_colortoalpha_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -7,7 +7,6 @@
typedef struct t_plug_in_colortoalpha_Vals
{
GimpRGB color;
- gboolean preview;
} t_plug_in_colortoalpha_Vals;
t_plug_in_colortoalpha_Vals buf, *buf_from, *buf_to;
@@ -19,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_colortoalpha_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_colortoalpha_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-colortoalpha-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-colortoalpha-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_colortoalpha_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_colortoalpha_Vals *)&g_plugin_data_to[0];
@@ -28,8 +27,7 @@
p_delta_GimpRGB(&buf.color, &buf_from->color, &buf_to->color, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_colortoalpha", &buf, sizeof(buf));
+ gimp_set_data("plug-in-colortoalpha", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -32,8 +32,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_convmatrix_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_convmatrix_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-convmatrix-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-convmatrix-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_convmatrix_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_convmatrix_Vals *)&g_plugin_data_to[0];
@@ -53,7 +53,7 @@
- gimp_set_data("plug_in_convmatrix", &buf, sizeof(buf));
+ gimp_set_data("plug-in-convmatrix", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_deinterlace_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_deinterlace_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_deinterlace_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -7,8 +7,7 @@
typedef struct t_plug_in_deinterlace_Vals
{
gint evenness;
- gboolean preview;
- } t_plug_in_deinterlace_Vals;
+ } t_plug_in_deinterlace_Vals;
t_plug_in_deinterlace_Vals buf, *buf_from, *buf_to;
@@ -19,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_deinterlace_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_deinterlace_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-deinterlace-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-deinterlace-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_deinterlace_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_deinterlace_Vals *)&g_plugin_data_to[0];
@@ -28,7 +27,7 @@
p_delta_gint(&buf.evenness, buf_from->evenness, buf_to->evenness, total_steps, current_step);
- gimp_set_data("plug_in_deinterlace", &buf, sizeof(buf));
+ gimp_set_data("plug-in-deinterlace", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -26,8 +26,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_depth_merge_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_depth_merge_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-depth-merge-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-depth-merge-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_depth_merge_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_depth_merge_Vals *)&g_plugin_data_to[0];
@@ -43,7 +43,7 @@
p_delta_float(&buf.scale1, buf_from->scale1, buf_to->scale1, total_steps, current_step);
p_delta_float(&buf.scale2, buf_from->scale2, buf_to->scale2, total_steps, current_step);
- gimp_set_data("plug_in_depth_merge", &buf, sizeof(buf));
+ gimp_set_data("plug-in-depth-merge", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_despeckle_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_despeckle_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_despeckle_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -10,9 +10,6 @@
gint type; /* not iterated */
gint black;
gint white;
- gint preview;
- gint dummy1;
- gint dummy2;
} t_plug_in_despeckle_Vals;
t_plug_in_despeckle_Vals buf, *buf_from, *buf_to;
@@ -24,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_despeckle_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_despeckle_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-despeckle-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-despeckle-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_despeckle_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_despeckle_Vals *)&g_plugin_data_to[0];
@@ -36,8 +33,7 @@
p_delta_gint(&buf.black, buf_from->black, buf_to->black, total_steps, current_step);
p_delta_gint(&buf.white, buf_from->white, buf_to->white, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_despeckle", &buf, sizeof(buf));
+ gimp_set_data("plug-in-despeckle", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_dog_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_dog_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_dog_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -10,7 +10,6 @@
gdouble outer;
gboolean normalize;
gboolean invert;
- gboolean preview;
} t_plug_in_dog_Vals;
t_plug_in_dog_Vals buf, *buf_from, *buf_to;
@@ -22,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_dog_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_dog_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-dog-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-dog-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_dog_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_dog_Vals *)&g_plugin_data_to[0];
@@ -33,8 +32,7 @@
p_delta_gdouble(&buf.outer, buf_from->outer, buf_to->outer, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_dog", &buf, sizeof(buf));
+ gimp_set_data("plug-in-dog", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_emboss_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_emboss_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_emboss_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -10,7 +10,6 @@
gdouble elevation;
gint32 depth;
gint32 embossp;
- gboolean preview;
} t_plug_in_emboss_Vals;
t_plug_in_emboss_Vals buf, *buf_from, *buf_to;
@@ -22,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_emboss_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_emboss_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-emboss-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-emboss-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_emboss_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_emboss_Vals *)&g_plugin_data_to[0];
@@ -34,8 +33,7 @@
p_delta_gint32(&buf.depth, buf_from->depth, buf_to->depth, total_steps, current_step);
p_delta_gint32(&buf.embossp, buf_from->embossp, buf_to->embossp, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_emboss", &buf, sizeof(buf));
+ gimp_set_data("plug-in-emboss", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_exchange_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_exchange_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_exchange_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
GimpRGB from;
GimpRGB to;
GimpRGB threshold;
- gboolean preview;
} t_plug_in_exchange_Vals;
t_plug_in_exchange_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_exchange_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_exchange_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-exchange-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-exchange-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_exchange_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_exchange_Vals *)&g_plugin_data_to[0];
@@ -35,8 +34,7 @@
/* exchange takes FROM colors from foreground when called in mode GIMP_RUN_WITH_LAST_VALS */
gimp_context_set_foreground(&buf.from);
- buf.preview = FALSE;
- gimp_set_data("plug_in_exchange", &buf, sizeof(buf));
+ gimp_set_data("plug-in-exchange", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_flame_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_flame_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_flame_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -132,8 +132,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_flame_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_flame_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-flame-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-flame-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_flame_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_flame_Vals *)&g_plugin_data_to[0];
@@ -144,7 +144,7 @@
p_delta_flame_control_point(&buf.cp, &buf_from->cp, &buf_to->cp, total_steps, current_step);
- gimp_set_data("plug_in_flame", &buf, sizeof(buf));
+ gimp_set_data("plug-in-flame", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_gauss_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_gauss_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_gauss_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -26,8 +26,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gauss_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gauss_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gauss-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gauss-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gauss_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gauss_Vals *)&g_plugin_data_to[0];
@@ -36,7 +36,7 @@
p_delta_gdouble(&buf.horizontal, buf_from->horizontal, buf_to->horizontal, total_steps, current_step);
p_delta_gdouble(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
- gimp_set_data("plug_in_gauss", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gauss", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_gimpressionist_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_gimpressionist_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_gimpressionist_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -75,8 +75,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gimpressionist_ITER_FROM", &buf_from);
- gimp_get_data("plug_in_gimpressionist_ITER_TO", &buf_to);
+ gimp_get_data("plug-in-gimpressionist-ITER-FROM", &buf_from);
+ gimp_get_data("plug-in-gimpressionist-ITER-TO", &buf_to);
memcpy(&buf, &buf_from, sizeof(buf));
p_delta_int(&buf.orient_num, buf_from.orient_num, buf_to.orient_num, total_steps, current_step);
@@ -149,7 +149,7 @@
p_delta_gdouble(&buf.color_noise, buf_from.color_noise, buf_to.color_noise, total_steps, current_step);
- gimp_set_data("plug_in_gimpressionist", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gimpressionist", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_illusion_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_illusion_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_illusion_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gint32 division;
gboolean type1;
gboolean type2;
- gboolean preview;
} t_plug_in_illusion_Vals;
t_plug_in_illusion_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_illusion_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_illusion_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-illusion-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-illusion-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_illusion_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_illusion_Vals *)&g_plugin_data_to[0];
@@ -30,8 +29,7 @@
p_delta_gint32(&buf.division, buf_from->division, buf_to->division, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_illusion", &buf, sizeof(buf));
+ gimp_set_data("plug-in-illusion", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_lic_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_lic_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_lic_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -26,8 +26,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_lic_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_lic_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-lic-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-lic-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_lic_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_lic_Vals *)&g_plugin_data_to[0];
@@ -45,7 +45,7 @@
/* dont iterate the effect_image_id */
/* p_delta_gint32(&buf.effect_image_id, buf_from->effect_image_id, buf_to->effect_image_id, total_steps, current_step); */
- gimp_set_data("plug_in_lic", &buf, sizeof(buf));
+ gimp_set_data("plug-in-lic", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_lighting_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_lighting_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_lighting_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -62,8 +62,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_lighting_ITER_FROM", &buf_from);
- gimp_get_data("plug_in_lighting_ITER_TO", &buf_to);
+ gimp_get_data("plug-in-lighting-ITER-FROM", &buf_from);
+ gimp_get_data("plug-in-lighting-ITER-TO", &buf_to);
memcpy(&buf, &buf_from, sizeof(buf));
@@ -93,7 +93,7 @@
p_delta_gint(&buf.light_selected, buf_from.light_selected, buf_to.light_selected, total_steps, current_step);
- gimp_set_data("plug_in_lighting", &buf, sizeof(buf));
+ gimp_set_data("plug-in-lighting", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_make_seamless_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_make_seamless_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_make_seamless_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -27,15 +27,15 @@
*}
*/
- gimp_get_data("plug_in_make_seamless_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_make_seamless_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-make-seamless-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-make-seamless-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_make_seamless_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_make_seamless_Vals *)&g_plugin_data_to[0];
memcpy(&buf, buf_from, sizeof(buf));
- gimp_set_data("plug_in_make_seamless", &buf, sizeof(buf));
+ gimp_set_data("plug-in-make-seamless", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_map_object_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_map_object_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_map_object_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -26,7 +26,7 @@
gint showgrid;
gint showcaps;
- glong preview_zoom_factor;
+ gdouble zoom;
gdouble alpha,beta,gamma;
gdouble maxdepth;
@@ -50,8 +50,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_map_object_ITER_FROM", &buf_from);
- gimp_get_data("plug_in_map_object_ITER_TO", &buf_to);
+ gimp_get_data("plug-in-map-object-ITER-FROM", &buf_from);
+ gimp_get_data("plug-in-map-object-ITER-TO", &buf_to);
memcpy(&buf, &buf_from, sizeof(buf));
p_delta_GimpVector3(&buf.viewpoint, &buf_from.viewpoint, &buf_to.viewpoint, total_steps, current_step);
@@ -97,7 +97,7 @@
buf.transparent_background = buf_from.transparent_background;
buf.tiled = buf_from.tiled;
- gimp_set_data("plug_in_map_object", &buf, sizeof(buf));
+ gimp_set_data("plug-in-map-object", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_max_rgb_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_max_rgb_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_max_rgb_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_max_rgb_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_max_rgb_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-max-rgb-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-max-rgb-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_max_rgb_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_max_rgb_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_gint(&buf.max_p, buf_from->max_p, buf_to->max_p, total_steps, current_step);
- gimp_set_data("plug_in_max_rgb", &buf, sizeof(buf));
+ gimp_set_data("plug-in-max-rgb", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_maze_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_maze_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_maze_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -31,8 +31,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_maze_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_maze_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-maze-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-maze-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_maze_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_maze_Vals *)&g_plugin_data_to[0];
@@ -44,7 +44,7 @@
p_delta_gint(&buf.multiple, buf_from->multiple, buf_to->multiple, total_steps, current_step);
p_delta_gint(&buf.offset, buf_from->offset, buf_to->offset, total_steps, current_step);
- gimp_set_data("plug_in_maze", &buf, sizeof(buf));
+ gimp_set_data("plug-in-maze", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_neon_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_neon_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_neon_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
}
- gimp_get_data("plug_in_neon_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_neon_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-neon-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-neon-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_neon_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_neon_Vals *)&g_plugin_data_to[0];
@@ -30,6 +30,6 @@
p_delta_gdouble(&buf.radius, buf_from->radius, buf_to->radius, total_steps, current_step);
p_delta_gdouble(&buf.amount, buf_from->amount, buf_to->amount, total_steps, current_step);
- gimp_set_data("plug_in_neon", &buf, sizeof(buf));
+ gimp_set_data("plug-in-neon", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_nlfilt_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_nlfilt_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_nlfilt_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gdouble alpha;
gdouble radius;
gint filter;
- gboolean preview;
} t_plug_in_nlfilt_Vals;
t_plug_in_nlfilt_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_nlfilt_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_nlfilt_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-nlfilt-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-nlfilt-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_nlfilt_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_nlfilt_Vals *)&g_plugin_data_to[0];
@@ -32,8 +31,7 @@
p_delta_gdouble(&buf.radius, buf_from->radius, buf_to->radius, total_steps, current_step);
p_delta_gint(&buf.filter, buf_from->filter, buf_to->filter, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_nlfilt", &buf, sizeof(buf));
+ gimp_set_data("plug-in-nlfilt", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_normalize_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_normalize_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_normalize_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -28,15 +28,15 @@
*}
*/
- gimp_get_data("plug_in_normalize_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_normalize_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-normalize-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-normalize-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_normalize_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_normalize_Vals *)&g_plugin_data_to[0];
memcpy(&buf, buf_from, sizeof(buf));
- gimp_set_data("plug_in_normalize", &buf, sizeof(buf));
+ gimp_set_data("plug-in-normalize", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_nova_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_nova_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_nova_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -12,7 +12,6 @@
gint radius;
gint nspoke;
gint randomhue;
- gboolean preview;
} t_plug_in_nova_Vals;
t_plug_in_nova_Vals buf, *buf_from, *buf_to;
@@ -24,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_nova_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_nova_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-nova-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-nova-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_nova_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_nova_Vals *)&g_plugin_data_to[0];
@@ -38,8 +37,7 @@
p_delta_gint(&buf.nspoke, buf_from->nspoke, buf_to->nspoke, total_steps, current_step);
p_delta_gint(&buf.randomhue, buf_from->randomhue, buf_to->randomhue, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_nova", &buf, sizeof(buf));
+ gimp_set_data("plug-in-nova", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_oilify_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_oilify_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_oilify_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -6,9 +6,13 @@
{
typedef struct t_plug_in_oilify_Vals
{
- gdouble mask_size;
- gint mode;
- gboolean preview;
+ gdouble mask_size;
+ gboolean use_mask_size_map;
+ gint mask_size_map;
+ gdouble exponent;
+ gboolean use_exponent_map;
+ gint exponent_map;
+ gint mode; /* is used as boolean flag (therefore do not iterate) */
} t_plug_in_oilify_Vals;
t_plug_in_oilify_Vals buf, *buf_from, *buf_to;
@@ -20,18 +24,26 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_oilify_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_oilify_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-oilify-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-oilify-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_oilify_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_oilify_Vals *)&g_plugin_data_to[0];
memcpy(&buf, buf_from, sizeof(buf));
p_delta_gdouble(&buf.mask_size, buf_from->mask_size, buf_to->mask_size, total_steps, current_step);
- p_delta_gint(&buf.mode, buf_from->mode, buf_to->mode, total_steps, current_step);
+ p_delta_gdouble(&buf.exponent, buf_from->exponent, buf_to->exponent, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_oilify", &buf, sizeof(buf));
+ if(buf.use_mask_size_map)
+ {
+ p_delta_gintdrawable(&buf.mask_size_map, buf_from->mask_size_map, buf_to->mask_size_map, total_steps, current_step);
+ }
+ if(buf.use_exponent_map)
+ {
+ p_delta_gintdrawable(&buf.exponent_map, buf_from->exponent_map, buf_to->exponent_map, total_steps, current_step);
+ }
+
+ gimp_set_data("plug-in-oilify", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_pagecurl_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_pagecurl_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_pagecurl_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -31,8 +31,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_pagecurl_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_pagecurl_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-pagecurl-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-pagecurl-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_pagecurl_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_pagecurl_Vals *)&g_plugin_data_to[0];
@@ -50,7 +50,7 @@
p_delta_gint(&buf.do_vertical, buf_from->do_vertical, buf_to->do_vertical, total_steps, current_step);
p_delta_gint(&buf.do_horizontal, buf_from->do_horizontal, buf_to->do_horizontal, total_steps, current_step);
- gimp_set_data("plug_in_pagecurl", &buf, sizeof(buf));
+ gimp_set_data("plug-in-pagecurl", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_papertile_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_papertile_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_papertile_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -23,7 +23,8 @@
typedef struct t_plug_in_papertile_Vals
{
- gint32 tile_size;
+ gint32 tile_width;
+ gint32 tile_height;
gint32 division_x;
gint32 division_y;
gdouble move_max_rate;
@@ -43,14 +44,15 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_papertile_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_papertile_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-papertile-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-papertile-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_papertile_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_papertile_Vals *)&g_plugin_data_to[0];
memcpy(&buf, buf_from, sizeof(buf));
- p_delta_gint32(&buf.tile_size, buf_from->tile_size, buf_to->tile_size, total_steps, current_step);
+ p_delta_gint32(&buf.tile_width, buf_from->tile_width, buf_to->tile_width, total_steps, current_step);
+ p_delta_gint32(&buf.tile_height, buf_from->tile_height, buf_to->tile_height, total_steps, current_step);
p_delta_gint32(&buf.division_x, buf_from->division_x, buf_to->division_x, total_steps, current_step);
p_delta_gint32(&buf.division_y, buf_from->division_y, buf_to->division_y, total_steps, current_step);
p_delta_gdouble(&buf.move_max_rate, buf_from->move_max_rate, buf_to->move_max_rate, total_steps, current_step);
@@ -64,7 +66,7 @@
p_delta_GimpRGB(&buf.background_color, &buf_from->background_color, &buf_to->background_color, total_steps, current_step);
- gimp_set_data("plug_in_papertile", &buf, sizeof(buf));
+ gimp_set_data("plug-in-papertile", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_photocopy_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_photocopy_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_photocopy_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -11,9 +11,9 @@
gdouble threshold;
gdouble pct_black;
gdouble pct_white;
- gboolean update_preview;
} t_plug_in_photocopy_Vals;
+
t_plug_in_photocopy_Vals buf, *buf_from, *buf_to;
if(len_struct != sizeof(t_plug_in_photocopy_Vals))
@@ -23,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_photocopy_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_photocopy_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-photocopy-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-photocopy-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_photocopy_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_photocopy_Vals *)&g_plugin_data_to[0];
@@ -36,8 +36,7 @@
p_delta_gdouble(&buf.pct_black, buf_from->pct_black, buf_to->pct_black, total_steps, current_step);
p_delta_gdouble(&buf.pct_white, buf_from->pct_white, buf_to->pct_white, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_photocopy", &buf, sizeof(buf));
+ gimp_set_data("plug-in-photocopy", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_plasma_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_plasma_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_plasma_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
guint32 seed;
gdouble turbulence;
gboolean random_seed;
- gboolean preview;
} t_plug_in_plasma_Vals;
t_plug_in_plasma_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_plasma_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_plasma_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-plasma-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-plasma-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_plasma_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_plasma_Vals *)&g_plugin_data_to[0];
@@ -31,8 +30,7 @@
p_delta_guint32(&buf.seed, buf_from->seed, buf_to->seed, total_steps, current_step);
p_delta_gdouble(&buf.turbulence, buf_from->turbulence, buf_to->turbulence, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_plasma", &buf, sizeof(buf));
+ gimp_set_data("plug-in-plasma", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_polar_coords_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_polar_coords_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_polar_coords_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -11,7 +11,6 @@
gboolean backwards;
gboolean inverse;
gboolean polrec;
- gboolean preview;
} t_plug_in_polar_coords_Vals;
t_plug_in_polar_coords_Vals buf, *buf_from, *buf_to;
@@ -23,8 +22,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_polar_coords_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_polar_coords_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-polar-coords-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-polar-coords-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_polar_coords_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_polar_coords_Vals *)&g_plugin_data_to[0];
@@ -34,8 +33,7 @@
p_delta_gdouble(&buf.angle, buf_from->angle, buf_to->angle, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_polar_coords", &buf, sizeof(buf));
+ gimp_set_data("plug-in-polar-coords", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_retinex_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_retinex_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_retinex_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -10,7 +10,6 @@
gint nscales;
gint scales_mode;
gfloat cvar;
- gboolean preview;
} t_plug_in_retinex_Vals;
t_plug_in_retinex_Vals buf, *buf_from, *buf_to;
@@ -22,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_retinex_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_retinex_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-retinex-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-retinex-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_retinex_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_retinex_Vals *)&g_plugin_data_to[0];
@@ -34,8 +33,7 @@
p_delta_gint(&buf.scales_mode, buf_from->scales_mode, buf_to->scales_mode, total_steps, current_step);
p_delta_gfloat(&buf.cvar, buf_from->cvar, buf_to->cvar, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_retinex", &buf, sizeof(buf));
+ gimp_set_data("plug-in-retinex", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_sample_colorize_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_sample_colorize_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_sample_colorize_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sample_colorize_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sample_colorize_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sample-colorize-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sample-colorize-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sample_colorize_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sample_colorize_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_float(&buf.tol_col_err, buf_from->tol_col_err, buf_to->tol_col_err, total_steps, current_step);
- gimp_set_data("plug_in_sample_colorize", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sample-colorize", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_sel_gauss_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_sel_gauss_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_sel_gauss_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -8,7 +8,6 @@
{
gdouble radius;
gint maxdelta;
- gboolean update_preview;
} t_plug_in_sel_gauss_Vals;
t_plug_in_sel_gauss_Vals buf, *buf_from, *buf_to;
@@ -20,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sel_gauss_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sel_gauss_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sel-gauss-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sel-gauss-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sel_gauss_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sel_gauss_Vals *)&g_plugin_data_to[0];
@@ -30,8 +29,7 @@
p_delta_gdouble(&buf.radius, buf_from->radius, buf_to->radius, total_steps, current_step);
p_delta_gint(&buf.maxdelta, buf_from->maxdelta, buf_to->maxdelta, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_sel_gauss", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sel-gauss", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_sinus_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_sinus_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_sinus_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sinus_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sinus_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sinus-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sinus-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sinus_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sinus_Vals *)&g_plugin_data_to[0];
@@ -48,7 +48,7 @@
p_delta_GimpRGB(&buf.col1, &buf_from->col1, &buf_to->col1, total_steps, current_step);
p_delta_GimpRGB(&buf.col2, &buf_from->col2, &buf_to->col2, total_steps, current_step);
- gimp_set_data("plug_in_sinus", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sinus", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_small_tiles_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_small_tiles_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_small_tiles_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_small_tiles_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_small_tiles_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-small-tiles-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-small-tiles-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_small_tiles_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_small_tiles_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_gint(&buf.number_of_tiles, buf_from->number_of_tiles, buf_to->number_of_tiles, total_steps, current_step);
- gimp_set_data("plug_in_small_tiles", &buf, sizeof(buf));
+ gimp_set_data("plug-in-small-tiles", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_sobel_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_sobel_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_sobel_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sobel_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sobel_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sobel-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sobel-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sobel_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sobel_Vals *)&g_plugin_data_to[0];
@@ -31,7 +31,7 @@
p_delta_gint(&buf.vertical, buf_from->vertical, buf_to->vertical, total_steps, current_step);
p_delta_gint(&buf.keep_sign, buf_from->keep_sign, buf_to->keep_sign, total_steps, current_step);
- gimp_set_data("plug_in_sobel", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sobel", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_softglow_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_softglow_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_softglow_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -20,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_softglow_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_softglow_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-softglow-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-softglow-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_softglow_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_softglow_Vals *)&g_plugin_data_to[0];
@@ -32,7 +32,7 @@
p_delta_gdouble(&buf.sharpness, buf_from->sharpness, buf_to->sharpness, total_steps, current_step);
/* buf.preview = FALSE; */
- gimp_set_data("plug_in_softglow", &buf, sizeof(buf));
+ gimp_set_data("plug-in-softglow", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_solid_noise_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_solid_noise_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_solid_noise_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -13,7 +13,6 @@
gdouble xsize;
gdouble ysize;
gboolean random_seed;
- gboolean preview;
} t_plug_in_solid_noise_Vals;
t_plug_in_solid_noise_Vals buf, *buf_from, *buf_to;
@@ -25,8 +24,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_solid_noise_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_solid_noise_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-solid-noise-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-solid-noise-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_solid_noise_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_solid_noise_Vals *)&g_plugin_data_to[0];
@@ -37,8 +36,7 @@
p_delta_gdouble(&buf.xsize, buf_from->xsize, buf_to->xsize, total_steps, current_step);
p_delta_gdouble(&buf.ysize, buf_from->ysize, buf_to->ysize, total_steps, current_step);
- buf.preview = FALSE;
- gimp_set_data("plug_in_solid_noise", &buf, sizeof(buf));
+ gimp_set_data("plug-in-solid-noise", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_sparkle_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_sparkle_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_sparkle_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -30,8 +30,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_sparkle_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_sparkle_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-sparkle-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-sparkle-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_sparkle_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_sparkle_Vals *)&g_plugin_data_to[0];
@@ -48,7 +48,7 @@
p_delta_gdouble(&buf.random_saturation, buf_from->random_saturation, buf_to->random_saturation, total_steps, current_step);
p_delta_gint(&buf.colortype, buf_from->colortype, buf_to->colortype, total_steps, current_step);
- gimp_set_data("plug_in_sparkle", &buf, sizeof(buf));
+ gimp_set_data("plug-in-sparkle", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_unsharp_mask_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_unsharp_mask_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_unsharp_mask_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -9,7 +9,6 @@
gdouble radius;
gdouble amount;
gint threshold;
- gboolean update_preview;
} t_plug_in_unsharp_mask_Vals;
t_plug_in_unsharp_mask_Vals buf, *buf_from, *buf_to;
@@ -21,8 +20,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_unsharp_mask_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_unsharp_mask_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-unsharp-mask-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-unsharp-mask-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_unsharp_mask_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_unsharp_mask_Vals *)&g_plugin_data_to[0];
@@ -32,8 +31,7 @@
p_delta_gdouble(&buf.amount, buf_from->amount, buf_to->amount, total_steps, current_step);
p_delta_gint(&buf.threshold, buf_from->threshold, buf_to->threshold, total_steps, current_step);
- buf.update_preview = FALSE;
- gimp_set_data("plug_in_unsharp_mask", &buf, sizeof(buf));
+ gimp_set_data("plug-in-unsharp-mask", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/mod/plug_in_vinvert_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/mod/plug_in_vinvert_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/mod/plug_in_vinvert_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -27,15 +27,15 @@
* return -1;
*}
*/
- gimp_get_data("plug_in_vinvert_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_vinvert_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-vinvert-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-vinvert-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_vinvert_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_vinvert_Vals *)&g_plugin_data_to[0];
memcpy(&buf, buf_from, sizeof(buf));
- gimp_set_data("plug_in_vinvert", &buf, sizeof(buf));
+ gimp_set_data("plug-in-vinvert", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_CentralReflection_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_CentralReflection_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_CentralReflection_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -23,8 +23,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_CentralReflection_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_CentralReflection_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-CentralReflection-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-CentralReflection-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_CentralReflection_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_CentralReflection_Vals *)&g_plugin_data_to[0];
@@ -37,7 +37,7 @@
p_delta_gint(&buf.use_antialias, buf_from->use_antialias, buf_to->use_antialias, total_steps, current_step);
p_delta_gint(&buf.flip, buf_from->flip, buf_to->flip, total_steps, current_step);
- gimp_set_data("plug_in_CentralReflection", &buf, sizeof(buf));
+ gimp_set_data("plug-in-CentralReflection", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_anamorphose_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_anamorphose_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_anamorphose_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -25,8 +25,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_anamorphose_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_anamorphose_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-anamorphose-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-anamorphose-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_anamorphose_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_anamorphose_Vals *)&g_plugin_data_to[0];
@@ -41,7 +41,7 @@
p_delta_long(&buf.flip, buf_from->flip, buf_to->flip, total_steps, current_step);
p_delta_long(&buf.ndouble, buf_from->ndouble, buf_to->ndouble, total_steps, current_step);
- gimp_set_data("plug_in_anamorphose", &buf, sizeof(buf));
+ gimp_set_data("plug-in-anamorphose", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_blur2_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_blur2_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_blur2_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_blur2_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_blur2_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-blur2-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-blur2-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_blur2_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_blur2_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_gdouble(&buf.mask_size, buf_from->mask_size, buf_to->mask_size, total_steps, current_step);
- gimp_set_data("plug_in_blur2", &buf, sizeof(buf));
+ gimp_set_data("plug-in-blur2", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_colorify_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_colorify_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_colorify_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("Colorify_ITER_FROM", g_plugin_data_from);
- gimp_get_data("Colorify_ITER_TO", g_plugin_data_to);
+ gimp_get_data("Colorify-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("Colorify-ITER-TO", g_plugin_data_to);
buf_from = (t_Colorify_Vals *)&g_plugin_data_from[0];
buf_to = (t_Colorify_Vals *)&g_plugin_data_to[0];
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_encript_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_encript_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_encript_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_encript_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_encript_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-encript-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-encript-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_encript_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_encript_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_gint(&buf.password, buf_from->password, buf_to->password, total_steps, current_step);
p_delta_gint(&buf.warning, buf_from->warning, buf_to->warning, total_steps, current_step);
- gimp_set_data("plug_in_encript", &buf, sizeof(buf));
+ gimp_set_data("plug-in-encript", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_figures_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_figures_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_figures_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -22,8 +22,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_figures_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_figures_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-figures-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-figures-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_figures_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_figures_Vals *)&g_plugin_data_to[0];
@@ -35,7 +35,7 @@
p_delta_gint(&buf.min_height, buf_from->min_height, buf_to->min_height, total_steps, current_step);
p_delta_gint(&buf.max_height, buf_from->max_height, buf_to->max_height, total_steps, current_step);
- gimp_set_data("plug_in_figures", &buf, sizeof(buf));
+ gimp_set_data("plug-in-figures", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_gflare_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_gflare_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_gflare_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_gflare_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_gflare_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-gflare-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-gflare-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_gflare_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_gflare_Vals *)&g_plugin_data_to[0];
@@ -47,7 +47,7 @@
p_delta_gint(&buf.asupsample_max_depth, buf_from->asupsample_max_depth, buf_to->asupsample_max_depth, total_steps, current_step);
p_delta_gdouble(&buf.asupsample_threshold, buf_from->asupsample_threshold, buf_to->asupsample_threshold, total_steps, current_step);
- gimp_set_data("plug_in_gflare", &buf, sizeof(buf));
+ gimp_set_data("plug-in-gflare", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_holes_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_holes_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_holes_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -21,8 +21,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_holes_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_holes_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-holes-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-holes-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_holes_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_holes_Vals *)&g_plugin_data_to[0];
@@ -33,7 +33,7 @@
p_delta_long(&buf.size, buf_from->size, buf_to->size, total_steps, current_step);
p_delta_long(&buf.flag, buf_from->flag, buf_to->flag, total_steps, current_step);
- gimp_set_data("plug_in_holes", &buf, sizeof(buf));
+ gimp_set_data("plug-in-holes", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_julia_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_julia_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_julia_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -31,8 +31,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_julia_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_julia_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-julia-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-julia-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_julia_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_julia_Vals *)&g_plugin_data_to[0];
@@ -53,7 +53,7 @@
p_delta_gint(&buf.greenmode, buf_from->greenmode, buf_to->greenmode, total_steps, current_step);
p_delta_gint(&buf.bluemode, buf_from->bluemode, buf_to->bluemode, total_steps, current_step);
- gimp_set_data("plug_in_julia", &buf, sizeof(buf));
+ gimp_set_data("plug-in-julia", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_magic_eye_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_magic_eye_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_magic_eye_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_magic_eye_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_magic_eye_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-magic-eye-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-magic-eye-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_magic_eye_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_magic_eye_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_long(&buf.mapimage, buf_from->mapimage, buf_to->mapimage, total_steps, current_step);
- gimp_set_data("plug_in_magic_eye", &buf, sizeof(buf));
+ gimp_set_data("plug-in-magic-eye", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_mandelbrot_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_mandelbrot_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_mandelbrot_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_mandelbrot_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_mandelbrot_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-mandelbrot-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-mandelbrot-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_mandelbrot_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_mandelbrot_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_gint(&buf.greenmode, buf_from->greenmode, buf_to->greenmode, total_steps, current_step);
p_delta_gint(&buf.bluemode, buf_from->bluemode, buf_to->bluemode, total_steps, current_step);
- gimp_set_data("plug_in_mandelbrot", &buf, sizeof(buf));
+ gimp_set_data("plug-in-mandelbrot", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_randomize_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_randomize_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_randomize_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -22,8 +22,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_randomize_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_randomize_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-randomize-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-randomize-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_randomize_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_randomize_Vals *)&g_plugin_data_to[0];
@@ -33,7 +33,7 @@
p_delta_gdouble(&buf.rndm_pct, buf_from->rndm_pct, buf_to->rndm_pct, total_steps, current_step);
p_delta_gdouble(&buf.rndm_rcount, buf_from->rndm_rcount, buf_to->rndm_rcount, total_steps, current_step);
- gimp_set_data("plug_in_randomize", &buf, sizeof(buf));
+ gimp_set_data("plug-in-randomize", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_refract_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_refract_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_refract_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -28,8 +28,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_refract_ITER_FROM", &buf_from);
- gimp_get_data("plug_in_refract_ITER_TO", &buf_to);
+ gimp_get_data("plug-in-refract-ITER-FROM", &buf_from);
+ gimp_get_data("plug-in-refract-ITER-TO", &buf_to);
memcpy(&buf, &buf_from, sizeof(buf));
p_delta_drawable(&buf.lens_id, buf_from.lens_id, buf_to.lens_id, total_steps, current_step);
@@ -44,7 +44,7 @@
p_delta_long(&buf.xofs, buf_from.xofs, buf_to.xofs, total_steps, current_step);
p_delta_long(&buf.yofs, buf_from.yofs, buf_to.yofs, total_steps, current_step);
- gimp_set_data("plug_in_refract", &buf, sizeof(buf));
+ gimp_set_data("plug-in-refract", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_struc_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_struc_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_struc_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -19,8 +19,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_struc_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_struc_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-struc-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-struc-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_struc_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_struc_Vals *)&g_plugin_data_to[0];
@@ -29,7 +29,7 @@
p_delta_long(&buf.direction, buf_from->direction, buf_to->direction, total_steps, current_step);
p_delta_long(&buf.depth, buf_from->depth, buf_to->depth, total_steps, current_step);
- gimp_set_data("plug_in_struc", &buf, sizeof(buf));
+ gimp_set_data("plug-in-struc", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_tileit_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_tileit_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_tileit_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -18,8 +18,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_tileit_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_tileit_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-tileit-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-tileit-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_tileit_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_tileit_Vals *)&g_plugin_data_to[0];
@@ -27,7 +27,7 @@
p_delta_long(&buf.number_of_tiles, buf_from->number_of_tiles, buf_to->number_of_tiles, total_steps, current_step);
- gimp_set_data("plug_in_tileit", &buf, sizeof(buf));
+ gimp_set_data("plug-in-tileit", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_universal_filter_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_universal_filter_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_universal_filter_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -29,8 +29,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_universal_filter_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_universal_filter_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-universal-filter-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-universal-filter-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_universal_filter_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_universal_filter_Vals *)&g_plugin_data_to[0];
@@ -49,7 +49,7 @@
p_delta_long(&buf.norm, buf_from->norm, buf_to->norm, total_steps, current_step);
p_delta_long(&buf.bias, buf_from->bias, buf_to->bias, total_steps, current_step);
- gimp_set_data("plug_in_universal_filter", &buf, sizeof(buf));
+ gimp_set_data("plug-in-universal-filter", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/gap/iter_ALT/old/plug_in_warp_iter_ALT.inc
==============================================================================
--- branches/gap-2-4/gap/iter_ALT/old/plug_in_warp_iter_ALT.inc (original)
+++ branches/gap-2-4/gap/iter_ALT/old/plug_in_warp_iter_ALT.inc Mon Jan 14 19:33:53 2008
@@ -33,8 +33,8 @@
return -1; /* ERROR */
}
- gimp_get_data("plug_in_warp_ITER_FROM", g_plugin_data_from);
- gimp_get_data("plug_in_warp_ITER_TO", g_plugin_data_to);
+ gimp_get_data("plug-in-warp-ITER-FROM", g_plugin_data_from);
+ gimp_get_data("plug-in-warp-ITER-TO", g_plugin_data_to);
buf_from = (t_plug_in_warp_Vals *)&g_plugin_data_from[0];
buf_to = (t_plug_in_warp_Vals *)&g_plugin_data_to[0];
@@ -57,7 +57,7 @@
p_delta_gdouble(&buf.vector_scale, buf_from->vector_scale, buf_to->vector_scale, total_steps, current_step);
p_delta_gdouble(&buf.vector_angle, buf_from->vector_angle, buf_to->vector_angle, total_steps, current_step);
- gimp_set_data("plug_in_warp", &buf, sizeof(buf));
+ gimp_set_data("plug-in-warp", &buf, sizeof(buf));
return 0; /* OK */
}
Modified: branches/gap-2-4/libgapvidapi/gap_vid_api.c
==============================================================================
--- branches/gap-2-4/libgapvidapi/gap_vid_api.c (original)
+++ branches/gap-2-4/libgapvidapi/gap_vid_api.c Mon Jan 14 19:33:53 2008
@@ -1543,6 +1543,8 @@
, gvahand->width
, gvahand->height);
+ gimp_drawable_detach(drawable);
+
if (gap_debug) printf("DEBUG: after copy data rows \n");
@@ -1798,8 +1800,8 @@
xresolution = yresolution * asymetric;
/* set resolution in DPI according to aspect ratio */
- gimp_image_set_unit (gvahand->image_id, GIMP_UNIT_INCH);
- gimp_image_set_resolution (gvahand->image_id, xresolution, yresolution);
+ gimp_image_set_unit (image_id, GIMP_UNIT_INCH);
+ gimp_image_set_resolution (image_id, xresolution, yresolution);
if(gap_debug)
{
@@ -1998,10 +2000,10 @@
if (gap_debug) printf("DEBUG: after copy data rows (NO SHADOW)\n");
gimp_drawable_flush (drawable);
+ gimp_drawable_detach(drawable);
/*
* gimp_drawable_merge_shadow (drawable->id, TRUE);
- * gimp_drawable_detach (drawable);
*/
/* what to do with old layer ? */
Modified: branches/gap-2-4/libgapvidutil/gap_gvetypes.h
==============================================================================
--- branches/gap-2-4/libgapvidutil/gap_gvetypes.h (original)
+++ branches/gap-2-4/libgapvidutil/gap_gvetypes.h Mon Jan 14 19:33:53 2008
@@ -30,7 +30,7 @@
#include <config.h>
-#define GAP_WILDCARD_VIDEO_ENCODERS "^plug_in_gap_enc_.*"
+#define GAP_WILDCARD_VIDEO_ENCODERS "^plug.in.gap.enc.*"
#define GAP_QUERY_PREFIX_VIDEO_ENCODERS "extension_gap_ENCPAR_QUERY_"
#define GAP_VENC_PAR_MENU_NAME "gapve_menu_name"
#define GAP_VENC_PAR_VID_EXTENSION "gapve_vid_extension"
@@ -68,6 +68,7 @@
#include <libgimp/gimpui.h>
#include <gap_gve_misc_util.h>
+#include <gap_lib_common_defs.h>
@@ -80,13 +81,7 @@
#define GAP_GVE_MENU_ITEM_INDEX_KEY "gap_enc_menu_item_index"
-typedef enum
-{
- GAP_RNGTYPE_FRAMES
- ,GAP_RNGTYPE_LAYER
- ,GAP_RNGTYPE_STORYBOARD
-} GapGveTypeInputRange;
-
+typedef GapLibTypeInputRange GapGveTypeInputRange;
typedef struct GapGveEncList {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
