Changeset 23807

Timestamp:

09/20/13 19:30:04 (10 years ago)

Author:

nit

Message:

[titan] fix build

Location:

titan/titan

Files:

• record.h (modified) (1 diff)
• skin.h (modified) (9 diffs)

titan/titan/record.h

@@ -764 +764 @@
         struct dvbdev* fenode = NULL, *dmxnode = NULL;
         struct audiotrack* atrack = NULL;
-        struct subtitle *subnode = NULL
+        struct subtitle *subnode = NULL;
         char* tmpstr = NULL;
         struct transponder* tpnode = NULL;

titan/titan/skin.h

@@ -1923 +1923 @@
         int decoding = getconfigint("pichwdecode", NULL);
         int pictype = 0; //0 = png, 1 = jpg HW, 2 = jpg SW
-        unsigned long tmpcol = 0;
         unsigned char r = 0, g = 0, b = 0, ralpha = 0;
 
@@ -2052 +2051 @@
                                                 else
                                                 {
-                                                        tmpcol = skinfb->fblong[x];
                                                         ralpha = 255 - src[3]; 
-                                                        alpha_composite(r, src[0], src[3], ralpha, (tmpcol & 0xff0000) >> 16);
-                                                        alpha_composite(g, src[1], src[3], ralpha, (tmpcol & 0x00ff00) >> 8);
-                                                        alpha_composite(b, src[2], src[3], ralpha, tmpcol & 0xff);
+                                                        alpha_composite(r, src[0], src[3], ralpha, (skinfb->fblong[x] & 0xff0000) >> 16);
+                                                        alpha_composite(g, src[1], src[3], ralpha, (skinfb->fblong[x] & 0x00ff00) >> 8);
+                                                        alpha_composite(b, src[2], src[3], ralpha, skinfb->fblong[x] & 0xff);
                                                         skinfb->fblong[x] = (255 << 24) | r << 16 | g << 8 | b;
                                                 }
@@ -2088 +2086 @@
 
         transparent = (transparent - 255) * -1;
-        unsigned long tmpcol = color | ((transparent & 0xff) << 24);
+        unsigned long tmpcol = color | ((transparent & 0xff) << 24);
 
         while(y > x)
@@ -2225 +2223 @@
         FT_Error ret;
         FTC_SBit sbit;
-        unsigned long tmpcol = 0, tmpcol1 = 0;
+        unsigned long tmpcol = 0;
         unsigned char red, green, blue, r, g, b;
         unsigned char* src = NULL;
@@ -2241 +2239 @@
         FTC_Node anode;
         ret = FTC_SBitCache_Lookup(font->cache, &font->desc, glyphindex, &sbit, &anode);
-
         if(ret != 0)
         {
@@ -2293 +2290 @@
                                 else
                                 {
-                                        tmpcol1 = skinfb->fblong[x];
                                         ralpha = 255 - src[0]; 
-                                        alpha_composite(r, red, src[0], ralpha, (tmpcol1 & 0xff0000) >> 16);
-                                        alpha_composite(g, green, src[0], ralpha, (tmpcol1 & 0x00ff00) >> 8);
-                                        alpha_composite(b, blue, src[0], ralpha, tmpcol1 & 0xff);
+                                        alpha_composite(r, red, src[0], ralpha, (skinfb->fblong[x] & 0xff0000) >> 16);
+                                        alpha_composite(g, green, src[0], ralpha, (skinfb->fblong[x] & 0x00ff00) >> 8);
+                                        alpha_composite(b, blue, src[0], ralpha, skinfb->fblong[x] & 0xff);
                                         skinfb->fblong[x] = transparent << 24 | r << 16 | g << 8 | b;
                                 }
@@ -2722 +2718 @@
                 b3 = (b1 * p + b2 * i) / steps;
                 col = (transparent << 24) | (r3 << 16) | (g3 << 8) | b3;
-                
+        
                 for(y = 0; y < ystep; y++)
                         for(x = 0; x < xstep; x++)
@@ -3684 +3680 @@
 {
         int i, ret = 0;
-
-        for(i = 0; i < sizeof(status.drawallways) / sizeof(skin); i++)
+        int tmp = sizeof(status.drawallways) / sizeof(skin);
+
+        for(i = 0; i < tmp; i++)
         {
                 if(status.drawallways[i] != NULL)
@@ -3699 +3696 @@
 {
         int i, ret = 0;
-
-        for(i = 0; i < sizeof(status.drawallways) / sizeof(skin); i++)
+        int tmp = sizeof(status.drawallways) / sizeof(skin);
+
+        for(i = 0; i < tmp; i++)
         {
                 if(status.drawallways[i] != NULL)