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

minor parameter constness fix

metadata
Wenzel Jakob 2013-09-17 15:21:25 +02:00
parent 6bb4be1175
commit 6d52ca9355
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mitsuba/core/spline.h
View File

@ -156,7 +156,7 @@ extern MTS_EXPORT_CORE Float integrateCubicInterp1DN(size_t idx,
* \return * \return
* The sampled position * The sampled position
*/ */
extern MTS_EXPORT_CORE Float sampleCubicInterp1D(size_t idx, Float *values, extern MTS_EXPORT_CORE Float sampleCubicInterp1D(size_t idx, const Float *values,
size_t size, Float min, Float max, Float sample, Float *fval = NULL); size_t size, Float min, Float max, Float sample, Float *fval = NULL);
/** /**
@ -182,8 +182,8 @@ extern MTS_EXPORT_CORE Float sampleCubicInterp1D(size_t idx, Float *values,
* \return * \return
* The sampled position * The sampled position
*/ */
extern MTS_EXPORT_CORE Float sampleCubicInterp1DN(size_t idx, Float *nodes, extern MTS_EXPORT_CORE Float sampleCubicInterp1DN(size_t idx, const Float *nodes,
Float *values, size_t size, Float sample, Float *fval = NULL); const Float *values, size_t size, Float sample, Float *fval = NULL);
/** /**
* \brief Evaluate a cubic spline interpolant of a uniformly sampled 2D function * \brief Evaluate a cubic spline interpolant of a uniformly sampled 2D function

4
src/libcore/spline.cpp
View File

@ -130,7 +130,7 @@ Float integrateCubicInterp1DN(size_t idx, const Float *nodes, const Float *value
return ((d0-d1) * (Float) (1.0 / 12.0) + (f0+f1) * 0.5f) * width; return ((d0-d1) * (Float) (1.0 / 12.0) + (f0+f1) * 0.5f) * width;
} }
Float sampleCubicInterp1D(size_t idx, Float *values, size_t size, Float min, Float sampleCubicInterp1D(size_t idx, const Float *values, size_t size, Float min,
Float max, Float sample, Float *fval) { Float max, Float sample, Float *fval) {
Float f0 = values[idx], f1 = values[idx+1], d0, d1; Float f0 = values[idx], f1 = values[idx+1], d0, d1;
@ -180,7 +180,7 @@ Float sampleCubicInterp1D(size_t idx, Float *values, size_t size, Float min,
} }
} }
Float sampleCubicInterp1DN(size_t idx, Float *nodes, Float *values, Float sampleCubicInterp1DN(size_t idx, const Float *nodes, const Float *values,
size_t size, Float sample, Float *fval) { size_t size, Float sample, Float *fval) {
Float f0 = values[idx], Float f0 = values[idx],
f1 = values[idx+1], f1 = values[idx+1],

1
src/libcore/util.cpp
View File

@ -834,7 +834,6 @@ std::string memString(size_t size, bool precise) {
return os.str(); return os.str();
} }
Float hypot2(Float a, Float b) { Float hypot2(Float a, Float b) {
Float r; Float r;
if (std::abs(a) > std::abs(b)) { if (std::abs(a) > std::abs(b)) {