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

fixed some warnings on win32

metadata
Wenzel Jakob 2013-11-07 05:48:40 -08:00
parent faf5eda10a
commit be7fcdb2bf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mitsuba/core/octree.h
View File

@ -175,7 +175,7 @@ protected:
uint32_t *temp, uint32_t *start, uint32_t *end) { uint32_t *temp, uint32_t *start, uint32_t *end) {
if (start == end) { if (start == end) {
return NULL; return NULL;
} else if (end-start < m_maxItems || depth > m_maxDepth) { } else if ((uint32_t) (end-start) < m_maxItems || depth > m_maxDepth) {
OctreeNode *result = new OctreeNode(); OctreeNode *result = new OctreeNode();
result->count = (uint32_t) (end-start); result->count = (uint32_t) (end-start);
result->offset = (uint32_t) (start-base); result->offset = (uint32_t) (start-base);

6
src/utils/tonemap.cpp
View File

@ -93,9 +93,9 @@ public:
angle = radToDeg(std::atan(r * halfLength)), angle = radToDeg(std::atan(r * halfLength)),
tmp = angle + 0.02f, tmp = angle + 0.02f,
f0 = 2.61e6f * math::fastexp(-2500*angle*angle), f0 = 2.61e6f * math::fastexp(-2500*angle*angle),
f1 = 20.91 / (tmp*tmp*tmp), f1 = 20.91f / (tmp*tmp*tmp),
f2 = 72.37 / (tmp*tmp), f2 = 72.37f / (tmp*tmp),
f = 0.384f*f0 + 0.478*f1 + 0.138*f2; f = 0.384f*f0 + 0.478f*f1 + 0.138f*f2;
*ptr++ = f; *ptr++ = f;
sum += f; sum += f;