Added rescale order option (and updated help + it.po)

Also added conflict with gimp-plugin-registry,
and switched to 0.4.0 in configure.in

ChangeLog

@@ -2,6 +2,7 @@
 	* new : seam max step option
 	* new : auto size button for object removal
 	* new : added new operational modes (LqR back, scale back)
+	* new : added rescale order option
 	* bugfix : layer validity check is now working in GIMP 2.4
 	* bugfix : all layers are now transposed correctly
 2007-11-09 Carlo Baldassi <carlobaldassi@yahoo.it>

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gimp-lqr-plugin 0.3.1.
+# Generated by GNU Autoconf 2.61 for gimp-lqr-plugin 0.4.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gimp-lqr-plugin'
 PACKAGE_TARNAME='gimp-lqr-plugin'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='gimp-lqr-plugin 0.3.1'
+PACKAGE_VERSION='0.4.0'
+PACKAGE_STRING='gimp-lqr-plugin 0.4.0'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/main.c"
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gimp-lqr-plugin 0.3.1 to adapt to many kinds of systems.
+\`configure' configures gimp-lqr-plugin 0.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1335,7 +1335,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gimp-lqr-plugin 0.3.1:";;
+     short | recursive ) echo "Configuration of gimp-lqr-plugin 0.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1423,7 +1423,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gimp-lqr-plugin configure 0.3.1
+gimp-lqr-plugin configure 0.4.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1437,7 +1437,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gimp-lqr-plugin $as_me 0.3.1, which was
+It was created by gimp-lqr-plugin $as_me 0.4.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1809,12 +1809,12 @@ _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define PLUGIN_MINOR_VERSION 3
+#define PLUGIN_MINOR_VERSION 4
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define PLUGIN_MICRO_VERSION 1
+#define PLUGIN_MICRO_VERSION 0
 _ACEOF
 
 
@@ -2139,7 +2139,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gimp-lqr-plugin'
- VERSION='0.3.1'
+ VERSION='0.4.0'
 
 
 # Some tools Automake needs.
@@ -8418,7 +8418,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gimp-lqr-plugin $as_me 0.3.1, which was
+This file was extended by gimp-lqr-plugin $as_me 0.4.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8471,7 +8471,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gimp-lqr-plugin config.status 0.3.1
+gimp-lqr-plugin config.status 0.4.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -7,8 +7,8 @@ m4_define([plugin_name], [gimp-lqr-plugin])
 
 dnl These three define the plug-in version number
 m4_define([plugin_major_version], [0])
-m4_define([plugin_minor_version], [3])
-m4_define([plugin_micro_version], [1])
+m4_define([plugin_minor_version], [4])
+m4_define([plugin_micro_version], [0])
 
 m4_define([plugin_version],
           [plugin_major_version.plugin_minor_version.plugin_micro_version])

debian.in/gutsy/debian.template/control

@@ -8,6 +8,7 @@ Standards-Version: 3.7.2
 Package: gimp-lqr-plugin
 Architecture: any
 Depends: gimp (>=2.4), ${shlibs:Depends}
+Conflicts: gimp-plugin-registry
 Description: GIMP Liquid Rescale plugin
  This GIMP plugin is an implementation of the
  "seam carving for content-aware image resizing"

debian.in/hardy/debian.template/control

@@ -8,6 +8,7 @@ Standards-Version: 3.7.2
 Package: gimp-lqr-plugin
 Architecture: any
 Depends: gimp (>=2.4), ${shlibs:Depends}
+Conflicts: gimp-plugin-registry
 Description: GIMP Liquid Rescale plugin
  This GIMP plugin is an implementation of the
  "seam carving for content-aware image resizing"

help/en/index.html

@@ -51,10 +51,8 @@ <h3>Select new width and height</h3>
 		<div>
 			In this section it is possible to choose the size and the mode of operation.
 			It is advisable to rescale always in one direction at a time. If both 
-			the width and the height are changed, rescaling is always performed on the width first,
-			then on the height (for no particular reason).
-			The reverse order can be obtained by simply applying it twice, letting the width
-			unchanged the first time, and the height the second.
+			the width and the height are changed, rescaling is performed by default on the
+			width first, then on the height. This can be changed in the <i>Advanced</i> tab.
 		</div>
 		<div>
 			The default operational mode is just liquid rescaling to the desired size.
@@ -93,12 +91,12 @@ <h4>Quick guide</h4>
 		the final size atuomatically.
 	</p>
 	<p>
-		<b>Note:</b> discarding a feature implies that it will be removed if shrinking
+		<b>Note #1:</b> discarding a feature implies that it will be removed if shrinking
 		the layer, but it will be inflated if enlarging it, since it will be treated
 		as unimportant background which can be removed or expanded as needed.
 	</p>
 	<p>
-		<b>Note:</b> preservation of features is not possible if enlarging too much,
+		<b>Note #2:</b> preservation of features is not possible if enlarging too much,
 		because the inflation process is the exact reverse of the shrinking process,
 		so the maximum amount of pixels you can add to a layer corresponds to the 
 		amount of pixels which are not protected. For example, if you have a 1000 pixel
@@ -205,7 +203,9 @@ <h3>Advanced</h3>
 	<p>
 		<b>Seams rigidity. </b>
 		Use this value to give a negative bias to the seams which are not straight. May be useful
-		to prevent distortions in some situations. It automatically accounts for the image size.
+		to prevent distortions in some situations, or to avoid artifacts from pixel skipping.
+		The bias is proportional to the difference in the transversal coordinate between each
+		two successive points, elevated to the power of 1.5, and summed up for the whole seam.
 	</p>
 	<p>
 		<div>
@@ -219,8 +219,7 @@ <h3>Advanced</h3>
 		<div>
 			Increasing the step value lets you overcome this limit, but may lead to the
 			introduction of artifacts. In order to balance the situation, you can use
-			the rigidity setting: this will give a bias to the steps proportional
-			to their absolute value to the power of 1.5.
+			the rigidity setting.
 		</div>
 	<p>
 		<b>Gradient function. </b>
@@ -234,6 +233,12 @@ <h3>Advanced</h3>
 		mask can be used to override completely the automatic feature detection, thus
 		allowing the user to generate his own energy map (e.g. by another plugin).
 	</p>
+	<p>
+		<b>Rescale order. </b>
+		When rescaling in both directions at the same time, it can be choosen whether to resize
+		first in the horizontal and then in the vertical direction, or vice versa.
+		If the mode of operation is "Lqr + Lqr back to the original size", the order is reversed
+		when scaling back.
       </td>
     </tr>
   </table>