Fix several leaks

apps/openmw/mwgui/inventorywindow.cpp

@@ -35,7 +35,7 @@ namespace MWGui
         , mTrading(false)
         , mLastXSize(0)
         , mLastYSize(0)
-        , mPreview(MWBase::Environment::get().getWorld ()->getPlayerPtr())
+        , mPreview(new MWRender::InventoryPreview(MWBase::Environment::get().getWorld ()->getPlayerPtr()))
         , mPreviewDirty(true)
         , mDragAndDrop(dragAndDrop)
         , mSelectedItem(-1)
@@ -91,8 +91,8 @@ namespace MWGui
         mTradeModel = new TradeItemModel(new InventoryItemModel(mPtr), MWWorld::Ptr());
         mSortModel = new SortFilterItemModel(mTradeModel);
         mItemView->setModel(mSortModel);
-        mPreview = MWRender::InventoryPreview(mPtr);
+        mPreview.reset(new MWRender::InventoryPreview(mPtr));
-        mPreview.setup();
+        mPreview->setup();
     }
 
     void InventoryWindow::setGuiMode(GuiMode mode)
@@ -444,7 +444,7 @@ namespace MWGui
 
     MWWorld::Ptr InventoryWindow::getAvatarSelectedItem(int x, int y)
     {
-        int slot = mPreview.getSlotSelected (x, y);
+        int slot = mPreview->getSlotSelected (x, y);
 
         if (slot == -1)
             return MWWorld::Ptr();
@@ -493,7 +493,7 @@ namespace MWGui
             mPreviewDirty = false;
             MyGUI::IntSize size = mAvatarImage->getSize();
 
-            mPreview.update (size.width, size.height);
+            mPreview->update (size.width, size.height);
 
             mAvatarImage->setImageTexture("CharacterPreview");
             mAvatarImage->setImageCoord(MyGUI::IntCoord(0, 0, std::min(512, size.width), std::min(1024, size.height)));

apps/openmw/mwgui/inventorywindow.hpp

@@ -34,7 +34,7 @@ namespace MWGui
             MWWorld::Ptr getAvatarSelectedItem(int x, int y);
 
             void rebuildAvatar() {
-                mPreview.rebuild();
+                mPreview->rebuild();
             }
 
             TradeItemModel* getTradeModel();
@@ -81,7 +81,7 @@ namespace MWGui
             int mLastXSize;
             int mLastYSize;
 
-            MWRender::InventoryPreview mPreview;
+            std::auto_ptr<MWRender::InventoryPreview> mPreview;
 
             bool mTrading;
 

apps/openmw/mwrender/characterpreview.hpp

@@ -34,6 +34,10 @@ namespace MWRender
 
         virtual void rebuild();
 
+    private:
+        CharacterPreview(const CharacterPreview&);
+        CharacterPreview& operator=(const CharacterPreview&);
+
     protected:
         virtual bool renderHeadOnly() { return false; }
 

apps/openmw/mwrender/ripplesimulation.cpp

@@ -28,7 +28,9 @@ RippleSimulation::RippleSimulation(Ogre::SceneManager* mainSceneManager)
       mRippleAreaLength(1000),
       mImpulseSize(20),
       mTexelOffset(0,0),
-      mFirstUpdate(true)
+      mFirstUpdate(true),
+      mRectangle(NULL),
+      mImpulse(NULL)
 {
     Ogre::AxisAlignedBox aabInf;
     aabInf.setInfinite();
@@ -105,6 +107,7 @@ RippleSimulation::RippleSimulation(Ogre::SceneManager* mainSceneManager)
 RippleSimulation::~RippleSimulation()
 {
     delete mRectangle;
+    delete mImpulse;
 
     Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
 }

components/ogreinit/ogreinit.cpp

@@ -62,6 +62,7 @@ namespace OgreInit
     OgreInit::~OgreInit()
     {
         delete mRoot;
+        delete Ogre::LogManager::getSingletonPtr();
 
         std::vector<Ogre::ParticleEmitterFactory*>::iterator ei;
         for(ei = mEmitterFactories.begin();ei != mEmitterFactories.end();++ei)

components/terrain/world.cpp

@@ -337,6 +337,8 @@ namespace Terrain
                 it->mTarget->loadLayers(*it);
             }
 
+            delete data;
+
             mRootNode->loadMaterials();
 
             mLayerLoadPending = false;

files/mygui/openmw_text.skin.xml

@@ -49,22 +49,6 @@
         <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
-    <Skin name="DaedricText" size="16 16">
-        <Property key="FontName" value="daedric36"/>
-        <Property key="FontHeight" value="36"/>
-        <Property key="TextAlign" value="Default"/>
-        <Property key="TextColour" value="1 1 1"/>
-        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
-    </Skin>
-
-    <Skin name="DaedricText_orig" size="16 16">
-        <Property key="FontName" value="daedric_orig36"/>
-        <Property key="FontHeight" value="36"/>
-        <Property key="TextAlign" value="Default"/>
-        <Property key="TextColour" value="1 1 1"/>
-        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
-    </Skin>
-
     <Skin name="MW_StatNameC" size="200 18">
         <Child type="TextBoxC" skin="SandText" offset="0 0 200 18" align="Left HStretch" name="StatName"/>
     </Skin>