From 97bc0c03bad96e43cc927650175bf36bd5f0dc74 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Tue, 26 Jun 2018 11:32:53 -0700 Subject: [PATCH] Fabric: `fromDynamic` for float numbers was moved to `core` module Summary: @public Otherwise, it can mess with implementation for `int`s and causes some errors where `float` implementation was requested but `int` was applied. Reviewed By: mdvacca Differential Revision: D8601752 fbshipit-source-id: cfe51b7785ff29ee4ad88f0f1cbfed335557d5ef --- ReactCommon/fabric/core/propsConversions.h | 2 ++ ReactCommon/fabric/graphics/conversions.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ReactCommon/fabric/core/propsConversions.h b/ReactCommon/fabric/core/propsConversions.h index c5efbe3d456..350eb017e75 100644 --- a/ReactCommon/fabric/core/propsConversions.h +++ b/ReactCommon/fabric/core/propsConversions.h @@ -22,6 +22,8 @@ inline void fromDynamic(const folly::dynamic &value, int &result) { // So this always converts the value to int64 instead. result = value.asInt(); } +inline void fromDynamic(const folly::dynamic &value, float &result) { result = (float)value.asDouble(); } +inline void fromDynamic(const folly::dynamic &value, double &result) { result = value.asDouble(); } inline void fromDynamic(const folly::dynamic &value, std::string &result) { result = value.getString(); } template diff --git a/ReactCommon/fabric/graphics/conversions.h b/ReactCommon/fabric/graphics/conversions.h index d2adc857c03..3d5cc427528 100644 --- a/ReactCommon/fabric/graphics/conversions.h +++ b/ReactCommon/fabric/graphics/conversions.h @@ -55,10 +55,6 @@ inline std::string toString(const SharedColor &value) { #pragma mark - Geometry -inline void fromDynamic(const folly::dynamic &value, Float &result) { - result = value.asDouble(); -} - inline void fromDynamic(const folly::dynamic &value, Point &result) { if (value.isObject()) { result = Point {(Float)value["x"].asDouble(), (Float)value["y"].asDouble()};