fix symmetry singularities by enforcing maxforms from the beginning instead of the end

wrong redirection (#20 )
* updated for aclocal 1.15 * libtool update after configure * aclocal needed refresh * localhost * color speed is a motion element variable * if mult motion elements present, was not using correct vals * wrong element reference
2025-04-03 17:41:50 -04:00 · 2024-12-31 09:58:26 -05:00 · 2018-04-12 15:27:33 -04:00 · 2018-04-12 08:08:35 -04:00 · 2018-04-07 15:19:45 -04:00 · 2015-08-03 18:26:08 -06:00
20 changed files with 16510 additions and 8611 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies

-SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"'
-AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF)
+GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
+AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)

 ACLOCAL_AMFLAGS = -I m4

--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -18,7 +18,17 @@


 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@ -84,11 +94,6 @@ host_triplet = @host@
 bin_PROGRAMS = flam3-animate$(EXEEXT) flam3-genome$(EXEEXT) \
 	flam3-render$(EXEEXT) flam3-convert$(EXEEXT)
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in mkinstalldirs $(srcdir)/flam3.pc.in \
-	$(include_HEADERS) COPYING compile config.guess config.sub \
-	install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@ -96,6 +101,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -228,6 +235,9 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/flam3.pc.in COPYING compile config.guess config.sub \
+	install-sh ltmain.sh missing mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -261,6 +271,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@ -283,7 +294,9 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@ -310,6 +323,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -342,7 +356,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@ -350,6 +363,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -359,8 +373,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"'
-AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF)
+GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
+AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
 ACLOCAL_AMFLAGS = -I m4
 man1_MANS = flam3-animate.man flam3-genome.man flam3-render.man flam3-convert.man
 lib_LTLIBRARIES = libflam3.la
@ -404,7 +418,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@ -787,15 +800,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)

 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)

 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@ -831,17 +844,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@ -1036,6 +1049,8 @@ uninstall-man: uninstall-man1
 	uninstall-man uninstall-man1 uninstall-pkgconfigDATA \
 	uninstall-pkgdataDATA

+.PRECIOUS: Makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/README.txt
+++ b/README.txt
@ -315,6 +315,10 @@ todo:  eliminate all static storage.

 changelog:

+5/17/15 Added hsv_circular and hsv_rgb_palette_blend.  Improved
+   edit history of genetic algorithm (keep track of generation).
+   Add find_parents operator to flam3-genome.  Release as 3.1.1.
+
 12/29/10 Added --version option to flam3-genome.  fixed bug in 16 bpc
   png image writing when using strips.  xform opacity now affects
   calculated width of density estimation filters.  Release as 3.0.1.
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])

-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.

 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@ -574,6 +573,9 @@ END
    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
  fi
 fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])

 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@ -603,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -614,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
  case $am_aux_dir in
  *\ * | *\	*)
    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@ -624,7 +626,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])

-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -645,7 +647,7 @@ AC_SUBST([am__leading_dot])])

 # Check to see how 'make' treats includes.	            -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -695,7 +697,7 @@ rm -f confinc confmf

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -736,7 +738,7 @@ fi
 # Obsolete and "removed" macros, that must however still report explicit
 # error messages when used, to smooth transition.
 #
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -763,7 +765,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])

 # Helper functions for option handling.                     -*- Autoconf -*-

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -792,7 +794,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -839,7 +841,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -858,7 +860,7 @@ AC_DEFUN([AM_RUN_LOG],

 # Check to make sure that the build environment is sane.    -*- Autoconf -*-

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -939,7 +941,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])

-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -999,7 +1001,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])

-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1027,7 +1029,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1046,7 +1048,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

 # Check how to create a tarball.                            -*- Autoconf -*-

-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/2
+++ b/2
@ -1 +1 @@
-/usr/share/automake-1.14/compile
+/usr/share/automake-1.15/compile
--- a/config.h
+++ b/config.h
@ -52,8 +52,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1

