diff --git a/include/mitsuba/core/half.h b/include/mitsuba/core/half.h index a022d6a6..56f15897 100644 --- a/include/mitsuba/core/half.h +++ b/include/mitsuba/core/half.h @@ -221,8 +221,8 @@ class MTS_EXPORT_CORE half unsigned short _h; - static MTS_EXPORT_CORE uif _toFloat[1 << 16]; - static MTS_EXPORT_CORE unsigned short _eLut[1 << 9]; + static uif _toFloat[1 << 16]; + static unsigned short _eLut[1 << 9]; }; //----------- diff --git a/include/mitsuba/core/rfilter.h b/include/mitsuba/core/rfilter.h index 81e3617d..1c3dab41 100644 --- a/include/mitsuba/core/rfilter.h +++ b/include/mitsuba/core/rfilter.h @@ -179,9 +179,9 @@ template struct Resampler { m_weights = new Scalar[m_taps]; Float sum = 0; for (int i=0; ieval((Float) (i-m_halfTaps)); + Scalar weight = (Scalar) rfilter->eval((Float) (i-m_halfTaps)); m_weights[i] = weight; - sum += weight; + sum += (Float) weight; } Float normalization = 1.0f / sum; for (int i=0; i Bitmap::split() const { ChannelMap channels; for (size_t i=0; i Bitmap::split() const { channels.erase(prefix + "y"); } else { extractFormat = ELuminance; - extractChannels.push_back(i); + extractChannels.push_back((int) i); channels.erase(name); } @@ -1989,7 +1989,7 @@ ref Bitmap::extractChannels(EPixelFormat fmt, const std::vector &ch Log(EError, "Bitmap::extractChannel(%i): channel index " "must be between 0 and %i", channels[i], channelCount-1); - ref result = new Bitmap(fmt, m_componentFormat, m_size, channels.size()); + ref result = new Bitmap(fmt, m_componentFormat, m_size, (int) channels.size()); result->setMetadata(m_metadata); result->setGamma(m_gamma); @@ -2851,7 +2851,7 @@ void Bitmap::readOpenEXR(Stream *stream, const std::string &_prefix) { if (multichannel) { for (Imf::ChannelList::ConstIterator it = channels.begin(); it != channels.end(); ++it) sourceChannels.push_back(it.name()); - m_channelCount = sourceChannels.size(); + m_channelCount = (int) sourceChannels.size(); m_pixelFormat = EMultiChannel; formatString = "Multichannel"; } else if (spectral) {