[clutter/clutter-1.16] Revert "units: Handle negative values in clutter_units_from_string()"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] Revert "units: Handle negative values in clutter_units_from_string()"
- Date: Wed, 22 May 2013 13:35:57 +0000 (UTC)
commit 0065fb459cdd856797eb265e10c56a030d3dc48f
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 22 14:34:22 2013 +0100
Revert "units: Handle negative values in clutter_units_from_string()"
Stray commit got pushed too soon.
This reverts commit 44f283bb72a3c1236629f7fe36ed5dc75bbb07e7.
clutter/clutter-units.c | 13 -------------
tests/conform/units.c | 4 ----
2 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/clutter/clutter-units.c b/clutter/clutter-units.c
index 8a43cfe..f07f0f6 100644
--- a/clutter/clutter-units.c
+++ b/clutter/clutter-units.c
@@ -480,21 +480,11 @@ clutter_units_from_string (ClutterUnits *units,
ClutterBackend *backend;
ClutterUnitType unit_type;
gfloat value;
- gboolean negative = FALSE;
g_return_val_if_fail (units != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE);
/* strip leading space */
- while (g_ascii_isspace (*str) || *str == '+')
- str++;
-
- if (*str == '-')
- {
- negative = TRUE;
- str++;
- }
-
while (g_ascii_isspace (*str))
str++;
@@ -560,9 +550,6 @@ clutter_units_from_string (ClutterUnits *units,
if (*str != '\0')
return FALSE;
- if (negative)
- value *= -1;
-
backend = clutter_get_default_backend ();
units->unit_type = unit_type;
diff --git a/tests/conform/units.c b/tests/conform/units.c
index 0dcc355..3822e05 100644
--- a/tests/conform/units.c
+++ b/tests/conform/units.c
@@ -108,10 +108,6 @@ units_string (TestConformSimpleFixture *fixture,
g_assert (clutter_units_get_unit_type (&units) == CLUTTER_UNIT_POINT);
g_assert_cmpfloat (clutter_units_get_unit_value (&units), ==, 0.5f);
- g_assert (clutter_units_from_string (&units, "-3 px") == TRUE);
- g_assert (clutter_units_get_unit_type (&units) == CLUTTER_UNIT_PIXEL);
- g_assert_cmpfloat (clutter_units_get_unit_value (&units), ==, -3.0);
-
g_assert (clutter_units_from_string (&units, "1 omg!!pony") == FALSE);
clutter_units_from_pt (&units, 24.0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]