From e3dd3d565c36a2568a6192bd6a4ca000fe63fd1b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 10 Dec 2012 00:59:39 +0100
Subject: [PATCH 1/3] fix 2 leaks

---
 apps/openmw/mwsound/ffmpeg_decoder.cpp |  5 +++++
 apps/openmw/mwworld/store.hpp          | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index a2cccfd13..5f61ab8f0 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/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();
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index fd93f39f1..046de8c63 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/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();
         }

From de4a03081ca3e4259971fb03b3415dacc09af69c Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 10 Dec 2012 11:04:21 +0100
Subject: [PATCH 2/3] fixed skill level type in skill level up message

---
 apps/openmw/mwmechanics/npcstats.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index eb2523372..26c4c8e9a 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/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)

From 44010974fc19ecddcc4b3b259ff2664434bed9d3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 10 Dec 2012 12:34:28 +0100
Subject: [PATCH 3/3] workaround for HLSL error X4579

---
 files/materials/core.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/materials/core.h b/files/materials/core.h
index e9577bbf3..1c9ea1d1d 100644
--- a/files/materials/core.h
+++ b/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