diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs
index 5c9b24e..ac023c1 100644
--- a/Builds/MSVC/Installer/Product.wxs
+++ b/Builds/MSVC/Installer/Product.wxs
@@ -58,7 +58,7 @@
-
+
diff --git a/Builds/MSVC/VS2017/Ember.rc b/Builds/MSVC/VS2017/Ember.rc
index cd1a580..3c005ce 100644
Binary files a/Builds/MSVC/VS2017/Ember.rc and b/Builds/MSVC/VS2017/Ember.rc differ
diff --git a/Builds/MSVC/VS2017/EmberAnimate.rc b/Builds/MSVC/VS2017/EmberAnimate.rc
index b1c234f..05b87aa 100644
--- a/Builds/MSVC/VS2017/EmberAnimate.rc
+++ b/Builds/MSVC/VS2017/EmberAnimate.rc
@@ -49,8 +49,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 0, 0, 15
- PRODUCTVERSION 1, 0, 0, 15
+ FILEVERSION 1, 0, 0, 16
+ PRODUCTVERSION 1, 0, 0, 16
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as animations with motion blur"
- VALUE "FileVersion", "1, 0, 0, 15"
+ VALUE "FileVersion", "1, 0, 0, 16"
VALUE "InternalName", "EmberAnimate.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3"
VALUE "OriginalFilename", "EmberAnimate.exe"
VALUE "ProductName", "Ember Animate"
- VALUE "ProductVersion", "1, 0, 0, 15"
+ VALUE "ProductVersion", "1, 0, 0, 16"
END
END
BLOCK "VarFileInfo"
diff --git a/Builds/MSVC/VS2017/EmberCL.rc b/Builds/MSVC/VS2017/EmberCL.rc
index d8d1f2e..e1d29db 100644
Binary files a/Builds/MSVC/VS2017/EmberCL.rc and b/Builds/MSVC/VS2017/EmberCL.rc differ
diff --git a/Builds/MSVC/VS2017/EmberGenome.rc b/Builds/MSVC/VS2017/EmberGenome.rc
index a07d554..8aab48c 100644
--- a/Builds/MSVC/VS2017/EmberGenome.rc
+++ b/Builds/MSVC/VS2017/EmberGenome.rc
@@ -49,8 +49,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 0, 0, 15
- PRODUCTVERSION 1, 0, 0, 15
+ FILEVERSION 1, 0, 0, 16
+ PRODUCTVERSION 1, 0, 0, 16
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Manipulates fractal flames parameter files"
- VALUE "FileVersion", "1, 0, 0, 15"
+ VALUE "FileVersion", "1, 0, 0, 16"
VALUE "InternalName", "EmberGenome.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3"
VALUE "OriginalFilename", "EmberGenome.exe"
VALUE "ProductName", "Ember Genome"
- VALUE "ProductVersion", "1, 0, 0, 15"
+ VALUE "ProductVersion", "1, 0, 0, 16"
END
END
BLOCK "VarFileInfo"
diff --git a/Builds/MSVC/VS2017/EmberRender.rc b/Builds/MSVC/VS2017/EmberRender.rc
index 224f559..c2d1669 100644
--- a/Builds/MSVC/VS2017/EmberRender.rc
+++ b/Builds/MSVC/VS2017/EmberRender.rc
@@ -49,8 +49,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 0, 0, 15
- PRODUCTVERSION 1, 0, 0, 15
+ FILEVERSION 1, 0, 0, 16
+ PRODUCTVERSION 1, 0, 0, 16
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as single images"
- VALUE "FileVersion", "1, 0, 0, 15"
+ VALUE "FileVersion", "1, 0, 0, 16"
VALUE "InternalName", "EmberRender.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3"
VALUE "OriginalFilename", "EmberRender.exe"
VALUE "ProductName", "Ember Render"
- VALUE "ProductVersion", "1, 0, 0, 15"
+ VALUE "ProductVersion", "1, 0, 0, 16"
END
END
BLOCK "VarFileInfo"
diff --git a/Builds/MSVC/VS2017/Fractorium.rc b/Builds/MSVC/VS2017/Fractorium.rc
index ad173a0..d7b17b6 100644
Binary files a/Builds/MSVC/VS2017/Fractorium.rc and b/Builds/MSVC/VS2017/Fractorium.rc differ
diff --git a/Source/EmberCL/EmberCLFunctions.h b/Source/EmberCL/EmberCLFunctions.h
index aa81a50..c21998e 100644
--- a/Source/EmberCL/EmberCLFunctions.h
+++ b/Source/EmberCL/EmberCLFunctions.h
@@ -179,7 +179,7 @@ static const char* RandFunctionString =
"\n"
"inline real_t MwcNext01(uint2* s)\n"
"{\n"
- " return MwcNext(s) * (1.0 / 4294967296.0);\n"
+ " return MwcNext(s) * (real_t)(1.0 / 4294967296.0);\n"
"}\n"
"\n"
"inline real_t MwcNextFRange(uint2* s, real_t lower, real_t upper)\n"
@@ -191,7 +191,7 @@ static const char* RandFunctionString =
"inline real_t MwcNextNeg1Pos1(uint2* s)\n"
"{\n"
" real_t f = (real_t)MwcNext(s) / (real_t)UINT_MAX;\n"
- " return fma(f, 2.0, -1.0);\n"
+ " return fma(f, (real_t)2.0, (real_t)-1.0);\n"
"}\n"
"\n"
"inline real_t MwcNext0505(uint2* s)\n"
diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui
index e08ba83..798910d 100644
--- a/Source/Fractorium/AboutDialog.ui
+++ b/Source/Fractorium/AboutDialog.ui
@@ -58,7 +58,7 @@
QFrame::NoFrame
- <html><head/><body><p align="center" style=" font-size:10pt;">Fractorium 1.0.0.15</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" text-decoration: underline; color:#0000ff; font-size:10pt;">fractorium.com</span></a></p></body></html>
+ <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 1.0.0.16</span></p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html>
Qt::RichText