/**
 * Copyright (c) 2015-present, Facebook, Inc.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */

#include "Color.h"

namespace facebook {
namespace react {

SharedColor colorFromComponents(ColorComponents components) {
  float ratio = 255.9999;
  return SharedColor(
    ((int)(components.alpha * ratio) & 0xff) << 24 |
    ((int)(components.red * ratio) & 0xff) << 16 |
    ((int)(components.green * ratio) & 0xff) << 8 |
    ((int)(components.blue * ratio) & 0xff)
  );
}

ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
  float ratio = 256;
  Color color = *sharedColor;
  return ColorComponents {
    (float)((color >> 16) & 0xff) / ratio,
    (float)((color >>  8) & 0xff) / ratio,
    (float)((color      ) & 0xff) / ratio,
    (float)((color >> 24) & 0xff) / ratio
  };
}

} // namespace react
} // namespace facebook

/**
 * Copyright (c) 2015-present, Facebook, Inc.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */

#include "Color.h"

namespace facebook {
namespace react {

SharedColor colorFromComponents(ColorComponents components) {
  return SharedColor(
    ((int)components.alpha & 0xff) << 24 |
    ((int)components.red & 0xff) << 16 |
    ((int)components.green & 0xff) << 8 |
    ((int)components.blue & 0xff)
  );
}

ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
  Color color = *sharedColor;
  return ColorComponents {
    (float)((color >> 16) & 0xff),
    (float)((color >>  8) & 0xff),
    (float)((color      ) & 0xff),
    (float)((color >> 24) & 0xff)
  };
}

} // namespace react
} // namespace facebook

--- 
+++ 
@@ -11,21 +11,23 @@
 namespace react {
 
 SharedColor colorFromComponents(ColorComponents components) {
+  float ratio = 255.9999;
   return SharedColor(
-    ((int)components.alpha & 0xff) << 24 |
-    ((int)components.red & 0xff) << 16 |
-    ((int)components.green & 0xff) << 8 |
-    ((int)components.blue & 0xff)
+    ((int)(components.alpha * ratio) & 0xff) << 24 |
+    ((int)(components.red * ratio) & 0xff) << 16 |
+    ((int)(components.green * ratio) & 0xff) << 8 |
+    ((int)(components.blue * ratio) & 0xff)
   );
 }
 
 ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
+  float ratio = 256;
   Color color = *sharedColor;
   return ColorComponents {
-    (float)((color >> 16) & 0xff),
-    (float)((color >>  8) & 0xff),
-    (float)((color      ) & 0xff),
-    (float)((color >> 24) & 0xff)
+    (float)((color >> 16) & 0xff) / ratio,
+    (float)((color >>  8) & 0xff) / ratio,
+    (float)((color      ) & 0xff) / ratio,
+    (float)((color >> 24) & 0xff) / ratio
   };
 }
 
Fix color conversions for android

Summary: This diff fixes the color conversions for Android

Reviewed By: shergin

Differential Revision: D9093561

fbshipit-source-id: a17e61c58be511bd463dc0b21b632dc24066b8b6
