Revert "[color] allow alpha to omitted when converting from strings"
authorThomas Wood <thomas.wood@intel.com>
Wed, 7 Oct 2009 11:15:26 +0000 (12:15 +0100)
committerThomas Wood <thomas.wood@intel.com>
Wed, 7 Oct 2009 11:15:26 +0000 (12:15 +0100)
This reverts commit eb8daac4b0726c1d9925bbbaeed7a8f39007da21.

The original commit was incorrect and pushed accidentally.

clutter/clutter-color.c

index 8c11c92..221f9f4 100644 (file)
@@ -432,28 +432,6 @@ clutter_color_from_string (ClutterColor *color,
 
               return TRUE;
             }
-          else if (strlen (str) == 7)
-            {
-              /* #rrggbb */
-              color->red   = (result >> 24) & 0xff;
-              color->green = (result >> 16) & 0xff;
-              color->blue  = (result >>  8) & 0xff;
-
-              color->alpha = 0xff;
-            }
-          else if (strlen (str) == 4)
-            {
-              /* #rgb */
-              color->red   = ((result >> 12) & 0xf);
-              color->green = ((result >>  8) & 0xf);
-              color->blue  = ((result >>  4) & 0xf);
-
-              color->red   = (color->red   << 4) | color->red;
-              color->green = (color->green << 4) | color->green;
-              color->blue  = (color->blue  << 4) | color->blue;
-
-              color->alpha = 0xff;
-            }
         }
     }