From c50568a98bc19ab726e398f7b9b4dd426f0db78b Mon Sep 17 00:00:00 2001 From: Person Date: Tue, 25 Feb 2020 18:31:44 -0800 Subject: [PATCH] --Bug fixes -Custom palettes were not being read correctly on non ANSI machines. --Code changes -Prepare files for next release. --- Builds/QtCreator/defaults.pri | 2 +- Data/Fractorium.spec | 2 +- Data/control.package | 2 +- Source/Ember/PaletteList.cpp | 2 ++ archive/build.sh | 2 +- archive/build_all.sh | 2 +- archive/build_linux.sh | 4 ++-- debian/changelog | 6 ++++++ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index c63ca04..3c10218 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -1,4 +1,4 @@ -VERSION = 1.0.0.18 +VERSION = 1.0.0.19 win32:CONFIG += skip_target_version_ext CONFIG += c++14 diff --git a/Data/Fractorium.spec b/Data/Fractorium.spec index 583c92a..4ac0bf3 100644 --- a/Data/Fractorium.spec +++ b/Data/Fractorium.spec @@ -2,7 +2,7 @@ %define buildroot %{_topdir}/BUILDROOT Name: Fractorium -Version: 1.0.0.18 +Version: 1.0.0.19 Release: 1 Summary: A fractal flame editor with GPU support diff --git a/Data/control.package b/Data/control.package index d5fe40d..9011096 100644 --- a/Data/control.package +++ b/Data/control.package @@ -8,7 +8,7 @@ Homepage: http://fractorium.com/ Vcs-Git: https://bitbucket.org/mfeemster/fractorium Vcs-Browser: https://bitbucket.org/mfeemster/fractorium Package: Fractorium -Version: 1.0.0.18 +Version: 1.0.0.19 Architecture: amd64 Description: A fractal flame editor with GPU support Fractorium diff --git a/Source/Ember/PaletteList.cpp b/Source/Ember/PaletteList.cpp index 08337b0..a99da3a 100644 --- a/Source/Ember/PaletteList.cpp +++ b/Source/Ember/PaletteList.cpp @@ -1,5 +1,6 @@ #include "EmberPch.h" #include "PaletteList.h" +#include "XmlToEmber.h" namespace EmberNs { @@ -615,6 +616,7 @@ void PaletteList::ParsePalettes(xmlNode* node, const shared_ptr& file char* val; xmlAttrPtr attr; int index = 0; + Locale lcl;//This is required to properly read commas in the custom palette file. Because foreign locales treat a comma as the decimal point, which causes errors. while (node) { diff --git a/archive/build.sh b/archive/build.sh index aadc270..d827822 100755 --- a/archive/build.sh +++ b/archive/build.sh @@ -2,7 +2,7 @@ OSX_BUILD_PATH=$PWD FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release -# replace 5.12.2 by your QT version, and check if the instation path is the same +# replace 5.11.2 by your QT version, and ensure the installation path is the same QT_MACDEPLOY=~/Qt/5.12.2/clang_64/bin/macdeployqt cd $FRACTORIUM_RELEASE_ROOT diff --git a/archive/build_all.sh b/archive/build_all.sh index a6b701b..df8fa3c 100755 --- a/archive/build_all.sh +++ b/archive/build_all.sh @@ -22,7 +22,7 @@ do ;; --*) echo "bad option $1"; exit 1 ;; - *) echo "unrecognised argument $1"; exit 1 + *) echo "unrecognized argument $1"; exit 1 ;; esac shift diff --git a/archive/build_linux.sh b/archive/build_linux.sh index 7ebf163..6838f80 100755 --- a/archive/build_linux.sh +++ b/archive/build_linux.sh @@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild EXTRA_LIBS=/usr/lib/x86_64-linux-gnu -# replace 5.11.2 by your QT version, and check if the instation path is the same +# replace 5.11.2 by your QT version, and ensure the installation path is the same QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage @@ -21,7 +21,7 @@ APP_IMAGE_TOOL=/home/$USER/Dev/appimagetool-x86_64.AppImage #simple check if [ ! -d "$FRACTORIUM_RELEASE_ROOT" ]; then - echo "release foulder not found. Please, build the project." + echo "release folder not found. Please, build the project." exit 2 fi diff --git a/debian/changelog b/debian/changelog index 81d319b..32c4a8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (1.0.0.19-0ubuntu1) bionic; urgency=low + + * release 1.0.0.19 + + -- Matt Feemster Fri, 21 Feb 2020 21:21:21 -0700 + fractorium (1.0.0.18-0ubuntu1) bionic; urgency=low * release 1.0.0.18