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

quenched some warnings (windows)

metadata
Wenzel Jakob 2014-07-25 09:29:50 -07:00
parent a97731c9f7
commit c43c5e409f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mitsuba/core/half.h
View File

@ -221,8 +221,8 @@ class MTS_EXPORT_CORE half
unsigned short _h; unsigned short _h;
static MTS_EXPORT_CORE uif _toFloat[1 << 16]; static uif _toFloat[1 << 16];
static MTS_EXPORT_CORE unsigned short _eLut[1 << 9]; static unsigned short _eLut[1 << 9];
}; };
//----------- //-----------

4
include/mitsuba/core/rfilter.h
View File

@ -179,9 +179,9 @@ template <typename Scalar> struct Resampler {
m_weights = new Scalar[m_taps]; m_weights = new Scalar[m_taps];
Float sum = 0; Float sum = 0;
for (int i=0; i<m_taps; i++) { for (int i=0; i<m_taps; i++) {
Float weight = (Scalar) rfilter->eval((Float) (i-m_halfTaps)); Scalar weight = (Scalar) rfilter->eval((Float) (i-m_halfTaps));
m_weights[i] = weight; m_weights[i] = weight;
sum += weight; sum += (Float) weight;
} }
Float normalization = 1.0f / sum; Float normalization = 1.0f / sum;
for (int i=0; i<m_taps; i++) { for (int i=0; i<m_taps; i++) {

8
src/libcore/bitmap.cpp
View File

@ -1884,7 +1884,7 @@ std::map<std::string, Bitmap *> Bitmap::split() const {
ChannelMap channels; ChannelMap channels;
for (size_t i=0; i<m_channelNames.size(); ++i) for (size_t i=0; i<m_channelNames.size(); ++i)
channels[boost::to_lower_copy(m_channelNames[i])] = i; channels[boost::to_lower_copy(m_channelNames[i])] = (int) i;
for (size_t i=0; i<m_channelNames.size(); ++i) { for (size_t i=0; i<m_channelNames.size(); ++i) {
std::string name = boost::to_lower_copy(m_channelNames[i]); std::string name = boost::to_lower_copy(m_channelNames[i]);
@ -1951,7 +1951,7 @@ std::map<std::string, Bitmap *> Bitmap::split() const {
channels.erase(prefix + "y"); channels.erase(prefix + "y");
} else { } else {
extractFormat = ELuminance; extractFormat = ELuminance;
extractChannels.push_back(i); extractChannels.push_back((int) i);
channels.erase(name); channels.erase(name);
} }
@ -1989,7 +1989,7 @@ ref<Bitmap> Bitmap::extractChannels(EPixelFormat fmt, const std::vector<int> &ch
Log(EError, "Bitmap::extractChannel(%i): channel index " Log(EError, "Bitmap::extractChannel(%i): channel index "
"must be between 0 and %i", channels[i], channelCount-1); "must be between 0 and %i", channels[i], channelCount-1);
ref<Bitmap> result = new Bitmap(fmt, m_componentFormat, m_size, channels.size()); ref<Bitmap> result = new Bitmap(fmt, m_componentFormat, m_size, (int) channels.size());
result->setMetadata(m_metadata); result->setMetadata(m_metadata);
result->setGamma(m_gamma); result->setGamma(m_gamma);
@ -2851,7 +2851,7 @@ void Bitmap::readOpenEXR(Stream *stream, const std::string &_prefix) {
if (multichannel) { if (multichannel) {
for (Imf::ChannelList::ConstIterator it = channels.begin(); it != channels.end(); ++it) for (Imf::ChannelList::ConstIterator it = channels.begin(); it != channels.end(); ++it)
sourceChannels.push_back(it.name()); sourceChannels.push_back(it.name());
m_channelCount = sourceChannels.size(); m_channelCount = (int) sourceChannels.size();
m_pixelFormat = EMultiChannel; m_pixelFormat = EMultiChannel;
formatString = "Multichannel"; formatString = "Multichannel";
} else if (spectral) { } else if (spectral) {