From 7bb09a8a1cc188302c0aefaeed77d0d0a168cfd8 Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Mon, 15 Sep 2008 17:52:20 +0000 Subject: soc-2008-mxcurioni: added Aldrik Dunbar's patch for 64bit Linux builds --- source/blender/freestyle/intern/app_blender/AppConfig.cpp | 5 +---- source/blender/freestyle/intern/geometry/FitCurve.cpp | 1 + source/blender/freestyle/intern/geometry/Grid.h | 3 ++- source/blender/freestyle/intern/image/GaussianFilter.h | 2 ++ source/blender/freestyle/intern/image/Image.h | 2 +- source/blender/freestyle/intern/scene_graph/NodeCamera.cpp | 1 + source/blender/freestyle/intern/stroke/Canvas.h | 1 + source/blender/freestyle/intern/system/StringUtils.h | 1 + source/blender/freestyle/intern/winged_edge/Curvature.cpp | 1 + 9 files changed, 11 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp index d4e6aa8e225..2c55a0fc6b3 100755 --- a/source/blender/freestyle/intern/app_blender/AppConfig.cpp +++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp @@ -28,8 +28,6 @@ using namespace std; namespace Config { Path* Path::_pInstance = 0; Path::Path() { - // get the home directory - _HomeDir = getEnvVar("HOME"); // get the root directory //soc setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR")); @@ -81,8 +79,7 @@ string Path::getEnvVar(const string& iEnvVarName) { if (!getenv(StringUtils::toAscii(iEnvVarName).c_str() ) ) { cerr << "Warning: You may want to set the $" << StringUtils::toAscii(iEnvVarName) - << " environment variable to use " - << string(Config::APPLICATION_NAME) << "." << endl + << " environment variable to use Freestyle." << endl << " Otherwise, the current directory will be used instead." << endl; value = "."; diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index ade40b050ca..7754fcda32b 100755 --- a/source/blender/freestyle/intern/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp @@ -19,6 +19,7 @@ // /////////////////////////////////////////////////////////////////////////////// +#include // for malloc and free #include #include #include "FitCurve.h" diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index fdca13d4ca4..e54b7b4d381 100755 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -31,6 +31,7 @@ #ifndef GRID_H # define GRID_H +# include // for memset # include # include # include "../system/FreestyleConfig.h" @@ -325,7 +326,7 @@ public: for (OccludersSet::iterator it = occluders.begin(); it != occluders.end(); it++) { - if ((unsigned)(*it)->userdata2 != _timestamp) { + if ((unsigned long)(*it)->userdata2 != _timestamp) { (*it)->userdata2 = (void*)_timestamp; visitor.examineOccluder(*it); } diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index f31b500140f..be0e3e2bada 100755 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -30,6 +30,8 @@ #ifndef GAUSSIANFILTER_H # define GAUSSIANFILTER_H +#include // for memcpy +#include // for abs #include "../system/FreestyleConfig.h" class LIB_IMAGE_EXPORT GaussianFilter{ diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h index e1e47c0ec43..72affbc1023 100755 --- a/source/blender/freestyle/intern/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h @@ -30,7 +30,7 @@ #ifndef IMAGE_H # define IMAGE_H -# include // for memcpy +# include // for memcpy // // Image base class, for all types of images diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp index 2d850287ae5..1d095b35a0d 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp @@ -1,3 +1,4 @@ +#include // for memcpy #include "NodeCamera.h" #include diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 549c6a97d55..dbcfccfd8cf 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -30,6 +30,7 @@ #ifndef CANVAS_H # define CANVAS_H +# include # include # include # include diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index 7b43886fa27..d44d3f62732 100755 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -28,6 +28,7 @@ #ifndef STRING_UTILS_H # define STRING_UTILS_H +# include # include # include # include diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 42edef0cb6c..2997d9b6922 100755 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include // for malloc and free #include "Curvature.h" #include #include "WEdge.h" -- cgit v1.2.3