diff --git a/Builds/CB/Ember.layout b/Builds/CB/Ember.layout
index beb05ec..b6c6b33 100644
--- a/Builds/CB/Ember.layout
+++ b/Builds/CB/Ember.layout
@@ -1,42 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -46,4 +11,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Ember/Renderer.h b/Source/Ember/Renderer.h
index 0b41401..96165d6 100644
--- a/Source/Ember/Renderer.h
+++ b/Source/Ember/Renderer.h
@@ -18,7 +18,7 @@ namespace EmberNs
{
///
/// Function pointers present a major restriction when dealing
-/// with member functions, and that is they can only point to
+/// with member functions, and that is they can only point to
/// static ones. So instead of a straight function pointer, use
/// a callback class with a single virtual callback
/// member function.
@@ -47,7 +47,7 @@ public:
///
/// Render statistics for the number of iterations ran,
-/// number of bad values calculated during iteration, and
+/// number of bad values calculated during iteration, and
/// the total time for the entire render from the start of
/// iteration to the end of final accumulation.
///
@@ -193,7 +193,7 @@ public:
virtual uint64_t MemoryRequired(bool includeFinal);
//Virtual functions to be overriden in derived renderers that use the GPU.
- virtual unsigned __int64 MemoryAvailable();
+ virtual uint64_t MemoryAvailable();
virtual void Reset();
virtual bool Ok() const;
virtual bool CreateDEFilter(bool& newAlloc);
@@ -241,7 +241,7 @@ public:
inline bool Transparency() const;
virtual void Transparency(bool transparency);
- inline unsigned int BytesPerChannel() const;
+ inline unsigned int BytesPerChannel() const;
void BytesPerChannel(unsigned int bytesPerChannel);
inline T PixelAspectRatio() const;
@@ -249,7 +249,7 @@ public:
inline eInteractiveFilter InteractiveFilter() const;
virtual void InteractiveFilter(eInteractiveFilter filter);
-
+
//Threading control.
virtual void EnterRender();
virtual void LeaveRender();
@@ -293,7 +293,7 @@ public:
inline SpatialFilter* GetSpatialFilter();
inline TemporalFilter* GetTemporalFilter();
virtual DensityFilter* GetDensityFilter();
-
+
//Ember wrappers, getters only.
inline bool XaosPresent();
unsigned int FinalRasW() const;
@@ -326,7 +326,7 @@ public:
inline bool UseFinalXform() const;
inline const Palette* GetPalette() const;
inline ePaletteMode PaletteMode() const;
-
+
//Iterator wrappers.
const unsigned char* XformDistributions() const;
const unsigned int XformDistributionsSize() const;
@@ -421,4 +421,4 @@ template EMBER_API class Renderer;
#ifdef DO_DOUBLE
template EMBER_API class Renderer;
#endif
-}
\ No newline at end of file
+}
diff --git a/Source/Ember/Utils.h b/Source/Ember/Utils.h
index d509e9d..899f41a 100644
--- a/Source/Ember/Utils.h
+++ b/Source/Ember/Utils.h
@@ -109,13 +109,13 @@ public:
///
/// The vector of strings to add
virtual void AddToReport(vector& vec) { m_ErrorReport.insert(m_ErrorReport.end(), vec.begin(), vec.end()); }
-
+
///
/// Static function to dump a vector of strings passed in.
///
/// The vector of strings to dump
static void StaticDumpErrorReport(vector& errorReport) { cout << StaticErrorReportString(errorReport); }
-
+
///
/// Static function to return the entire error report passed in as a single string.
///
@@ -126,7 +126,7 @@ public:
stringstream ss;
ForEach(errorReport, [&](string s) { ss << s << endl; });
-
+
return ss.str();
}
@@ -713,7 +713,7 @@ static inline T NormalizeDeg360(T angle)
///
/// The string to copy and make lower case
/// The lower case string
-static inline string ToLower(string& str)
+static inline string ToLower(const string& str)
{
string lower;
@@ -751,7 +751,7 @@ static inline string Trim(string& str, char ch = ' ')
{
size_t firstChar = str.find_first_not_of(ch);
size_t lastChar = str.find_last_not_of(ch);
-
+
if (firstChar == string::npos)
firstChar = 0;
@@ -950,4 +950,4 @@ static const char* EmberVersion()
{
return EMBER_OS "-" EMBER_VERSION;
}
-}
\ No newline at end of file
+}