-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"

 /* Name of package */
@ -84,7 +83,7 @@
 #define TIME_WITH_SYS_TIME 1

 /* Version number of package */
-#define VERSION "3.0.1"
+#define VERSION "3.1.1"

 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
--- a/config.h.in
+++ b/config.h.in
@ -51,8 +51,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR

 /* Name of package */
--- a/3992
+++ b/3992
--- a/configure.ac
+++ b/configure.ac
@ -5,7 +5,7 @@ AC_INIT(flam3-animate.c)
 AM_CONFIG_HEADER(config.h)
 AC_ARG_ENABLE(pthread, [  --enable-pthread        compile FLAM3 with threads enabled (default=yes)])
 AC_ARG_ENABLE(atomic_ops, [  --enable-atomic-ops     compile FLAM3 with atom ops enabled (default=yes, independently checks for 32 and 64 bit sizes)])
-AM_INIT_AUTOMAKE(flam3,"3.0.1")
+AM_INIT_AUTOMAKE(flam3,"3.1.1")

 AC_CONFIG_MACRO_DIR([m4])

--- a/flam3-genome.c
+++ b/flam3-genome.c
@ -39,6 +39,7 @@ void test_cp(flam3_genome *cp) {
   cp->time = 0.0;
   cp->interpolation = flam3_interpolation_linear;
   cp->palette_interpolation = flam3_palette_interpolation_hsv;
+   cp->hsv_rgb_palette_blend = 0.0;
   cp->background[0] = 0.0;
   cp->background[1] = 0.0;
   cp->background[2] = 0.0;
@ -248,7 +249,8 @@ void spin(int frame, double blend, flam3_genome *parent, flam3_genome *templ)
   /* Set genome parameters accordingly */
   result->time = (double)frame;
   result->interpolation = flam3_interpolation_linear;
-   result->palette_interpolation = flam3_palette_interpolation_hsv;
+   result->palette_interpolation = flam3_palette_interpolation_hsv_circular;
+   result->hsv_rgb_palette_blend = 0.0;

   /* Force linear interpolation - unsure if this is still necessary     */
   /* I believe we put this in so that older clients could render frames */
@ -1129,7 +1131,7 @@ main(argc, argv)
         if (maxforms && atoi(maxforms)) {
            cp_save.symmetry = 0;
            while (cp_save.num_xforms > atoi(maxforms))
-               flam3_delete_xform(&cp_save, cp_save.num_xforms - 1);
+		flam3_delete_xform(&cp_save, 0);
         }
      }

--- a/flam3.c
+++ b/flam3.c
@ -61,8 +61,8 @@

 char *flam3_version() {

-  if (strcmp(SVN_REV, "exported"))
-    return flam3_os "-" VERSION "." SVN_REV;
+  if (strcmp(GIT_REV, ""))
+    return flam3_os "-" GIT_REV;
  return flam3_os "-" VERSION;
 }

