mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 22:06:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add "ISO-8859-1" as the encoding type when reading Xml files.

Browse Source 
Fix small bug when setting the current ember in the final render dialog when showing it.

Have Wix installer point to proper location for installed vcredist DLLs.

Remove VS2010 builds dir.
This commit is contained in:
mfeemster
2014-12-05 20:04:41 -08:00
parent a15f6d6b32
commit 8a3521206b
36 changed files with 33 additions and 5425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/EmberDefines.h
View File

@ -42,7 +42,7 @@
namespace EmberNs
{
#define EMBER_VERSION "0.4.1.6"
#define EMBER_VERSION "0.4.1.7"
#define EPS6 T(1e-6)
#define EPS std::numeric_limits<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
#define ISAAC_SIZE 4

1
Source/Ember/EmberToXml.h
View File

@ -79,6 +79,7 @@ public:
if ((append && start) || !append)
{
temp = "<flames>\n";
//temp = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<flames>\n";
f.write(temp.c_str(), temp.size());
}

2
Source/Ember/XmlToEmber.h
View File

@ -267,7 +267,7 @@ public:
xmlPtr = (const char*)(&buf[0]);
bufSize = strlen(xmlPtr);
embers.reserve(bufSize / 2500);//The Xml text for an ember is around 2500 bytes, but can be much more. Pre-allocate to aovid unnecessary resizing.
doc = xmlReadMemory(xmlPtr, (int)bufSize, filename, nullptr, XML_PARSE_NONET);//Forbid network access during read.
doc = xmlReadMemory(xmlPtr, (int)bufSize, filename, "ISO-8859-1", XML_PARSE_NONET);//Forbid network access during read.
//t.Toc("xmlReadMemory");
if (doc == nullptr)