Ticket #6511: mythui.intensity.2.patch

mythtv/libs/libmythui/mythimage.cpp

@@ -28 +28 @@
     m_gradDirection = FillTopToBottom;
 
     m_isReflected = false;
+    m_setIntensity = false;
 
     m_imageId = 0;
 
@@ -221 +222 @@
     }
 }
 
+void MythImage::Intensity(float percent)
+{
+    if (m_setIntensity)
+        return;
+
+    int segColors = depth() > 8 ? 256 : numColors();
+    int pixels = depth() > 8 ? width()*height() :
+        numColors();
+    unsigned int *data = depth() > 8 ? (unsigned int *)bits() : 
+        (unsigned int *)colorTable().data();
+
+    bool brighten = (percent >= 0);
+    if(percent < 0)
+        percent = -percent;
+
+    unsigned char *segTbl = new unsigned char[segColors];
+    int tmp;
+    if(brighten)
+    {
+        for(int i=0; i < segColors; ++i)
+        {
+            tmp = (int)(i*percent);
+            if(tmp > 255)
+                tmp = 255;
+            segTbl[i] = tmp;
+        }
+    }
+    else
+    {
+        for(int i=0; i < segColors; ++i)
+        {
+            tmp = (int)(i*percent);
+            if(tmp < 0)
+                tmp = 0;
+             segTbl[i] = tmp;
+        }
+    }
+
+    if(brighten)
+    {
+        for(int i=0; i < pixels; ++i)
+        {
+            int r = qRed(data[i]);
+            int g = qGreen(data[i]);
+            int b = qBlue(data[i]);
+            int a = qAlpha(data[i]);
+            r = r + segTbl[r] > 255 ? 255 : r + segTbl[r];
+            g = g + segTbl[g] > 255 ? 255 : g + segTbl[g];
+            b = b + segTbl[b] > 255 ? 255 : b + segTbl[b];
+            data[i] = qRgba(r, g, b, a);
+        }
+    }
+    else
+    {
+        for(int i=0; i < pixels; ++i)
+        {
+            int r = qRed(data[i]);
+            int g = qGreen(data[i]);
+            int b = qBlue(data[i]);
+            int a = qAlpha(data[i]);
+            r = r - segTbl[r] < 0 ? 0 : r - segTbl[r];
+            g = g - segTbl[g] < 0 ? 0 : g - segTbl[g];
+            b = b - segTbl[b] < 0 ? 0 : b - segTbl[b];
+            data[i] = qRgba(r, g, b, a);
+        }
+    }
+    delete [] segTbl;
+
+    m_setIntensity = true;
+}
+
+
 MythImage *MythImage::FromQImage(QImage **img)
 {
     if (!img || !*img)

mythtv/libs/libmythui/mythimage.h

@@ -28 +28 @@
 
     bool IsGradient() const { return m_isGradient; }
     bool IsReflected() const { return m_isReflected; }
+    bool HasIntensity() const { return m_setIntensity; }
 
     void Assign(const QImage &img);
     void Assign(const QPixmap &pix);
@@ -41 +42 @@
     void Reflect(ReflectAxis axis, int shear, int scale, int length,
                  int spacing = 0);
     void ToGreyscale();
+    void Intensity(float percent);
 
     /**
      * @brief Create a gradient image.
@@ -60 +62 @@
     QString GetFileName(void) const { return m_FileName; }
 
     void setIsReflected(bool reflected) { m_isReflected = reflected; }
+    void setHasIntensity(bool intensity) { m_setIntensity = intensity; }
 
     void SetIsInCache(bool bCached);
 
@@ -83 +86 @@
     FillDirection m_gradDirection;
 
     bool m_isReflected;
+    bool m_setIntensity;
 
     unsigned int m_imageId;
 

mythtv/libs/libmythui/mythuiimage.cpp

@@ -113 +113 @@
 
     m_isGreyscale = false;
 
+    m_hasIntensity = false;
+    m_intensity = 0;
+
     m_preserveAspect = false;
 }
 
@@ -187 +190 @@
     if (m_isGreyscale && !img->isGrayscale())
         img->ToGreyscale();
 
+    if (m_hasIntensity && !img->HasIntensity())
+        img->Intensity(m_intensity);
+
     if (m_ForceSize.isNull())
         SetSize(img->size());
 
@@ -234 +240 @@
         if (m_isGreyscale && !im->isGrayscale())
             im->ToGreyscale();
 
+        if (m_hasIntensity && !im->HasIntensity())
+            im->Intensity(m_intensity);
+
         m_Images.push_back(im);
 
         aSize = aSize.expandedTo(im->size());
@@ -326 +335 @@
     if (m_isGreyscale)
         s_Attrib += "greyscale";
 
+    if (m_hasIntensity)
+        s_Attrib += "intensity";
+
     imagelabel  = QString("%1-%2-%3x%4.png")
                           .arg(filename)
                           .arg(s_Attrib)
@@ -414 +426 @@
                 VERBOSE(VB_FILE, QString("MythUIImage::Load found in cache :%1:").arg(imagelabel));
                 if (m_isReflected)
                     image->setIsReflected(true);
+                if (m_hasIntensity)
+                    image->setHasIntensity(true);
 
                 bFoundInCache = true;
             }
@@ -467 +481 @@
             if (m_isGreyscale)
                 image->ToGreyscale();
 
+            if (m_hasIntensity)
+                image->Intensity(m_intensity);
+
             // Save scaled copy to cache
             if (bNeedLoad)
                 GetMythUI()->CacheImage(imagelabel, image);
@@ -675 +692 @@
     {
         m_isGreyscale = parseBool(element);
     }
+    else if (element.tagName() == "intensity")
+    {
+        m_hasIntensity = true;
+        m_intensity = (getFirstText(element).toFloat() / 100);
+    }
     else
         return MythUIType::ParseElement(element);
 
@@ -733 +755 @@
 
     m_isGreyscale = im->m_isGreyscale;
 
+    m_hasIntensity = im->m_hasIntensity;
+    m_intensity = im->m_intensity;
+
     //SetImages(im->m_Images);
 
     MythUIType::CopyFrom(base);

mythtv/libs/libmythui/mythuiimage.h

@@ -99 +99 @@
     bool m_preserveAspect;
 
     bool m_isGreyscale;
+    bool m_hasIntensity;
 
+    float m_intensity;
+
     friend class MythThemeBase;
     friend class MythUIButtonListItem;
     friend class MythUIProgressBar;