Merge remote-tracking branch 'upstream/master'

apps/openmw/mwmechanics/npcstats.cpp

@@ -220,7 +220,7 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
     std::stringstream message;
     message << boost::format(MWBase::Environment::get().getWindowManager ()->getGameSettingString ("sNotifyMessage39", ""))
                % std::string("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}")
-               % base;
+               % static_cast<int> (base);
     MWBase::Environment::get().getWindowManager ()->messageBox(message.str(), std::vector<std::string>());
 
     if (mLevelProgress >= 10)

apps/openmw/mwsound/ffmpeg_decoder.cpp

@@ -313,7 +313,12 @@ void FFmpeg_Decoder::close()
         mStreams.erase(mStreams.begin());
     }
     if(mFormatCtx)
+    {
+        AVIOContext* context = mFormatCtx->pb;
+        av_free(context);
+        mFormatCtx->pb = NULL;
         av_close_input_file(mFormatCtx);
+    }
     mFormatCtx = NULL;
 
     mDataStream.setNull();

apps/openmw/mwworld/store.hpp

@@ -287,6 +287,16 @@ namespace MWWorld
     public:
         typedef SharedIterator<ESM::Land> iterator;
 
+        virtual ~Store<ESM::Land>()
+        {
+            for (std::vector<ESM::Land *>::const_iterator it =
+                             mStatic.begin(); it != mStatic.end(); ++it)
+            {
+                delete *it;
+            }
+
+        }
+
         int getSize() const {
             return mStatic.size();
         }

files/materials/core.h

@@ -1,5 +1,6 @@
-#define gammaCorrectRead(v) pow(v, float3(gammaCorrection,gammaCorrection,gammaCorrection))
-#define gammaCorrectOutput(v) pow(v, float3(1.f/gammaCorrection,1.f/gammaCorrection,1.f/gammaCorrection))
+#define gammaCorrectRead(v) pow(max(v, 0.00001f), float3(gammaCorrection,gammaCorrection,gammaCorrection))
+#define gammaCorrectOutput(v) pow(max(v, 0.00001f), float3(1.f/gammaCorrection,1.f/gammaCorrection,1.f/gammaCorrection))
+
 
 
 #if SH_HLSL == 1 || SH_CG == 1