diff options
Diffstat (limited to 'src/colour.cc')
| -rw-r--r-- | src/colour.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/colour.cc b/src/colour.cc index a47e633..fc7a1fb 100644 --- a/src/colour.cc +++ b/src/colour.cc @@ -25,17 +25,19 @@ using std::string; using namespace sub; + Colour -Colour::from_argb_hex (string argb_hex) +Colour::from_rgba_hex(string rgba_hex) { - int alpha, ir, ig, ib; - if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &ir, &ig, &ib) < 4) { + int ir, ig, ib, alpha; + if (sscanf(rgba_hex.c_str(), "%2x%2x%2x%2x", &ir, &ig, &ib, &alpha) < 4) { throw XMLError ("could not parse colour string"); } return Colour (float (ir) / 255, float (ig) / 255, float (ib) / 255); } + Colour Colour::from_rgb_hex (string rgb_hex) { |