From e978e63d5ad34148a1c931fc1a8a7de75a168427 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Mon, 21 Sep 2015 17:44:19 -0700 Subject: [PATCH] --Bug fixes: Fix crash on startup when no GPU present. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/VS2013/Ember.rc | Bin 4692 -> 4692 bytes Builds/MSVC/VS2013/EmberCL.rc | Bin 4718 -> 4718 bytes Data/Version History.txt | 4 ++++ Source/Ember/EmberDefines.h | 2 +- Source/EmberAnimate/EmberAnimate.rc | 8 ++++---- Source/EmberGenome/EmberGenome.rc | 8 ++++---- Source/EmberRender/EmberRender.rc | 8 ++++---- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/FinalRenderDialog.cpp | 2 ++ Source/Fractorium/Fractorium.rc | Bin 4578 -> 4578 bytes Source/Fractorium/OptionsDialog.cpp | 2 ++ 13 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index 614c4bb..bceea02 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_Beta_0.9.9.0 + Fractorium_Beta_0.9.9.1 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index fbc6005..82c3de7 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + ev^a#1 F1pxLc5CQ-I delta 57 zcmcbjaz$ms5e`O!$wxU1futj+ev^a#1 F1pxJ*5B>lE diff --git a/Builds/MSVC/VS2013/EmberCL.rc b/Builds/MSVC/VS2013/EmberCL.rc index 3c3216cc06e7061bbe34381c28ffd274ceaf546e..a12a70f3df3c61439ea5e308df0ab8c7a00720d9 100644 GIT binary patch delta 46 wcmaE-@=j&LAr3~v$%i=%fuudBpI3Kt0M8djFjIVU44)7S0AzvpI3Kt0M8djFjIVU44)7S0Aw8vpa1{> diff --git a/Data/Version History.txt b/Data/Version History.txt index 570c5d5..c5dcc61 100644 --- a/Data/Version History.txt +++ b/Data/Version History.txt @@ -1,3 +1,7 @@ +0.9.9.0 Beta 09/21/2015 +--Bug fixes: + -Fix crash on startup when no GPU present. + 0.9.9.0 Beta 09/19/2015 (Major contributions from Simon Detheridge) --User changes -Add option to display affines in polar coords. diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index ffe270c..8b16751 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -42,7 +42,7 @@ namespace EmberNs { -#define EMBER_VERSION "0.9.9.0" +#define EMBER_VERSION "0.9.9.1" #define EPS6 T(1e-6) #define EPS std::numeric_limits::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. #define ISAAC_SIZE 4 diff --git a/Source/EmberAnimate/EmberAnimate.rc b/Source/EmberAnimate/EmberAnimate.rc index 928cf94..2b37b96 100644 --- a/Source/EmberAnimate/EmberAnimate.rc +++ b/Source/EmberAnimate/EmberAnimate.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,9,0 - PRODUCTVERSION 0,9,9,0 + FILEVERSION 0,9,9,1 + PRODUCTVERSION 0,9,9,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "0.9.9.0" + VALUE "FileVersion", "0.9.9.1" VALUE "InternalName", "EmberAnimate.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "0.9.9.0" + VALUE "ProductVersion", "0.9.9.1" END END BLOCK "VarFileInfo" diff --git a/Source/EmberGenome/EmberGenome.rc b/Source/EmberGenome/EmberGenome.rc index e9cdc6f..b067a10 100644 --- a/Source/EmberGenome/EmberGenome.rc +++ b/Source/EmberGenome/EmberGenome.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,9,0 - PRODUCTVERSION 0,9,9,0 + FILEVERSION 0,9,9,1 + PRODUCTVERSION 0,9,9,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Manipulates fractal flames parameter files" - VALUE "FileVersion", "0.9.9.0" + VALUE "FileVersion", "0.9.9.1" VALUE "InternalName", "EmberGenome.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3" VALUE "OriginalFilename", "EmberGenome.exe" VALUE "ProductName", "Ember Genome" - VALUE "ProductVersion", "0.9.9.0" + VALUE "ProductVersion", "0.9.9.1" END END BLOCK "VarFileInfo" diff --git a/Source/EmberRender/EmberRender.rc b/Source/EmberRender/EmberRender.rc index 3c1f2f9..b5087c3 100644 --- a/Source/EmberRender/EmberRender.rc +++ b/Source/EmberRender/EmberRender.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,9,0 - PRODUCTVERSION 0,9,9,0 + FILEVERSION 0,9,9,1 + PRODUCTVERSION 0,9,9,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as single images" - VALUE "FileVersion", "0.9.9.0" + VALUE "FileVersion", "0.9.9.1" VALUE "InternalName", "EmberRender.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3" VALUE "OriginalFilename", "EmberRender.exe" VALUE "ProductName", "Ember Render" - VALUE "ProductVersion", "0.9.9.0" + VALUE "ProductVersion", "0.9.9.1" END END BLOCK "VarFileInfo" diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 893cf06..3782146 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center"><br/>Fractorium 0.9.9.0 Beta</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"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html> + <html><head/><body><p align="center"><br/>Fractorium 0.9.9.1 Beta</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"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html> Qt::RichText diff --git a/Source/Fractorium/FinalRenderDialog.cpp b/Source/Fractorium/FinalRenderDialog.cpp index f22e510..7b6bd16 100644 --- a/Source/Fractorium/FinalRenderDialog.cpp +++ b/Source/Fractorium/FinalRenderDialog.cpp @@ -84,6 +84,8 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(FractoriumSettings* set connect(ui.StopRenderButton, SIGNAL(clicked(bool)), this, SLOT(OnCancelRenderClicked(bool)), Qt::QueuedConnection); table = ui.DeviceTable; + table->clearContents(); + table->setRowCount(0); if (m_Info.Ok() && !m_Info.Devices().empty()) { diff --git a/Source/Fractorium/Fractorium.rc b/Source/Fractorium/Fractorium.rc index ad19f44cee13697efe0457610c92bc67e9d031cc..0c3971ef8f70e712126066bbbf4cc42c2aa7d106 100644 GIT binary patch delta 50 zcmaE){789&7YC!^WN!{bM#Igu9PG?Mjv|-%TT@F+qejU*HvD0RU)E B4GsVR delta 46 zcmaE){789&7YC!kWN!{bMuW|@9PG@K6}TiO7qDsetCellWidget(2, 1, m_NickEdit); table = ui.DeviceTable; + table->clearContents(); + table->setRowCount(0); if (m_Info.Ok() && !m_Info.Devices().empty()) {