@ -480,7 +480,7 @@ flam3_genome *sheep_edge(flam3_genome *cp, double blend, int seqflag, double sta
      flam3_rotate(&spun[0], blend*360.0, spun[0].interpolation_type);
      flam3_rotate(&spun[1], blend*360.0, spun[0].interpolation_type);

-      fprintf(stderr, "xyzzy %d %d\n", spun[0].palette_interpolation, spun[1].palette_interpolation);
+      //fprintf(stderr, "xyzzy %d %d\n", spun[0].palette_interpolation, spun[1].palette_interpolation);

      /* Now call the interpolation */
      if (argi("unsmoother",0) == 0)
@ -570,8 +570,8 @@ void apply_motion_parameters(flam3_xform *xf, flam3_xform *addto, double blend)
   /* Loop over the motion elements and add their contribution to the original vals */
   for (i=0; i<xf->num_motion; i++) {   
   
-      freq = mot->motion_freq;
-      func = mot->motion_func;
+      freq = mot[i].motion_freq;
+      func = mot[i].motion_func;
      
      APPMOT(density); /* Must ensure > 0 after all is applied */
      APPMOT(color); /* Must ensure [0,1] after all is applied */
@ -785,7 +785,8 @@ void flam3_interpolate(flam3_genome cps[], int ncps,
   result->time = time;
   result->interpolation = flam3_interpolation_linear;
   result->interpolation_type = cpi[0].interpolation_type;
-   result->palette_interpolation = flam3_palette_interpolation_hsv;
+   result->palette_interpolation = flam3_palette_interpolation_hsv_circular;
+   result->hsv_rgb_palette_blend = 0.0;

   if (!smoothflag) {
       flam3_interpolate_n(result, 2, cpi, c, stagger);
@ -1281,7 +1282,8 @@ void clear_cp(flam3_genome *cp, int default_flag) {
    cp->rotate = 0.0;
    cp->pixels_per_unit = 50;
    cp->interpolation = flam3_interpolation_linear;
-    cp->palette_interpolation = flam3_palette_interpolation_hsv;
+    cp->palette_interpolation = flam3_palette_interpolation_hsv_circular;
+    cp->hsv_rgb_palette_blend = 0.0;

    cp->genome_index = 0;
    memset(cp->parent_fname,0,flam3_parent_fn_len);
@ -1618,6 +1620,8 @@ void flam3_apply_template(flam3_genome *cp, flam3_genome *templ) {
      cp->palette_mode = templ->palette_mode;
   if (templ->palette_interpolation >= 0)
      cp->palette_interpolation = templ->palette_interpolation;
+   if (templ->hsv_rgb_palette_blend >= 0)
+      cp->hsv_rgb_palette_blend = templ->hsv_rgb_palette_blend;

 }

@ -1635,7 +1639,7 @@ char *flam3_print_to_string(flam3_genome *cp) {
 #ifdef _WIN32       
       // This might be a permissions problem, so let's try to open a
       // tempfile in the env var TEMP's area instead
-       tmp_path = getenv("TEMP");
+       char* tmp_path = getenv("TEMP");

       if (tmp_path != NULL) {
          strcpy(tmpnam, tmp_path);
@ -1785,8 +1789,13 @@ void flam3_print(FILE *f, flam3_genome *cp, char *extra_attributes, int print_ed
       fprintf(f, " palette_interpolation=\"sweep\"");
   else if (flam3_palette_interpolation_rgb == cp->palette_interpolation)
       fprintf(f, " palette_interpolation=\"rgb\"");
-   else if (flam3_palette_interpolation_hsv2 == cp->palette_interpolation)
-       fprintf(f, " palette_interpolation=\"hsv2\"");
+   else if (flam3_palette_interpolation_hsv == cp->palette_interpolation)
+       fprintf(f, " palette_interpolation=\"hsv\"");
+   else if (flam3_palette_interpolation_hsv_circular == cp->palette_interpolation) {
+       fprintf(f, " palette_interpolation=\"hsv_circular\"");
+       if (cp->hsv_rgb_palette_blend > 0.0)
+           fprintf(f, " hsv_rgb_palette_blend=\"%g\"", cp->hsv_rgb_palette_blend);
+   }

   if (extra_attributes)
      fprintf(f, " %s", extra_attributes);
@ -1928,7 +1937,7 @@ void flam3_print_xform(FILE *f, flam3_xform *x, int final_flag, int numstd, doub
   
   if (flam27_flag)
      fprintf(f, "symmetry=\"%g\" ", 1.0-2.0*x->color_speed);
-   else if (!motion_flag)   
+   else if (!motion_flag || x->color_speed != 0.0)
      fprintf(f, "color_speed=\"%g\" ", x->color_speed);
   
   if (!final_flag && !motion_flag && !flam27_flag)
@ -3087,7 +3096,8 @@ void flam3_random(flam3_genome *cp, int *ivars, int ivars_n, int sym, int spec_x
      fprintf(stderr,"error getting palette from xml file, setting to all white\n");
   cp->time = 0.0;
   cp->interpolation = flam3_interpolation_linear;
-   cp->palette_interpolation = flam3_palette_interpolation_hsv;
+   cp->palette_interpolation = flam3_palette_interpolation_hsv_circular;
+   cp->hsv_rgb_palette_blend = 0.0;

   /* Choose the number of xforms */
   if (spec_xforms>0) {
--- a/flam3.h
+++ b/flam3.h
@ -75,7 +75,7 @@ extern char *flam3_variation_names[];
 #define flam3_palette_interpolation_hsv   0
 #define flam3_palette_interpolation_sweep 1
 #define flam3_palette_interpolation_rgb   2
-#define flam3_palette_interpolation_hsv2  3
+#define flam3_palette_interpolation_hsv_circular  3

 #define flam3_max_action_length 10000

@ -453,6 +453,7 @@ typedef struct {
   int interpolation;
   int interpolation_type;
   int palette_interpolation;
+   double hsv_rgb_palette_blend;
   int num_xforms;
   int final_xform_index;
   int final_xform_enable;
--- a/interpolation.c
+++ b/interpolation.c
@ -172,13 +172,15 @@ void interpolate_cmap(flam3_palette cmap, double blend,
      t[4] = p1[i].index;

      /* take the shorter way around the hue circle */
-      if (0 == i) {
-	fprintf(stderr, "xxx interpolating between hues, %g %g\n", s[0], t[0]);
-      }
-      if ((s[0] - t[0]) > 3.0)
+//      if (0 == i) {
+//	fprintf(stderr, "xxx interpolating between hues, %g %g\n", s[0], t[0]);
+ //     }
+      
+      /* Correct the first hue to go the short way around */
+      if ((s[0] - t[0]) > 3.0)  /* first hue much bigger than second hue */
+        s[0] -= 6.0;
+      if ((s[0] - t[0]) < -3.0)  /* first hue much smaller than second hue */
 	s[0] += 6.0;
-      if ((t[0] - s[0]) > 3.0)
-	t[0] += 6.0;
    
      for (j = 0; j < 5; j++)
         t[j] = ((1.0-blend) * s[j]) + (blend * t[j]);
@ -370,77 +372,75 @@ double get_stagger_coef(double t, double stagger_prc, int num_xforms, int this_x
   and have final xform in the same slot) */
 void flam3_interpolate_n(flam3_genome *result, int ncp,
          flam3_genome *cpi, double *c, double stagger) {
-   int i, j, k, numstd;
-
-   fprintf(stderr, "xxx pi=%d\n", cpi[0].palette_interpolation);
+   int i, j, k, l, numstd;

   if (flam3_palette_interpolation_sweep != cpi[0].palette_interpolation) {
-   
+
+      /* rgb, hsv or hsv_circular modes. */
+      double rgb_fraction = 0.0;  /* Assume that we are in plain hsv mode */
+      if (flam3_palette_interpolation_rgb == cpi[0].palette_interpolation)
+         rgb_fraction = 1.0;  /* All RGB output */
+      else if (flam3_palette_interpolation_hsv_circular == cpi[0].palette_interpolation)
+         rgb_fraction = cpi[0].hsv_rgb_palette_blend;
+
      for (i = 0; i < 256; i++) {
-         double t[3], s[5];
+         double col_rgb[3], col_hsv[3];
+         double new_rgb[3] = {0, 0, 0};
+         double new_hsv[3] = {0, 0, 0};
+         double new_count = 0, new_index = 0;
         int alpha1 = 1;
-
-         s[0] = s[1] = s[2] = s[3] = s[4] = 0.0;
-
+         
+         /* Loop over each control point's color at this index */
         for (k = 0; k < ncp; k++) {
-	    if (i == 0) {
-	       fprintf(stderr, "ncp=%d, k=%d\n", ncp, k);
-	       fprintf(stderr, "rgb=%g %g %g\n", cpi[k].palette[i].color[0], cpi[k].palette[i].color[1], cpi[k].palette[i].color[2]);
-            }
-	    if (flam3_palette_interpolation_rgb != cpi[0].palette_interpolation)
-               rgb2hsv(cpi[k].palette[i].color, t);
-	    else {
-	      int l;
-	      for (l = 0; l < 3; l++)
-		t[l] = cpi[k].palette[i].color[l];
-            }
-	    if (i == 0) {
-	      fprintf(stderr, "hsv=%g %g %g\n", t[0], t[1], t[2]);
+
+            /* Convert to hsv */
+            rgb2hsv(cpi[k].palette[i].color, col_hsv);
+	    
+	    /* Store the rgb */
+            for (l = 0; l < 3; l++)
+               col_rgb[l] = cpi[k].palette[i].color[l];
+
+	    if (2 == ncp && k == 0 && cpi[0].palette_interpolation == flam3_palette_interpolation_hsv_circular) {
+               /* only adjust the first coordinate based on the other control point's hue */
+               double second_color[3];
+               rgb2hsv(cpi[1].palette[i].color, second_color);
+
+               /* Adjust the hue so that we go the shorter direction around the circle */
+               if ((second_color[0] - col_hsv[0]) > 3.0) {
+                  col_hsv[0] += 6.0;
+               } else if ((second_color[0] - col_hsv[0]) < -3.0) {
+                  col_hsv[0] -= 6.0;	          
+               }
            }

-	    if (2 == ncp && cpi[0].palette_interpolation == flam3_palette_interpolation_hsv2) {
-	      /* should also support blending between rgb and hsv,
-		 and change the color of the cut, so we can keep
-		 a dominant color but control what it is. */
-	      double z[3];
-	      rgb2hsv(cpi[1-k].palette[i].color, z);
-	      if ((z[0] - t[0]) > 3.0) t[0] += 6.0;
-	      if (i == 0)
-		fprintf(stderr, "adjusted %g %g\n", z[0], t[0]);
-	    }
-
-            for (j = 0; j < 3; j++)
-               s[j] += c[k] * t[j];
-            
-            s[3] += c[k] * cpi[k].palette[i].color[3];
+            for (j = 0; j < 3; j++) {
+               new_rgb[j] += c[k] * col_rgb[j];
+               new_hsv[j] += c[k] * col_hsv[j];
+            }
+               
+            /* Compute the other two components of the color (count and index) */            
+            new_count += c[k] * cpi[k].palette[i].color[3];
            if (cpi[k].palette[i].color[3] != 1.0)
               alpha1 = 0;
-            s[4] += c[k] * cpi[k].palette[i].index;
+            new_index += c[k] * cpi[k].palette[i].index;
            
         }

         if (alpha1 == 1)
-            s[3] = 1.0;
+            new_count = 1.0;

-	 if (i == 0)
-	   fprintf(stderr, "s0=%g\n", s[0]);
-       
-	 if (flam3_palette_interpolation_rgb != cpi[0].palette_interpolation)
-            hsv2rgb(s, result->palette[i].color);
-	 else {
-	   int l;
-	   for (l = 0; l < 3; l++)
-	     result->palette[i].color[l] = s[l];
-	 }
-         result->palette[i].color[3] = s[3];
-         result->palette[i].index = s[4];
+         /* Convert the new hsv coord to back rgb */
+         double new_hsv_rgb[3];
+         hsv2rgb(new_hsv, new_hsv_rgb);

-	 if (i == 0)
-	   fprintf(stderr, "result rgb=%g %g %g\n",
-		   result->palette[0].color[0],
-		   result->palette[0].color[1],
-		   result->palette[0].color[2]);
-       
+         /* Store the interpolated color in the new palette */
+         for (l = 0; l < 3; l++)
+            result->palette[i].color[l] = rgb_fraction * new_rgb[l] + (1.0-rgb_fraction) * new_hsv_rgb[l];
+            
+         result->palette[i].color[3] = new_count;
+         result->palette[i].index = new_index;
+
+         /* Clip the new color appropriately */
         for (j = 0; j < 4; j++) {
            if (result->palette[i].color[j] < 0.0)
               result->palette[i].color[j] = 0.0;
@ -469,6 +469,7 @@ void flam3_interpolate_n(flam3_genome *result, int ncp,

   result->interpolation_type = cpi[0].interpolation_type;
   result->palette_interpolation = cpi[0].palette_interpolation;
+   result->hsv_rgb_palette_blend = cpi[0].hsv_rgb_palette_blend;
   INTERP(brightness);
   INTERP(contrast);
   INTERP(highlight_power);
--- a/8382
+++ b/8382
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.

-# serial 6 ltoptions.m4
+# serial 8 ltoptions.m4

 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@ -28,7 +29,7 @@ m4_define([_LT_SET_OPTION],
 [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
 ])


@ -74,13 +75,15 @@ m4_if([$1],[LT_INIT],[
  dnl
  dnl If no reference was made to various pairs of opposing options, then
  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
  dnl archives by default:
  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
  ])
 ])# _LT_SET_OPTIONS

@ -111,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
 [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
 ])

 dnl aclocal-1.4 backwards compatibility:
@ -125,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 [enable_win32_dll=yes

 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
  AC_CHECK_TOOL(AS, as, false)
  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  AC_CHECK_TOOL(OBJDUMP, objdump, false)
@ -133,13 +136,13 @@ case $host in
 esac

 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl

 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl

 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll

 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@ -147,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
 ])

 dnl aclocal-1.4 backwards compatibility:
@ -156,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])

 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_SHARED],
 [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([shared],
@ -171,14 +174,14 @@ AC_ARG_ENABLE([shared],
    *)
      enable_shared=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
      done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
      ;;
    esac],
    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@ -210,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])

 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_STATIC],
 [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([static],
@ -225,14 +228,14 @@ AC_ARG_ENABLE([static],
    *)
     enable_static=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
      done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
      ;;
    esac],
    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@ -264,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])

 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 m4_define([_LT_ENABLE_FAST_INSTALL],
 [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([fast-install],
@ -279,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
    *)
      enable_fast_install=no
      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
      done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
      ;;
    esac],
    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@ -303,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
 ])

 AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])

 dnl aclocal-1.4 backwards compatibility:
@ -318,19 +321,85 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])


+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 # LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])

 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
@ -343,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
 [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
 ])

 dnl aclocal-1.4 backwards compatibility:
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@ -1,23 +1,23 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.

-# Generated from ltversion.in.
+# @configure_input@

-# serial 3017 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool

-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])

 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@ -1,17 +1,18 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.

-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4

 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@ -25,7 +26,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
@ -77,7 +78,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@ -90,3 +90,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
--- a/parser.c
+++ b/parser.c
@ -332,6 +332,8 @@ int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp) {
      /* Compare attribute names */
      if (!xmlStrcmp(cur_att->name, (const xmlChar *)"time")) {
         cp->time = flam3_atof(att_str);
+      } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"hsv_rgb_palette_blend")) {
+         cp->hsv_rgb_palette_blend = flam3_atof(att_str);
      } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"interpolation")) {
     if (!strcmp("linear", att_str)) {
         cp->interpolation = flam3_interpolation_linear;
@ -345,8 +347,8 @@ int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp) {
         cp->palette_interpolation = flam3_palette_interpolation_hsv;
     } else if  (!strcmp("sweep", att_str)) {
         cp->palette_interpolation = flam3_palette_interpolation_sweep;
-     } else if  (!strcmp("hsv2", att_str)) {
-         cp->palette_interpolation = flam3_palette_interpolation_hsv2;
+     } else if  (!strcmp("hsv_circular", att_str)) {
+         cp->palette_interpolation = flam3_palette_interpolation_hsv_circular;
     } else if  (!strcmp("rgb", att_str)) {
         cp->palette_interpolation = flam3_palette_interpolation_rgb;
     } else {
Author	SHA1	Message	Date
Scott Draves	f8b6c78201	fix symmetry singularities by enforcing maxforms from the beginning instead of the end	2024-12-31 09:58:26 -05:00
Erik Reckase	7fb50c82e9	wrong redirection (#20 ) * updated for aclocal 1.15 * libtool update after configure * aclocal needed refresh * localhost * color speed is a motion element variable * if mult motion elements present, was not using correct vals * wrong element reference	2018-04-12 15:27:33 -04:00
Erik Reckase	f3fbff1366	color_speed was not handled properly for motion elements (#19 ) * updated for aclocal 1.15 * libtool update after configure * aclocal needed refresh * localhost * color speed is a motion element variable * if mult motion elements present, was not using correct vals	2018-04-12 08:08:35 -04:00
Erik Reckase	2a090163a3	Update versions of automake, aclocal (#18 ) * updated for aclocal 1.15 * libtool update after configure * aclocal needed refresh * localhost	2018-04-07 15:19:45 -04:00
Erik Reckase	e080154353	Merge pull request #9 from FractalBrew/fix-win32 Fix an undefined variable on windows builds.	2015-08-03 18:26:08 -06:00
Dave Townsend	be1b9278b6	Fix an undefined variable on windows builds.	2015-08-03 17:00:00 -07:00
Scott Draves	ba790dfc3e	to sync with tag	2015-06-12 02:44:16 +00:00
Scott Draves	cf992d1f25	correct version	2015-06-12 02:34:35 +00:00
Scott Draves	3b9b792e02	version to 3.1.0	2015-06-12 02:31:12 +00:00
Scott Draves	1876a2a266	Update README.txt	2015-05-17 14:10:38 -04:00
Scott Draves	f67447a609	Update README.txt	2015-05-17 12:53:02 -04:00
Scott Draves	1252833105	increase version to 3.0.2, eliminate duplicated version string, rerun autoconf stuff	2015-05-16 14:27:59 -04:00
Scott Draves	035ab3d4e9	Merge pull request #8 from scottdraves/erik_dev hsv_rgb_palette_blend implementation	2015-04-28 21:53:38 -04:00
EReckase	cbc41cd4aa	new parameter, hsv_rgb_palette_blend, which applies to hsv_circular palette interpolation only. 0 -> hsv, 1 -> rgb.	2015-04-27 20:48:50 -06:00
EReckase	7f69d64ebf	still need to parse "hsv" mode from the input genome	2015-04-26 11:21:17 -06:00
Scott Draves	01f29fe20c	Merge pull request #7 from scottdraves/erik_dev switched to git version rather than subversion	2015-04-26 11:34:50 -04:00
EReckase	8d34fd4c01	added --dirty to indicate the compiled directory has changes that are not checked in	2015-04-12 09:25:34 -06:00
EReckase	d52cd965e7	switched to git version rather than subversion	2015-04-12 09:19:17 -06:00
Scott Draves	facfbd6292	fix typo and update constant with new name	2015-04-12 09:23:32 -04:00
Scott Draves	0eb68c545d	Merge pull request #5 from EReckase/master Short-way hue interpolation tweaks	2015-04-12 09:18:56 -04:00
EReckase	4242535339	changed to hsv_circular, now the default	2015-04-11 17:50:27 -06:00
EReckase	d8fbddac62	still need to change interp mode to hsv_circular	2015-04-11 17:44:36 -06:00