Merge branch 'master' of github.com:MythTV/mythtv

MythTV · Mar 16, 2011 · 9dc3c53 · 9dc3c53
2 parents dd6e0ef + 02cfbb1
commit 9dc3c53
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/mythtv/libs/libmythfreemheg/Engine.cpp b/mythtv/libs/libmythfreemheg/Engine.cpp
@@ -708,8 +708,13 @@ void MHEngine::CheckContentRequests()
         if (m_Context->CheckCarouselObject(pContent->m_FileName) &&
             m_Context->GetCarouselData(pContent->m_FileName, text))
         {
-            pContent->m_pRequester->ContentArrived((const unsigned char *)text.data(),
-                                                   text.size(), this);
+            // If the content is not recognized catch the exception and continue
+            try {
+                pContent->m_pRequester->ContentArrived((const unsigned char *)text.data(),
+                                                       text.size(), this);
+            }
+            catch (char const *) {
+            }
             // Remove from the list.
             delete pContent;
             it = m_ExternContentTable.erase(it);

diff --git a/mythtv/libs/libmythui/mythpainter.cpp b/mythtv/libs/libmythui/mythpainter.cpp
@@ -283,7 +283,7 @@ MythImage *MythPainter::GetImageFromString(const QString &msg,
     MythImage *im = GetFormatImage();
     if (im)
     {
-        m_SoftwareCacheSize += im->byteCount();
+        m_SoftwareCacheSize += im->bytesPerLine() * im->height();
         DrawTextPriv(im, msg, flags, r, font);
         m_StringToImageMap[incoming] = im;
         m_StringExpireList.push_back(incoming);
@@ -343,7 +343,7 @@ MythImage* MythPainter::GetImageFromRect(const QRect &area, int radius,
     MythImage *im = GetFormatImage();
     if (im)
     {
-        m_SoftwareCacheSize += im->byteCount();
+        m_SoftwareCacheSize += (im->bytesPerLine() * im->height());
         DrawRectPriv(im, area, radius, ellipse, fillBrush, linePen);
         m_StringToImageMap[incoming] = im;
         m_StringExpireList.push_back(incoming);
@@ -400,7 +400,7 @@ void MythPainter::ExpireImages(int max)
 
         if (oldim)
         {
-            m_SoftwareCacheSize -= oldim->byteCount();
+            m_SoftwareCacheSize -= oldim->bytesPerLine() * oldim->height();
             oldim->DownRef();
         }
     }