[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16541] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: soc-2008-mxcurioni: added Aldrik Dunbar' s patch for 64bit Linux builds
Maxime Curioni
maxime.curioni at gmail.com
Mon Sep 15 19:52:20 CEST 2008
Revision: 16541
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16541
Author: mxcurioni
Date: 2008-09-15 19:52:20 +0200 (Mon, 15 Sep 2008)
Log Message:
-----------
soc-2008-mxcurioni: added Aldrik Dunbar's patch for 64bit Linux builds
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/Curvature.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp 2008-09-15 17:52:20 UTC (rev 16541)
@@ -28,8 +28,6 @@
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 @@
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 = ".";
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp 2008-09-15 17:52:20 UTC (rev 16541)
@@ -19,6 +19,7 @@
//
///////////////////////////////////////////////////////////////////////////////
+#include <cstdlib> // for malloc and free
#include <stdio.h>
#include <math.h>
#include "FitCurve.h"
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.h 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.h 2008-09-15 17:52:20 UTC (rev 16541)
@@ -31,6 +31,7 @@
#ifndef GRID_H
# define GRID_H
+# include <cstring> // for memset
# include <float.h>
# include <vector>
# include "../system/FreestyleConfig.h"
@@ -325,7 +326,7 @@
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);
}
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h 2008-09-15 17:52:20 UTC (rev 16541)
@@ -30,6 +30,8 @@
#ifndef GAUSSIANFILTER_H
# define GAUSSIANFILTER_H
+#include <string.h> // for memcpy
+#include <cstdlib> // for abs
#include "../system/FreestyleConfig.h"
class LIB_IMAGE_EXPORT GaussianFilter{
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h 2008-09-15 17:52:20 UTC (rev 16541)
@@ -30,7 +30,7 @@
#ifndef IMAGE_H
# define IMAGE_H
-# include <string> // for memcpy
+# include <string.h> // for memcpy
//
// Image base class, for all types of images
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp 2008-09-15 17:52:20 UTC (rev 16541)
@@ -1,3 +1,4 @@
+#include <string.h> // for memcpy
#include "NodeCamera.h"
#include <math.h>
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.h 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.h 2008-09-15 17:52:20 UTC (rev 16541)
@@ -30,6 +30,7 @@
#ifndef CANVAS_H
# define CANVAS_H
+# include <cstring>
# include <deque>
# include <vector>
# include <map>
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.h 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.h 2008-09-15 17:52:20 UTC (rev 16541)
@@ -28,6 +28,7 @@
#ifndef STRING_UTILS_H
# define STRING_UTILS_H
+# include <cstring>
# include <vector>
# include <string>
# include <sstream>
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/Curvature.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/Curvature.cpp 2008-09-15 15:58:50 UTC (rev 16540)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/Curvature.cpp 2008-09-15 17:52:20 UTC (rev 16541)
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <cstdlib> // for malloc and free
#include "Curvature.h"
#include <math.h>
#include "WEdge.h"
More information about the Bf-blender-cvs
mailing list