Hello community, here is the log from the commit of package gimp-lqr-plugin for openSUSE:Factory checked in at 2013-08-12 11:08:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp-lqr-plugin (Old) and /work/SRC/openSUSE:Factory/.gimp-lqr-plugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gimp-lqr-plugin" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp-lqr-plugin/gimp-lqr-plugin.changes 2011-09-23 01:59:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp-lqr-plugin.new/gimp-lqr-plugin.changes 2013-08-12 11:08:16.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 6 16:20:56 UTC 2013 - [email protected] + +- Update to version 0.7.2: + + Minimum GIMP version required is now 2.8. + + Remove some annoying warnings about using an old API. + +------------------------------------------------------------------- Old: ---- gimp-lqr-plugin-0.7.1.tar.bz2 New: ---- gimp-lqr-plugin-0.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp-lqr-plugin.spec ++++++ --- /var/tmp/diff_new_pack.iuI61b/_old 2013-08-12 11:08:17.000000000 +0200 +++ /var/tmp/diff_new_pack.iuI61b/_new 2013-08-12 11:08:17.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gimp-lqr-plugin (Version 0.7.1) +# spec file for package gimp-lqr-plugin # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Peter Linnell # # All modifications and additions to the file contributed by third parties @@ -17,16 +17,15 @@ # - Name: gimp-lqr-plugin -Version: 0.7.1 -Release: 2 -License: GPL-2.0+ +Version: 0.7.2 +Release: 0 Summary: Content-aware resizing plug-in for GIMP -Url: http://liquidrescale.wikidot.com/ +License: GPL-2.0+ Group: Productivity/Graphics/Bitmap Editors -Source0: http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2 -BuildRequires: gimp-devel >= 2.4 +Url: http://liquidrescale.wikidot.com/ +Source0: http://liquidrescale.wdfiles.com/local--files/en:download-page-sources/%{name}-%{version}.tar.bz2 +BuildRequires: gimp-devel >= 2.8.0 BuildRequires: intltool BuildRequires: liblqr-devel >= 0.4.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +37,6 @@ %package -n gimp-plugin-lqr Summary: Content-aware resizing plug-in for GIMP -License: GPL-2.0+ Group: Productivity/Graphics/Bitmap Editors Provides: %{name} = %{version} Recommends: gimp-plugin-lqr-lang ++++++ gimp-lqr-plugin-0.7.1.tar.bz2 -> gimp-lqr-plugin-0.7.2.tar.bz2 ++++++ ++++ 4655 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/configure.ac new/gimp-lqr-plugin-0.7.2/configure.ac --- old/gimp-lqr-plugin-0.7.1/configure.ac 2010-06-05 19:01:06.000000000 +0200 +++ new/gimp-lqr-plugin-0.7.2/configure.ac 2013-08-05 15:05:28.000000000 +0200 @@ -8,7 +8,7 @@ dnl These three define the plug-in version number m4_define([plugin_major_version], [0]) m4_define([plugin_minor_version], [7]) -m4_define([plugin_micro_version], [1]) +m4_define([plugin_micro_version], [2]) m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version]) @@ -50,7 +50,7 @@ changequote([,])dnl -GIMP_REQUIRED_VERSION=2.4.0 +GIMP_REQUIRED_VERSION=2.8.0 PKG_CHECK_MODULES(GIMP, gimp-2.0 >= $GIMP_REQUIRED_VERSION gimpui-2.0 >= $GIMP_REQUIRED_VERSION) @@ -116,20 +116,20 @@ fi AC_MSG_RESULT($have_gtk_2_12) -if test "x$have_gtk_2_7" != "xyes"; then +if test "x$have_gtk_2_12" != "xyes"; then CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" fi -AC_MSG_CHECKING([if GIMP is version 2.4.0 or newer]) -if $PKG_CONFIG --atleast-version=2.4.0 gimp-2.0; then - have_gimp_2_4=yes +AC_MSG_CHECKING([if GIMP is version 2.8.0 or newer]) +if $PKG_CONFIG --atleast-version=2.8.0 gimp-2.0; then + have_gimp_2_8=yes else - have_gimp_2_4=no + have_gimp_2_8=no fi -AC_MSG_RESULT($have_gimp_2_4) +AC_MSG_RESULT($have_gimp_2_8) -if test "x$have_gimp_2_4" != "xyes"; then +if test "x$have_gimp_2_8" != "xyes"; then CPPFLAGS="$CPPFLAGS -DGIMP_DISABLE_DEPRECATED" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/po/Makefile.in.in new/gimp-lqr-plugin-0.7.2/po/Makefile.in.in --- old/gimp-lqr-plugin-0.7.1/po/Makefile.in.in 2010-06-06 01:52:00.000000000 +0200 +++ new/gimp-lqr-plugin-0.7.2/po/Makefile.in.in 2013-08-05 15:01:14.000000000 +0200 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/interface.c new/gimp-lqr-plugin-0.7.2/src/interface.c --- old/gimp-lqr-plugin-0.7.1/src/interface.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/interface.c 2013-08-05 15:06:03.000000000 +0200 @@ -98,7 +98,6 @@ GtkWidget *res_order_combo_box; GtkWidget *dlg; -/* GtkTooltips *dlg_tips; */ /*** Public functions ***/ @@ -120,7 +119,6 @@ GtkWidget *vbox2; GtkWidget *vbox3; GtkWidget *hbox; - //GtkWidget *hbox2; GtkWidget *frame; GtkWidget *notebook; gfloat wfactor, hfactor; @@ -141,8 +139,6 @@ GtkWidget *interactive_hbox; GtkWidget *interactive_icon; GtkWidget *interactive_label; - //GtkWidget *v_separator; - //GtkWidget *h_separator; GtkWidget *scaleback_mode_alignment; GtkWidget *scaleback_mode_event_box; GtkWidget *scaleback_mode_label; @@ -267,7 +263,6 @@ if (dialog_state->has_pos) { - //printf("move window, x,y=%i,%i\n", dialog_state->x, dialog_state->y); fflush(stdout); gtk_window_move (GTK_WINDOW(dlg), dialog_state->x, dialog_state->y); dialog_state->has_pos = FALSE; } @@ -321,7 +316,6 @@ preview_area = preview_area_create(&preview_data); - //gtk_container_add (GTK_CONTAINER (frame), preview_area); gtk_box_pack_start (GTK_BOX (vbox2), preview_area, FALSE, FALSE, 0); gtk_widget_show (preview_area); @@ -490,7 +484,6 @@ gtk_widget_show (interactive_hbox); interactive_icon = gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_LARGE_TOOLBAR); - //gtk_container_add (GTK_CONTAINER (interactive_button), interactive_icon); gtk_box_pack_start (GTK_BOX(interactive_hbox), interactive_icon, TRUE, FALSE, 0); gtk_widget_show (interactive_icon); interactive_label = gtk_label_new_with_mnemonic (_("_Interactive")); @@ -537,20 +530,6 @@ gtk_box_pack_start (GTK_BOX (thispage), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); - /* - new_layer_button = - gtk_check_button_new_with_label (_("Output on a new layer")); - - gtk_box_pack_start (GTK_BOX (vbox), new_layer_button, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (new_layer_button), - state->new_layer); - gtk_widget_show (new_layer_button); - - gimp_help_set_help_data (new_layer_button, - _("Outputs the resulting image " - "on a new layer"), NULL); - */ - output_target_event_box = gtk_event_box_new (); gtk_box_pack_start (GTK_BOX (vbox), output_target_event_box, FALSE, FALSE, 0); gtk_widget_show (output_target_event_box); @@ -1150,8 +1129,6 @@ GtkWidget *disc_frame_event_box2; GtkWidget *pres_combo_event_box; GtkWidget *disc_combo_event_box; - /* GtkTooltips *pres_frame_tips; */ - /* GtkTooltips *disc_frame_tips; */ gint32 old_layer_ID; GtkWidget *frame; GtkWidget *pres_vbox; @@ -1245,9 +1222,6 @@ "then press the \"Refresh\" button.\n" "Note that painting in black has no effect")); - /* pres_frame_tips = gtk_tooltips_new (); */ - - pres_vbox = gtk_vbox_new (FALSE, 4); gtk_container_add (GTK_CONTAINER (frame), pres_vbox); gtk_widget_show (pres_vbox); @@ -1268,9 +1242,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (pres_frame_event_box1), TRUE); gtk_widget_set_tooltip_text(pres_frame_event_box1, pres_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (pres_frame_tips), - pres_frame_event_box1, - pres_inactive_tip_string, NULL);*/ } @@ -1293,7 +1264,6 @@ _("Use an extra layer to preserve " "selected areas from distortion"), NULL); - //pres_edit_button = gtk_button_new_with_label (_("Edit")); pres_edit_button = gtk_button_new (); gtk_box_pack_end (GTK_BOX (hbox), pres_edit_button, FALSE, FALSE, 0); gtk_widget_show (pres_edit_button); @@ -1303,7 +1273,6 @@ gtk_widget_show (edit_hbox); edit_icon = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(pres_edit_button), edit_icon); gtk_box_pack_start (GTK_BOX(edit_hbox), edit_icon, TRUE, TRUE, 0); gtk_widget_show (edit_icon); edit_label = gtk_label_new (_("Edit")); @@ -1314,7 +1283,6 @@ _("Edit the currently selected preservation layer"), NULL); - //pres_new_button = gtk_button_new_with_label (_("New")); pres_new_button = gtk_button_new (); gtk_box_pack_end (GTK_BOX (hbox), pres_new_button, FALSE, FALSE, 0); gtk_widget_show (pres_new_button); @@ -1324,7 +1292,6 @@ gtk_widget_show (new_hbox); new_icon = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(pres_new_button), new_icon); gtk_box_pack_start (GTK_BOX(new_hbox), new_icon, TRUE, TRUE, 0); gtk_widget_show (new_icon); new_label = gtk_label_new (_("New")); @@ -1361,9 +1328,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (pres_frame_event_box2), TRUE); gtk_widget_set_tooltip_text(pres_frame_event_box2, pres_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (pres_frame_tips), - pres_frame_event_box2, - pres_inactive_tip_string, NULL);*/ } pres_vbox2 = gtk_vbox_new (FALSE, 4); @@ -1496,8 +1460,6 @@ "then press the \"Refresh\" button.\n" "Note that painting in black has no effect")); - /* disc_frame_tips = gtk_tooltips_new (); */ - disc_vbox = gtk_vbox_new (FALSE, 4); gtk_container_add (GTK_CONTAINER (frame), disc_vbox); @@ -1518,9 +1480,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (disc_frame_event_box1), TRUE); gtk_widget_set_tooltip_text(disc_frame_event_box1, disc_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (disc_frame_tips), - disc_frame_event_box1, - disc_inactive_tip_string, NULL);*/ } disc_button = gtk_check_button_new_with_label (_("Discard features")); @@ -1567,7 +1526,6 @@ gtk_widget_show (edit_hbox); edit_icon = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(disc_edit_button), edit_icon); gtk_box_pack_start (GTK_BOX(edit_hbox), edit_icon, TRUE, TRUE, 0); gtk_widget_show (edit_icon); edit_label = gtk_label_new (_("Edit")); @@ -1578,7 +1536,6 @@ _("Edit the currently selected discard layer"), NULL); - //disc_new_button = gtk_button_new_with_label (_("New")); disc_new_button = gtk_button_new (); gtk_box_pack_end (GTK_BOX (hbox), disc_new_button, FALSE, FALSE, 0); gtk_widget_show (disc_new_button); @@ -1588,7 +1545,6 @@ gtk_widget_show (new_hbox); new_icon = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(disc_new_button), new_icon); gtk_box_pack_start (GTK_BOX(new_hbox), new_icon, TRUE, TRUE, 0); gtk_widget_show (new_icon); new_label = gtk_label_new (_("New")); @@ -1624,9 +1580,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (disc_frame_event_box2), TRUE); gtk_widget_set_tooltip_text(disc_frame_event_box2, disc_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (disc_frame_tips), - disc_frame_event_box2, - disc_inactive_tip_string, NULL);*/ } disc_vbox2 = gtk_vbox_new (FALSE, 4); @@ -1842,7 +1795,6 @@ GtkWidget *rigmask_frame_event_box1; GtkWidget *rigmask_frame_event_box2; GtkWidget *rigmask_combo_event_box; - /* GtkTooltips *rigmask_frame_tips; */ gint32 old_layer_ID; GtkWidget *seams_control_expander; GtkWidget *operations_expander; @@ -1895,7 +1847,6 @@ { ui_state->rigmask_status = FALSE; state->rigmask_layer_ID = 0; - /* preview_data.rigmask_combo_awaked = FALSE; */ } thispage = gtk_vbox_new (FALSE, 12); @@ -1914,7 +1865,6 @@ /* Please keep the <b> and </b> tags in translations */ seams_control_expander = gtk_expander_new (_("<b>Seams control</b>")); gtk_expander_set_use_markup (GTK_EXPANDER(seams_control_expander), TRUE); - //gtk_expander_set_expanded (GTK_EXPANDER(seams_control_expander), ui_state->seams_control_expanded); gtk_expander_set_expanded (GTK_EXPANDER(seams_control_expander), TRUE); g_signal_connect (seams_control_expander, "activate", G_CALLBACK @@ -1930,9 +1880,6 @@ "then press the \"Refresh\" button.\n" "Note that painting in black has no effect")); - /* rigmask_frame_tips = gtk_tooltips_new (); */ - - rigmask_vbox = gtk_vbox_new (FALSE, 4); gtk_container_add (GTK_CONTAINER (seams_control_expander), rigmask_vbox); gtk_widget_show (rigmask_vbox); @@ -1990,9 +1937,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (rigmask_frame_event_box1), TRUE); gtk_widget_set_tooltip_text(rigmask_frame_event_box1, rigmask_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (rigmask_frame_tips), - rigmask_frame_event_box1, - rigmask_inactive_tip_string, NULL);*/ } @@ -2026,7 +1970,6 @@ ("Use an extra layer to mark areas where seams should be straighter"), NULL); - //rigmask_edit_button = gtk_button_new_with_label (_("Edit")); rigmask_edit_button = gtk_button_new (); gtk_box_pack_end (GTK_BOX (hbox), rigmask_edit_button, FALSE, FALSE, 0); gtk_widget_show (rigmask_edit_button); @@ -2036,7 +1979,6 @@ gtk_widget_show (edit_hbox); edit_icon = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(rigmask_edit_button), edit_icon); gtk_box_pack_start (GTK_BOX(edit_hbox), edit_icon, TRUE, TRUE, 0); gtk_widget_show (edit_icon); edit_label = gtk_label_new (_("Edit")); @@ -2047,7 +1989,6 @@ _("Edit the currently selected rigidity mask layer"), NULL); - //rigmask_new_button = gtk_button_new_with_label (_("New")); rigmask_new_button = gtk_button_new (); gtk_box_pack_end (GTK_BOX (hbox), rigmask_new_button, FALSE, FALSE, 0); gtk_widget_show (rigmask_new_button); @@ -2057,7 +1998,6 @@ gtk_widget_show (new_hbox); new_icon = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); - //gtk_container_add (GTK_CONTAINER(rigmask_new_button), new_icon); gtk_box_pack_start (GTK_BOX(new_hbox), new_icon, TRUE, TRUE, 0); gtk_widget_show (new_icon); new_label = gtk_label_new (_("New")); @@ -2092,9 +2032,6 @@ gtk_event_box_set_above_child (GTK_EVENT_BOX (rigmask_frame_event_box2), TRUE); gtk_widget_set_tooltip_text(rigmask_frame_event_box2, rigmask_inactive_tip_string); - /*gtk_tooltips_set_tip (GTK_TOOLTIPS (rigmask_frame_tips), - rigmask_frame_event_box2, - rigmask_inactive_tip_string, NULL);*/ } rigmask_vbox2 = gtk_vbox_new (FALSE, 4); @@ -2218,7 +2155,6 @@ /* Please keep the <b> and </b> tags in translations */ operations_expander = gtk_expander_new (_("<b>Operations control</b>")); gtk_expander_set_use_markup (GTK_EXPANDER(operations_expander), TRUE); - //gtk_expander_set_expanded (GTK_EXPANDER(operations_expander), ui_state->operations_expanded); gtk_expander_set_expanded (GTK_EXPANDER(operations_expander), TRUE); g_signal_connect (operations_expander, "activate", G_CALLBACK @@ -2316,6 +2252,5 @@ callback_set_disc_warning (no_disc_on_enlarge_button, (gpointer) & preview_data); - //return thispage; return scrollwindow; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/interface_I.c new/gimp-lqr-plugin-0.7.2/src/interface_I.c --- old/gimp-lqr-plugin-0.7.1/src/interface_I.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/interface_I.c 2013-08-05 15:06:03.000000000 +0200 @@ -41,11 +41,7 @@ /*** Constants ***/ -//#define SCALE_WIDTH (80) #define SPIN_BUTTON_WIDTH (75) -//#define MAX_COEFF (3000) -//#define MAX_RIGIDITY (1000) -//#define MAX_DELTA_X (10) #define SIZE_CHANGE_DELAY (400) #define READER_INTERVAL (20) @@ -55,19 +51,15 @@ /* Callbacks */ static void callback_dialog_I_response (GtkWidget * dialog, gint response_id, gpointer data); -//static void callback_noninter_button (GtkWidget * button, gpointer data); - static void callback_resetvalues_button (GtkWidget * button, gpointer data); static void callback_flatten_button (GtkWidget * button, gpointer data); static void callback_dump_button (GtkWidget * button, gpointer data); static void callback_show_info_button (GtkWidget * button, gpointer data); -//static void callback_set_disc_warning (GtkWidget * dummy, gpointer data); static gboolean check_size_changes(gpointer dummy); static void callback_size_changed (GtkWidget * size_entry, gpointer data); static void set_info_label_text (InterfaceIData * p_data); static void callback_alarm_triggered (GtkWidget * size_entry, gpointer data); -//static void callback_res_order_changed (GtkWidget * res_order, gpointer data); /*** Local variables ***/ @@ -78,10 +70,8 @@ PlugInDialogVals *dialog_state; gboolean features_are_sensitive; InterfaceIData interface_I_data; -//volatile sig_atomic_t interface_locked = 0; GtkWidget *dlg; -/* GtkTooltips *dlg_tips; */ GtkWidget *coordinates; gulong size_changed = 0; @@ -112,7 +102,6 @@ GtkWidget *pres_use_image; GtkWidget *disc_use_image; GtkWidget *rigmask_use_image; - //GtkWidget *noninter_button; GtkWidget *resetvalues_event_box; GtkWidget *resetvalues_button; GtkWidget *resetvalues_icon; @@ -126,10 +115,6 @@ GtkWidget *dump_event_box; GtkWidget *dump_button; GtkWidget *dump_icon; - //GtkWidget *lastvalues_event_box; - //GtkWidget *lastvalues_button; - //GtkWidget *lastvalues_icon; - gboolean has_mask = FALSE; GimpUnit unit; gdouble xres, yres; GtkWidget * v_separator; @@ -161,15 +146,8 @@ reader_go = TRUE; - if (gimp_layer_get_mask (layer_ID) != -1) - { - has_mask = TRUE; - } - dlg = gtk_dialog_new_with_buttons (_("GIMP LiquidRescale Plug-In"), NULL, 0, - //GIMP_STOCK_RESET, RESPONSE_RESET, - //GTK_STOCK_REFRESH, RESPONSE_REFRESH, GTK_STOCK_GO_BACK, RESPONSE_NONINTERACTIVE, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); @@ -179,7 +157,6 @@ if (dialog_state->has_pos) { - //printf("move window, x,y=%i,%i\n", dialog_state->x, dialog_state->y); fflush(stdout); gtk_window_move (GTK_WINDOW(dlg), dialog_state->x, dialog_state->y); dialog_state->has_pos = FALSE; } @@ -187,8 +164,6 @@ g_signal_connect (dlg, "response", G_CALLBACK (callback_dialog_I_response), (gpointer) (NULL)); - /* dlg_tips = gtk_tooltips_new (); */ - main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG (dlg))), main_hbox); @@ -408,29 +383,15 @@ interface_I_data.dump_button = dump_button; info_label = gtk_label_new(""); - //set_info_label_text (info_label, orig_width, orig_height, 0, 0, state->enl_step / 100); gtk_label_set_selectable(GTK_LABEL(info_label), TRUE); - //gtk_container_add (GTK_CONTAINER (info_frame), info_label); gtk_box_pack_start (GTK_BOX (hbox), info_label, TRUE, TRUE, 0); gtk_label_set_justify(GTK_LABEL (info_label), GTK_JUSTIFY_LEFT); gtk_widget_show (info_label); - //interface_I_data.info_frame = info_frame; interface_I_data.info_label = info_label; callback_show_info_button(show_info_button, (gpointer) &interface_I_data); - - /* - noninter_button = gtk_button_new_with_mnemonic ("_Non-interactive"); - - g_signal_connect (GTK_BUTTON (noninter_button), "clicked", - G_CALLBACK (callback_noninter_button), (gpointer) dlg); - - gtk_box_pack_start (GTK_BOX (vbox2), noninter_button, FALSE, FALSE, 0); - gtk_widget_show (noninter_button); - */ - /* Initialize the carver */ AUX_LAYER_STATUS(state->pres_layer_ID, ui_state->pres_status); @@ -450,7 +411,6 @@ set_info_label_text (&interface_I_data); - //set_alarm (ALARM_DELAY); size_changed = 1; /* register size reader */ @@ -508,7 +468,6 @@ static void callback_dialog_I_response (GtkWidget * dialog, gint response_id, gpointer data) { - //ResponseData * r_data = RESPONSE_DATA (data); switch (response_id) { case RESPONSE_NONINTERACTIVE: @@ -530,13 +489,11 @@ static gboolean check_size_changes(gpointer dummy) { - //printf("."); fflush(stdout); if (size_changed > 0) { size_changed++; if ((size_changed - 1) * READER_INTERVAL > SIZE_CHANGE_DELAY) { - //printf("RENDER!\n"); fflush(stdout); g_signal_emit_by_name (coordinates, "coordinates-alarm"); size_changed = 0; } @@ -551,7 +508,6 @@ gboolean render_success; InterfaceIData *p_data = INTERFACE_I_DATA (data); CarverData *c_data = p_data->carver_data; - //gtk_widget_set_sensitive (p_data->size_frame, FALSE); new_width = ROUND (alt_size_entry_get_refval (ALT_SIZE_ENTRY (size_entry), 0)); @@ -562,7 +518,6 @@ gimp_image_undo_group_start (c_data->image_ID); render_success = render_interactive (state, p_data->carver_data); gimp_image_undo_group_end (c_data->image_ID); - /* p_data->drawable_vals->layer_ID = c_data->layer_ID; */ if (!render_success) { dialog_I_response = RESPONSE_FATAL; @@ -571,14 +526,9 @@ gimp_displays_flush(); set_info_label_text (p_data); - //set_info_label_text (p_data->info_label, c_data->ref_w, c_data->ref_h, c_data->orientation, c_data->depth, c_data->enl_step); - //gtk_widget_set_sensitive (p_data->dump_button, (c_data->depth != 0)); - //gtk_widget_set_sensitive (p_data->size_frame, TRUE); - } static void -//set_info_label_text (GtkWidget * label, gint ref_w, gint ref_h, gint orientation, gint depth, gfloat enl_step) set_info_label_text (InterfaceIData * p_data) { gchar label_text[MAX_STRING_SIZE]; @@ -631,11 +581,9 @@ text_enl_step, esmax, text_size_tag_close ); - //label_text[MAX_STRING_SIZE - 1] = '\0'; gtk_label_set_markup(GTK_LABEL(p_data->info_label), label_text); gtk_widget_set_sensitive (p_data->dump_button, (c_data->depth != 0) && (c_data->base_type == GIMP_RGB)); - } static void @@ -682,7 +630,6 @@ gimp_displays_flush(); set_info_label_text (p_data); - //set_info_label_text (p_data->info_label, c_data->ref_w, c_data->ref_h, c_data->orientation, c_data->depth, c_data->enl_step); } @@ -702,26 +649,4 @@ gtk_main_quit(); } gimp_displays_flush(); - - //set_info_label_text (p_data->info_label, c_data->ref_w, c_data->ref_h, c_data->orientation, c_data->depth, c_data->enl_step); - -} - -#if 0 -static void -callback_res_order_changed (GtkWidget * res_order, gpointer data) -{ - gint order; - PreviewData *p_data = PREVIEW_DATA (data); - gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (res_order), &order); - p_data->vals->res_order = order; - callback_set_disc_warning (NULL, data); } - -static void -callback_noninter_button (GtkWidget * button, gpointer data) -{ - gtk_dialog_response (GTK_DIALOG (data), RESPONSE_NONINTERACTIVE); -} -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/interface_I.h new/gimp-lqr-plugin-0.7.2/src/interface_I.h --- old/gimp-lqr-plugin-0.7.1/src/interface_I.h 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/interface_I.h 2013-08-05 15:06:03.000000000 +0200 @@ -25,7 +25,6 @@ typedef struct { GtkWidget * coordinates; - //GtkWidget * size_frame; GtkWidget * info_label; GtkWidget * dump_button; PlugInColVals * col_vals; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/interface_aux.c new/gimp-lqr-plugin-0.7.2/src/interface_aux.c --- old/gimp-lqr-plugin-0.7.1/src/interface_aux.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/interface_aux.c 2013-08-05 15:06:03.000000000 +0200 @@ -43,7 +43,6 @@ /* Callbacks */ static void callback_dialog_aux_response (GtkWidget * dialog, gint response_id, gpointer data); -//static void callback_noninter_button (GtkWidget * button, gpointer data); /*** Local variables ***/ @@ -112,7 +111,6 @@ if (dialog_state->has_pos) { - //printf("move window, x,y=%i,%i\n", dialog_state->x, dialog_state->y); fflush(stdout); gtk_window_move (GTK_WINDOW(dlg), dialog_state->x, dialog_state->y); dialog_state->has_pos = FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/io_functions.c new/gimp-lqr-plugin-0.7.2/src/io_functions.c --- old/gimp-lqr-plugin-0.7.1/src/io_functions.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/io_functions.c 2013-08-05 15:06:03.000000000 +0200 @@ -227,7 +227,7 @@ gimp_layer_new (image_ID, name, w, h, GIMP_RGBA_IMAGE, 100, GIMP_NORMAL_MODE); gimp_drawable_fill (seam_layer_ID, GIMP_TRANSPARENT_FILL); - gimp_image_add_layer (image_ID, seam_layer_ID, -1); + gimp_image_insert_layer (image_ID, seam_layer_ID, 0, -1); gimp_layer_translate (seam_layer_ID, x_off, y_off); if (seam_layer_p) { @@ -312,35 +312,3 @@ return lqr_vmap_list_foreach (list, write_vmap_to_layer, (gpointer) (&data)); } - - -/* plot the energy (at current size / visibility) to a file - * (greyscale) */ -LqrRetVal -write_energy (LqrCarver * r /*, pngwriter& output */ ) -{ - int x, y; - //double e; - - /* external_resize(r->w, r->h); */ - - lqr_carver_scan_reset (r); - for (y = 1; y <= lqr_carver_get_height(r); y++) - { - for (x = 1; x <= lqr_carver_get_width(r); x++) - { - //e = r->en[r->c->now]; - if (lqr_carver_scan_by_row(r)) - { - /* external_write(x, y, e, e, e); */ - } - else - { - /* external_write(y, x, e, e, e); */ - } - //lqr_carver_read_next (r); - } - } - - return LQR_OK; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/io_functions.h new/gimp-lqr-plugin-0.7.2/src/io_functions.h --- old/gimp-lqr-plugin-0.7.1/src/io_functions.h 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/io_functions.h 2013-08-05 15:06:03.000000000 +0200 @@ -51,7 +51,5 @@ LqrRetVal write_all_vmaps (LqrVMapList * list, gint32 image_ID, gchar * orig_name, gint x_off, gint y_off, GimpRGB col_start, GimpRGB col_end); -/* unimplemented */ -LqrRetVal write_energy (LqrCarver * r /*, pngwriter& output */ ); /* output the energy */ #endif /* __IO_FUNCTIONS__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/layers_combo.c new/gimp-lqr-plugin-0.7.2/src/layers_combo.c --- old/gimp-lqr-plugin-0.7.1/src/layers_combo.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/layers_combo.c 2013-08-05 15:06:03.000000000 +0200 @@ -36,10 +36,9 @@ gint count_extra_layers (gint32 image_ID) { - gint32 *layer_array; gint num_layers; - layer_array = gimp_image_get_layers (image_ID, &num_layers); + gimp_image_get_layers (image_ID, &num_layers); return num_layers - 1; } @@ -199,7 +198,7 @@ gimp_layer_new (p_data->image_ID, nl_data->name, p_data->old_width, p_data->old_height, image_type, 50, GIMP_NORMAL_MODE); - gimp_image_add_layer (p_data->image_ID, layer_ID, -1); + gimp_image_insert_layer (p_data->image_ID, layer_ID, 0, -1); gimp_drawable_fill (layer_ID, GIMP_TRANSPARENT_FILL); gimp_layer_translate (layer_ID, p_data->x_off, p_data->y_off); gimp_image_undo_group_end (p_data->image_ID); @@ -391,5 +390,3 @@ return new_size; } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/layers_combo.h new/gimp-lqr-plugin-0.7.2/src/layers_combo.h --- old/gimp-lqr-plugin-0.7.1/src/layers_combo.h 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/layers_combo.h 2013-08-05 15:06:03.000000000 +0200 @@ -39,7 +39,6 @@ GtkWidget *guess_button_hor; GtkWidget *guess_button_ver; GtkWidget *edit_button; - //GtkWidget *guess_dir_combo; } ToggleData; #define TOGGLE_DATA(data) ((ToggleData*)data) @@ -81,4 +80,3 @@ gint guess_new_size (GtkWidget * button, PreviewData * data, GuessDir direction); #endif /* __COMBO_H__ */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/main.c new/gimp-lqr-plugin-0.7.2/src/main.c --- old/gimp-lqr-plugin-0.7.1/src/main.c 2010-06-05 19:01:28.000000000 +0200 +++ new/gimp-lqr-plugin-0.7.2/src/main.c 2013-08-05 15:06:03.000000000 +0200 @@ -249,7 +249,6 @@ { static GimpParam values[1]; gint32 layer_ID; - //gint32 active_channel_ID; gint32 image_ID; GimpRunMode run_mode; @@ -500,7 +499,7 @@ static void retrieve_vals (void) { - /* Possibly retrieve data */ + /* Possibly retrieve data */ gimp_get_data (DATA_KEY_VALS, &vals); gimp_get_data (DATA_KEY_UI_VALS, &ui_vals); gimp_get_data (DATA_KEY_COL_VALS, &col_vals); @@ -509,7 +508,7 @@ static void retrieve_vals_use_aux_layers_names (gint32 image_ID) { - /* Possibly retrieve data and set aux layers from names */ + /* Possibly retrieve data and set aux layers from names */ retrieve_vals(); vals.pres_layer_ID = layer_from_name(image_ID, vals.pres_layer_name); @@ -588,9 +587,6 @@ { ui_vals.rigmask_status = TRUE; } - //printf("RNIN: lid=%i pres=%i disc=%i rmask=%i\n", aux_selected_layer_ID, aux_pres_layer_ID, aux_disc_layer_ID, aux_rigmask_layer_ID); fflush(stdout); - //printf("RNIN: lid=%i pres=%i disc=%i rmask=%i\n", drawable_vals.layer_ID, vals.pres_layer_ID, vals.disc_layer_ID, vals.rigmask_layer_ID); fflush(stdout); - } static void @@ -677,4 +673,3 @@ return ret; } #endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/main.h new/gimp-lqr-plugin-0.7.2/src/main.h --- old/gimp-lqr-plugin-0.7.1/src/main.h 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/main.h 2013-08-05 15:06:03.000000000 +0200 @@ -125,8 +125,8 @@ extern const PlugInUIVals default_ui_vals; extern const PlugInColVals default_col_vals; + /* Convenience macros for checking */ -; #define IMAGE_CHECK_ACTION(image_ID, action, ret_val) G_STMT_START { \ if (!gimp_image_is_valid (image_ID)) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/preview.c new/gimp-lqr-plugin-0.7.2/src/preview.c --- old/gimp-lqr-plugin-0.7.1/src/preview.c 2010-05-04 04:59:48.000000000 +0200 +++ new/gimp-lqr-plugin-0.7.2/src/preview.c 2013-08-05 15:06:03.000000000 +0200 @@ -259,4 +259,3 @@ NULL); } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/preview.h new/gimp-lqr-plugin-0.7.2/src/preview.h --- old/gimp-lqr-plugin-0.7.1/src/preview.h 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/preview.h 2013-08-05 15:06:03.000000000 +0200 @@ -103,4 +103,3 @@ GtkWidget *pres_use_image, GtkWidget *disc_use_image, GtkWidget *rigmask_use_image); #endif /* __PREVIEW_H__ */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gimp-lqr-plugin-0.7.1/src/render.c new/gimp-lqr-plugin-0.7.2/src/render.c --- old/gimp-lqr-plugin-0.7.1/src/render.c 2010-03-21 19:50:29.000000000 +0100 +++ new/gimp-lqr-plugin-0.7.2/src/render.c 2013-08-05 15:06:03.000000000 +0200 @@ -34,11 +34,10 @@ #if 0 -#define __CLOCK_IT__ +# define __CLOCK_IT__ #endif /* Convenience macros for checking and general cleanup */ -; #define MEM_CHECK_N(x) if ((x) == NULL) { g_message(_("Not enough memory")); return NULL; } #define MEM_CHECK1_N(x) if ((x) == LQR_NOMEM) { g_message(_("Not enough memory")); return NULL; } @@ -172,7 +171,7 @@ { g_snprintf (new_layer_name, LQR_MAX_NAME_LENGTH, "%s LqR", layer_name); layer_ID = gimp_layer_copy (layer_ID); - gimp_image_add_layer (image_ID, layer_ID, -1); + gimp_image_insert_layer (image_ID, layer_ID, 0, -1); gimp_drawable_set_name (layer_ID, new_layer_name); gimp_drawable_set_visible (layer_ID, FALSE); } @@ -181,7 +180,7 @@ image_ID = gimp_image_new (old_width, old_height, gimp_image_base_type(image_ID)); gimp_image_undo_group_start(image_ID); layer_ID = gimp_layer_new_from_drawable (layer_ID, image_ID); - gimp_image_add_layer (image_ID, layer_ID, -1); + gimp_image_insert_layer (image_ID, layer_ID, 0, -1); gimp_layer_translate(layer_ID, -x_off, -y_off); gimp_drawable_set_visible (layer_ID, TRUE); if (vals->resize_aux_layers) @@ -694,7 +693,6 @@ gint32 layer_ID; gchar layer_name[LQR_MAX_NAME_LENGTH]; gchar vmap_name[LQR_MAX_NAME_LENGTH]; - gint old_width, old_height; gint x_off, y_off; GimpRGB colour_start, colour_end; #ifdef __CLOCK_IT__ @@ -718,9 +716,6 @@ g_snprintf (layer_name, LQR_MAX_NAME_LENGTH, "%s", gimp_drawable_get_name (layer_ID)); - old_width = gimp_drawable_width (layer_ID); - old_height = gimp_drawable_height (layer_ID); - gimp_drawable_offsets (layer_ID, &x_off, &y_off); #ifdef __CLOCK_IT__ @@ -758,7 +753,6 @@ printf ("[ finish: %g ]\n\n", clock3 - clock2); #endif /* __CLOCK_IT__ */ - //gimp_drawable_set_visible (layer_ID, TRUE); gimp_image_set_active_layer (image_ID, layer_ID); return TRUE; @@ -852,14 +846,12 @@ { gint32 old_layer_ID; gint32 new_layer_ID; - /* gint aux_x_off, aux_y_off; */ old_layer_ID = *layer_ID_p; if (old_layer_ID) { new_layer_ID = gimp_layer_new_from_drawable (old_layer_ID, image_ID); - gimp_image_add_layer (image_ID, new_layer_ID, -1); - /* gimp_drawable_offsets (old_layer_ID, &aux_x_off, &aux_y_off); */ + gimp_image_insert_layer (image_ID, new_layer_ID, 0, -1); gimp_layer_translate (new_layer_ID, -x_off, -y_off); } else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
