mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Custom palettes were not being read correctly on non ANSI machines.

--Code changes
 -Prepare files for next release.
This commit is contained in:
Person 2020-02-25 18:31:44 -08:00
parent 87a8161fe4
commit c50568a98b
8 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/defaults.pri
View File

@ -1,4 +1,4 @@
VERSION = 1.0.0.18 VERSION = 1.0.0.19
win32:CONFIG += skip_target_version_ext win32:CONFIG += skip_target_version_ext
CONFIG += c++14 CONFIG += c++14

2
Data/Fractorium.spec
View File

@ -2,7 +2,7 @@
%define buildroot %{_topdir}/BUILDROOT %define buildroot %{_topdir}/BUILDROOT
Name: Fractorium Name: Fractorium
Version: 1.0.0.18 Version: 1.0.0.19
Release: 1 Release: 1
Summary: A fractal flame editor with GPU support Summary: A fractal flame editor with GPU support

2
Data/control.package
View File

@ -8,7 +8,7 @@ Homepage: http://fractorium.com/
Vcs-Git: https://bitbucket.org/mfeemster/fractorium Vcs-Git: https://bitbucket.org/mfeemster/fractorium
Vcs-Browser: https://bitbucket.org/mfeemster/fractorium Vcs-Browser: https://bitbucket.org/mfeemster/fractorium
Package: Fractorium Package: Fractorium
Version: 1.0.0.18 Version: 1.0.0.19
Architecture: amd64 Architecture: amd64
Description: A fractal flame editor with GPU support Description: A fractal flame editor with GPU support
Fractorium Fractorium

2
Source/Ember/PaletteList.cpp
View File

@ -1,5 +1,6 @@
#include "EmberPch.h" #include "EmberPch.h"
#include "PaletteList.h" #include "PaletteList.h"
#include "XmlToEmber.h"
namespace EmberNs namespace EmberNs
{ {
@ -615,6 +616,7 @@ void PaletteList<T>::ParsePalettes(xmlNode* node, const shared_ptr<string>& file
char* val; char* val;
xmlAttrPtr attr; xmlAttrPtr attr;
int index = 0; 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) while (node)
{ {

2
archive/build.sh
View File

@ -2,7 +2,7 @@
OSX_BUILD_PATH=$PWD OSX_BUILD_PATH=$PWD
FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release 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 QT_MACDEPLOY=~/Qt/5.12.2/clang_64/bin/macdeployqt
cd $FRACTORIUM_RELEASE_ROOT cd $FRACTORIUM_RELEASE_ROOT

2
archive/build_all.sh
View File

@ -22,7 +22,7 @@ do
;; ;;
--*) echo "bad option $1"; exit 1 --*) echo "bad option $1"; exit 1
;; ;;
*) echo "unrecognised argument $1"; exit 1 *) echo "unrecognized argument $1"; exit 1
;; ;;
esac esac
shift shift

4
archive/build_linux.sh
View File

@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium
FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild
EXTRA_LIBS=/usr/lib/x86_64-linux-gnu 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 QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin
LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage 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 #simple check
if [ ! -d "$FRACTORIUM_RELEASE_ROOT" ]; then 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 exit 2
fi fi

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
fractorium (1.0.0.19-0ubuntu1) bionic; urgency=low
* release 1.0.0.19
-- Matt Feemster <matt.feemster@gmail.com> Fri, 21 Feb 2020 21:21:21 -0700
fractorium (1.0.0.18-0ubuntu1) bionic; urgency=low fractorium (1.0.0.18-0ubuntu1) bionic; urgency=low
* release 1.0.0.18 * release 1.0.0.18