diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c index 241d682272..626d7348f6 100644 --- a/app/pdb/internal-procs.c +++ b/app/pdb/internal-procs.c @@ -28,7 +28,7 @@ #include "internal-procs.h" -/* 746 procedures registered total */ +/* 747 procedures registered total */ void internal_procs_init (GimpPDB *pdb) diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c index b01d5d903a..454722f6ac 100644 --- a/app/pdb/plug-in-compat-cmds.c +++ b/app/pdb/plug-in-compat-cmds.c @@ -1251,6 +1251,49 @@ plug_in_hsv_noise_invoker (GimpProcedure *procedure, error ? *error : NULL); } +static GimpValueArray * +plug_in_illusion_invoker (GimpProcedure *procedure, + Gimp *gimp, + GimpContext *context, + GimpProgress *progress, + const GimpValueArray *args, + GError **error) +{ + gboolean success = TRUE; + GimpDrawable *drawable; + gint32 division; + gint32 type; + + drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp); + division = g_value_get_int (gimp_value_array_index (args, 3)); + type = g_value_get_int (gimp_value_array_index (args, 4)); + + if (success) + { + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GeglNode *node = + gegl_node_new_child (NULL, + "operation", "gegl:illusion", + "division", (gint) division, + "illusion-type", (gint) type, + NULL); + + gimp_drawable_apply_operation (drawable, progress, + C_("undo-type", "Illusion"), + node); + g_object_unref (node); + } + else + success = FALSE; + } + + return gimp_procedure_get_return_values (procedure, success, + error ? *error : NULL); +} + static GimpValueArray * plug_in_laplace_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -4060,6 +4103,54 @@ register_plug_in_compat_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); + /* + * gimp-plug-in-illusion + */ + procedure = gimp_procedure_new (plug_in_illusion_invoker); + gimp_object_set_static_name (GIMP_OBJECT (procedure), + "plug-in-illusion"); + gimp_procedure_set_static_strings (procedure, + "plug-in-illusion", + "Superimpose many altered copies of the image", + "Produce illusion.", + "Compatibility procedure. Please see 'gegl:illusion' for credits.", + "Compatibility procedure. Please see 'gegl:illusion' for credits.", + "2014", + NULL); + gimp_procedure_add_argument (procedure, + g_param_spec_enum ("run-mode", + "run mode", + "The run mode", + GIMP_TYPE_RUN_MODE, + GIMP_RUN_INTERACTIVE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_image_id ("image", + "image", + "Input image (unused)", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_drawable_id ("drawable", + "drawable", + "Input drawable", + pdb->gimp, FALSE, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_int32 ("division", + "division", + "The number of divisions", + 0, 64, 0, + GIMP_PARAM_READWRITE)); + gimp_procedure_add_argument (procedure, + gimp_param_spec_int32 ("type", + "type", + "Illusion type { TYPE1 (0), TYPE2 (1) }", + 0, 1, 0, + GIMP_PARAM_READWRITE)); + gimp_pdb_register_procedure (pdb, procedure); + g_object_unref (procedure); + /* * gimp-plug-in-laplace */ diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore index f7be41cc59..0da43b284e 100644 --- a/plug-ins/common/.gitignore +++ b/plug-ins/common/.gitignore @@ -152,8 +152,6 @@ /guillotine.exe /hot /hot.exe -/illusion -/illusion.exe /jigsaw /jigsaw.exe /lcms diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 50c6c4ca50..1e921e8b2d 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -119,7 +119,6 @@ libexec_PROGRAMS = \ grid \ guillotine \ hot \ - illusion \ jigsaw \ lcms \ lens-flare \ @@ -1508,23 +1507,6 @@ hot_LDADD = \ $(INTLLIBS) \ $(hot_RC) -illusion_SOURCES = \ - illusion.c - -illusion_LDADD = \ - $(libgimpui) \ - $(libgimpwidgets) \ - $(libgimpmodule) \ - $(libgimp) \ - $(libgimpmath) \ - $(libgimpconfig) \ - $(libgimpcolor) \ - $(libgimpbase) \ - $(GTK_LIBS) \ - $(RT_LIBS) \ - $(INTLLIBS) \ - $(illusion_RC) - jigsaw_SOURCES = \ jigsaw.c diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common index 50665a376d..9dcf4e7e72 100644 --- a/plug-ins/common/gimprc.common +++ b/plug-ins/common/gimprc.common @@ -73,7 +73,6 @@ gradient_map_RC = gradient-map.rc.o grid_RC = grid.rc.o guillotine_RC = guillotine.rc.o hot_RC = hot.rc.o -illusion_RC = illusion.rc.o jigsaw_RC = jigsaw.rc.o lcms_RC = lcms.rc.o lens_flare_RC = lens-flare.rc.o diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c deleted file mode 100644 index 99d4dd1725..0000000000 --- a/plug-ins/common/illusion.c +++ /dev/null @@ -1,436 +0,0 @@ -/* - * illusion.c -- This is a plug-in for GIMP 1.0 - * - * Copyright (C) 1997 Hirotsuna Mizuno - * s1041150@u-aizu.ac.jp - * - * Preview and new mode added May 2000 by tim copperfield - * timecop@japan.co.jp - * http://www.ne.jp/asahi/linux/timecop - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -#include "config.h" - -#include - -#include -#include - -#include "libgimp/stdplugins-intl.h" - - -#define PLUG_IN_PROC "plug-in-illusion" -#define PLUG_IN_BINARY "illusion" -#define PLUG_IN_ROLE "gimp-illusion" -#define PLUG_IN_VERSION "v0.8 (May 14 2000)" - - -static void query (void); -static void run (const gchar *name, - gint nparam, - const GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); - -static void illusion (GimpDrawable *drawable); -static void illusion_preview (GimpPreview *preview, - GimpDrawable *drawable); -static gboolean illusion_dialog (GimpDrawable *drawable); - -typedef struct -{ - gint32 division; - gboolean type1; - gboolean type2; -} IllValues; - -const GimpPlugInInfo PLUG_IN_INFO = -{ - NULL, /* init_proc */ - NULL, /* quit_proc */ - query, /* query_proc */ - run /* run_proc */ -}; - -static IllValues parameters = -{ - 8, /* division */ - TRUE, /* type 1 */ - FALSE /* type 2 */ -}; - -MAIN () - -static void -query (void) -{ - static const GimpParamDef args[] = - { - { GIMP_PDB_INT32, "run-mode", "The run mode { RUN-INTERACTIVE (0), RUN-NONINTERACTIVE (1) }" }, - { GIMP_PDB_IMAGE, "image", "Input image" }, - { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }, - { GIMP_PDB_INT32, "division", "The number of divisions" }, - { GIMP_PDB_INT32, "type", "Illusion type { TYPE1 (0), TYPE2 (1) }" } - }; - - gimp_install_procedure (PLUG_IN_PROC, - N_("Superimpose many altered copies of the image"), - "produce illusion", - "Hirotsuna Mizuno ", - "Hirotsuna Mizuno", - PLUG_IN_VERSION, - N_("_Illusion..."), - "RGB*, GRAY*", - GIMP_PLUGIN, - G_N_ELEMENTS (args), 0, - args, NULL); - - gimp_plugin_menu_register (PLUG_IN_PROC, "/Filters/Map"); -} - -static void -run (const gchar *name, - gint nparams, - const GimpParam *params, - gint *nreturn_vals, - GimpParam **return_vals) -{ - static GimpParam returnv[1]; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; - GimpRunMode run_mode; - GimpDrawable *drawable; - - INIT_I18N (); - - /* get the drawable info */ - run_mode = params[0].data.d_int32; - drawable = gimp_drawable_get (params[2].data.d_drawable); - - *nreturn_vals = 1; - *return_vals = returnv; - - /* switch the run mode */ - switch (run_mode) - { - case GIMP_RUN_INTERACTIVE: - gimp_get_data (PLUG_IN_PROC, ¶meters); - if (! illusion_dialog (drawable)) - return; - gimp_set_data (PLUG_IN_PROC, ¶meters, sizeof (IllValues)); - break; - - case GIMP_RUN_NONINTERACTIVE: - if (nparams != 5) - { - status = GIMP_PDB_CALLING_ERROR; - } - else - { - parameters.division = params[3].data.d_int32; - if (params[4].data.d_int32 == 0) - { - parameters.type1 = TRUE; - parameters.type2 = FALSE; - } - else - { - parameters.type1 = FALSE; - parameters.type2 = TRUE; - } - } - break; - - case GIMP_RUN_WITH_LAST_VALS: - gimp_get_data (PLUG_IN_PROC, ¶meters); - break; - } - - if (status == GIMP_PDB_SUCCESS) - { - if (gimp_drawable_is_rgb (drawable->drawable_id) || - gimp_drawable_is_gray (drawable->drawable_id)) - { - gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width() + 1)); - gimp_progress_init (_("Illusion")); - illusion (drawable); - if (run_mode != GIMP_RUN_NONINTERACTIVE) - gimp_displays_flush (); - } - else - { - status = GIMP_PDB_EXECUTION_ERROR; - } - } - - returnv[0].type = GIMP_PDB_STATUS; - returnv[0].data.d_status = status; - - gimp_drawable_detach (drawable); -} - -typedef struct { - GimpPixelFetcher *pft; - gdouble center_x; - gdouble center_y; - gdouble scale; - gdouble offset; - gboolean has_alpha; -} IllusionParam_t; - -static void -illusion_func (gint x, - gint y, - const guchar *src, - guchar *dest, - gint bpp, - gpointer data) -{ - IllusionParam_t *param = (IllusionParam_t*) data; - gint xx, yy, b; - gdouble radius, cx, cy, angle; - guchar pixel[4]; - - cy = ((gdouble) y - param->center_y) / param->scale; - cx = ((gdouble) x - param->center_x) / param->scale; - - angle = floor (atan2 (cy, cx) * parameters.division / G_PI_2) - * G_PI_2 / parameters.division + (G_PI / parameters.division); - radius = sqrt ((gdouble) (cx * cx + cy * cy)); - - if (parameters.type1) - { - xx = x - param->offset * cos (angle); - yy = y - param->offset * sin (angle); - } - else /* Type 2 */ - { - xx = x - param->offset * sin (angle); - yy = y - param->offset * cos (angle); - } - - gimp_pixel_fetcher_get_pixel (param->pft, xx, yy, pixel); - - if (param->has_alpha) - { - guint alpha1 = src[bpp - 1]; - guint alpha2 = pixel[bpp - 1]; - guint alpha = (1 - radius) * alpha1 + radius * alpha2; - - if ((dest[bpp - 1] = (alpha >> 1))) - { - for (b = 0; b < bpp - 1; b++) - dest[b] = ((1 - radius) * src[b] * alpha1 + - radius * pixel[b] * alpha2) / alpha; - } - } - else - { - for (b = 0; b < bpp; b++) - dest[b] = (1 - radius) * src[b] + radius * pixel[b]; - } -} - -static void -illusion (GimpDrawable *drawable) -{ - IllusionParam_t param; - GimpRgnIterator *iter; - gint width, height; - gint x1, y1, x2, y2; - - gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - width = x2 - x1; - height = y2 - y1; - - param.pft = gimp_pixel_fetcher_new (drawable, FALSE); - gimp_pixel_fetcher_set_edge_mode (param.pft, GIMP_PIXEL_FETCHER_EDGE_SMEAR); - - param.has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); - param.center_x = (x1 + x2) / 2.0; - param.center_y = (y1 + y2) / 2.0; - param.scale = sqrt (width * width + height * height) / 2; - param.offset = (gint) (param.scale / 2); - - iter = gimp_rgn_iterator_new (drawable, 0); - gimp_rgn_iterator_src_dest (iter, illusion_func, ¶m); - gimp_rgn_iterator_free (iter); - - gimp_pixel_fetcher_destroy (param.pft); -} - -static void -illusion_preview (GimpPreview *preview, - GimpDrawable *drawable) - -{ - gint x, y; - gint sx, sy; - gint preview_width, preview_height; - guchar *src; - guchar *dest; - guchar *src_pixel; - guchar *dest_pixel; - gint bpp; - IllusionParam_t param; - gint width, height; - gint x1, y1, x2, y2; - - gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - width = x2 - x1; - height = y2 - y1; - - param.pft = gimp_pixel_fetcher_new (drawable, FALSE); - gimp_pixel_fetcher_set_edge_mode (param.pft, GIMP_PIXEL_FETCHER_EDGE_SMEAR); - - param.has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); - param.center_x = (x1 + x2) / 2.0; - param.center_y = (y1 + y2) / 2.0; - param.scale = sqrt (width * width + height * height) / 2; - param.offset = (gint) (param.scale / 2); - - src = gimp_zoom_preview_get_source (GIMP_ZOOM_PREVIEW (preview), - &preview_width, &preview_height, &bpp); - dest = g_malloc (preview_width * preview_height * bpp); - - src_pixel = src; - dest_pixel = dest; - - for (y = 0; y < preview_height; y++) - { - for (x = 0; x < preview_width; x++) - { - gimp_preview_untransform (preview, x, y, &sx, &sy); - - illusion_func (sx, sy, - src_pixel, dest_pixel, - bpp, - (gpointer) ¶m); - - src_pixel += bpp; - dest_pixel += bpp; - } - } - - gimp_pixel_fetcher_destroy (param.pft); - - gimp_preview_draw_buffer (preview, dest, preview_width * bpp); - g_free (dest); - g_free (src); -} - -static gboolean -illusion_dialog (GimpDrawable *drawable) -{ - GtkWidget *dialog; - GtkWidget *main_vbox; - GtkWidget *preview; - GtkWidget *table; - GtkWidget *spinbutton; - GtkObject *adj; - GtkWidget *radio; - GSList *group = NULL; - gboolean run; - - gimp_ui_init (PLUG_IN_BINARY, TRUE); - - dialog = gimp_dialog_new (_("Illusion"), PLUG_IN_ROLE, - NULL, 0, - gimp_standard_help_func, PLUG_IN_PROC, - - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - - NULL); - - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_OK, - GTK_RESPONSE_CANCEL, - -1); - - gimp_window_set_transient (GTK_WINDOW (dialog)); - - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), - main_vbox, TRUE, TRUE, 0); - gtk_widget_show (main_vbox); - - preview = gimp_zoom_preview_new (drawable); - gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); - gtk_widget_show (preview); - - g_signal_connect (preview, "invalidated", - G_CALLBACK (illusion_preview), - drawable); - - table = gtk_table_new (3, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - spinbutton = gimp_spin_button_new (&adj, parameters.division, - -32, 64, 1, 10, 0, 1, 0); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("_Divisions:"), 0.0, 0.5, - spinbutton, 1, TRUE); - - g_signal_connect (adj, "value-changed", - G_CALLBACK (gimp_int_adjustment_update), - ¶meters.division); - g_signal_connect_swapped (adj, "value-changed", - G_CALLBACK (gimp_preview_invalidate), - preview); - - radio = gtk_radio_button_new_with_mnemonic (group, _("Mode _1")); - group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); - gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (radio); - - g_signal_connect (radio, "toggled", - G_CALLBACK (gimp_toggle_button_update), - ¶meters.type1); - g_signal_connect_swapped (radio, "toggled", - G_CALLBACK (gimp_preview_invalidate), - preview); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type1); - - radio = gtk_radio_button_new_with_mnemonic (group, _("Mode _2")); - group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); - gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 2, 3, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (radio); - - g_signal_connect (radio, "toggled", - G_CALLBACK (gimp_toggle_button_update), - ¶meters.type2); - g_signal_connect_swapped (radio, "toggled", - G_CALLBACK (gimp_preview_invalidate), - preview); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type2); - - gtk_widget_show (dialog); - - run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - - gtk_widget_destroy (dialog); - - return run; -} diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl index 84fb352944..8f4c4c319d 100644 --- a/plug-ins/common/plugin-defs.pl +++ b/plug-ins/common/plugin-defs.pl @@ -74,7 +74,6 @@ 'grid' => { ui => 1 }, 'guillotine' => {}, 'hot' => { ui => 1 }, - 'illusion' => { ui => 1 }, 'jigsaw' => { ui => 1 }, 'lcms' => { ui => 1, gegl => 1, libs => 'LCMS_LIBS', cflags => 'LCMS_CFLAGS' }, 'lens-flare' => { ui => 1 }, diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in index 2d32190bd1..6709517b28 100644 --- a/po-plug-ins/POTFILES.in +++ b/po-plug-ins/POTFILES.in @@ -78,7 +78,6 @@ plug-ins/common/gradient-map.c plug-ins/common/grid.c plug-ins/common/guillotine.c plug-ins/common/hot.c -plug-ins/common/illusion.c plug-ins/common/jigsaw.c plug-ins/common/lcms.c plug-ins/common/lens-flare.c diff --git a/tools/pdbgen/pdb/plug_in_compat.pdb b/tools/pdbgen/pdb/plug_in_compat.pdb index 52357925d1..c5bf2cb87f 100644 --- a/tools/pdbgen/pdb/plug_in_compat.pdb +++ b/tools/pdbgen/pdb/plug_in_compat.pdb @@ -1225,6 +1225,55 @@ CODE ); } +sub plug_in_illusion { + $blurb = 'Superimpose many altered copies of the image'; + + $help = <<'HELP'; +Produce illusion. +HELP + + &std_pdb_compat('gegl:illusion'); + $date = '2014'; + + @inargs = ( + { name => 'run_mode', type => 'enum GimpRunMode', dead => 1, + desc => 'The run mode' }, + { name => 'image', type => 'image', dead => 1, + desc => 'Input image (unused)' }, + { name => 'drawable', type => 'drawable', + desc => 'Input drawable' }, + { name => 'division', type => '0 <= int32 <= 64', + desc => 'The number of divisions' }, + { name => 'type', type => '0 <= int32 <= 1', + desc => 'Illusion type { TYPE1 (0), TYPE2 (1) }' } + ); + + %invoke = ( + code => <<'CODE' +{ + if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, + GIMP_PDB_ITEM_CONTENT, error) && + gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)) + { + GeglNode *node = + gegl_node_new_child (NULL, + "operation", "gegl:illusion", + "division", (gint) division, + "illusion-type", (gint) type, + NULL); + + gimp_drawable_apply_operation (drawable, progress, + C_("undo-type", "Illusion"), + node); + g_object_unref (node); + } + else + success = FALSE; +} +CODE + ); +} + sub plug_in_laplace { $blurb = 'High-resolution edge detection'; @@ -3276,6 +3325,7 @@ CODE plug_in_gauss_rle2 plug_in_glasstile plug_in_hsv_noise + plug_in_illusion plug_in_laplace plug_in_lens_distortion plug_in_make_seamless