Ticket #12489: 12489_0_28.patch

mythtv/libs/libmythui/mythuiimage.cpp

@@ -93 +93 @@
     preserveAspect = other.preserveAspect;
     isGreyscale = other.isGreyscale;
     isReflected = other.isReflected;
-    isMasked = other.isMasked;
     isOriented = other.isOriented;
 
     reflectAxis = other.reflectAxis;
@@ -106 +105 @@
     isThemeImage = other.isThemeImage;
 
     SetMaskImage(other.maskImage);
+    isMasked = other.isMasked;
+    maskImageFilename = other.maskImageFilename;
 }
 
 void ImageProperties::SetMaskImage(MythImage *image)
@@ -357 +358 @@
 
             if (imProps.isMasked)
             {
+                MythImage *newMaskImage = painter->GetFormatImage();
+                if (newMaskImage->Load(imProps.GetMaskImageFilename()))
+                {
+                    float wmult; // Width multipler
+                    float hmult; // Height multipler
+                    GetMythUI()->GetScreenSettings(wmult, hmult);
+                    if (wmult != 1.0f || hmult != 1.0f)
+                    {
+                        int width = newMaskImage->size().width() * wmult;
+                        int height = newMaskImage->size().height() * hmult;
+                        newMaskImage->Resize(QSize(width, height));
+                    }
+
+                    imProps.SetMaskImage(newMaskImage);
+                }
+                else
+                    imProps.SetMaskImage(NULL);
+                newMaskImage->DecrRef();
+
                 QRect imageArea = image->rect();
                 QRect maskArea = imProps.GetMaskImageRect();
 
                 // Crop the mask to the image
                 int x = 0;
-                int y = 0;
+                                int y = 0;
 
                 if (maskArea.width() > imageArea.width())
                     x = (maskArea.width() - imageArea.width()) / 2;
@@ -1439 +1459 @@
     }
     else if (element.tagName() == "mask")
     {
-        QString maskfile = getFirstText(element);
-
-        MythImage *newMaskImage = GetPainter()->GetFormatImage();
-        if (newMaskImage->Load(maskfile))
-        {
-            float wmult; // Width multipler
-            float hmult; // Height multipler
-            GetMythUI()->GetScreenSettings(wmult, hmult);
-            if (wmult != 1.0f || hmult != 1.0f)
-            {
-                int width = newMaskImage->size().width() * wmult;
-                int height = newMaskImage->size().height() * hmult;
-                newMaskImage->Resize(QSize(width, height));
-            }
-
-            m_imageProperties.SetMaskImage(newMaskImage);
-        }
-        else
-            m_imageProperties.SetMaskImage(NULL);
-        newMaskImage->DecrRef();
+        m_imageProperties.SetMaskImageFilename(getFirstText(element));
+        m_imageProperties.isMasked = true;
     }
     else if (element.tagName() == "grayscale" ||
              element.tagName() == "greyscale")

mythtv/libs/libmythui/mythuiimage.h

@@ -30 +30 @@
     ImageProperties &operator=(const ImageProperties &other);
 
     void SetMaskImage(MythImage *image);
+        void SetMaskImageFilename(const QString filename)
+        {
+                maskImageFilename=filename;
+        }
+        QString GetMaskImageFilename()
+        {
+                return maskImageFilename;
+        }
     QRect GetMaskImageRect(void)
     {
         QRect rect;
@@ -73 +81 @@
     void Copy(const ImageProperties &other);
 
     MythImage *maskImage;
+        QString maskImageFilename;
 };
 
 typedef QPair<MythImage *, int> AnimationFrame;