mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows compilation fixes, part 3

metadata
Wenzel Jakob 2010-10-18 17:04:47 -07:00
parent d41876fc4f
commit a057677e89
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mitsuba/render/gkdtree.h
View File

@ -3092,9 +3092,9 @@ template <typename Derived> void GenericKDTree<Derived>::findCosts(
nIntersections++; nIntersections++;
if (i > warmup) { if (i > warmup) {
A[idx].x = 1; A[idx].x = 1;
A[idx].y = boost::get<1>(statistics); A[idx].y = (Float) boost::get<1>(statistics);
A[idx].z = boost::get<2>(statistics); A[idx].z = (Float) boost::get<2>(statistics);
b[idx] = boost::get<3>(statistics); b[idx] = (Float) boost::get<3>(statistics);
idx++; idx++;
} }
} }

2
include/mitsuba/render/kdtree.h
View File

@ -54,7 +54,7 @@ MTS_NAMESPACE_BEGIN
* *
* \sa GenericKDTree * \sa GenericKDTree
*/ */
class KDTree : public GenericKDTree<KDTree> { class MTS_EXPORT_RENDER KDTree : public GenericKDTree<KDTree> {
friend class GenericKDTree<KDTree>; friend class GenericKDTree<KDTree>;
public: public:
/// Create an empty kd-tree /// Create an empty kd-tree

2
src/converter/mtsimport.cpp
View File

@ -32,7 +32,7 @@
#include <mitsuba/core/plugin.h> #include <mitsuba/core/plugin.h>
#include <mitsuba/core/statistics.h> #include <mitsuba/core/statistics.h>
#if defined(WIN32) #if defined(WIN32)
#include "../mitsuba/getopt.h" #include <mitsuba/core/getopt.h>
#endif #endif
XERCES_CPP_NAMESPACE_USE XERCES_CPP_NAMESPACE_USE