From 42e83ff0e93f7c3ccbfb89175839a9df197f065e Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <alexander.zolotov@jetbrains.com>
Date: Wed, 16 Mar 2016 19:06:51 +0300
Subject: [PATCH] Color picker: proper color retrieving on mac

---
 .../src/com/intellij/ui/picker/MacColorPipette.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java
index 4da4c70855a2..18756d2f88ab 100644
--- a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java
+++ b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,12 @@ import org.jetbrains.annotations.Nullable;
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
+import java.awt.color.ColorSpace;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.ColorConvertOp;
 import java.io.ByteArrayInputStream;
 import java.nio.ByteBuffer;
 
@@ -213,7 +215,14 @@ public class MacColorPipette extends ColorPipetteBase {
       Foundation.invoke(nsImage, "release");
       byte[] b = new byte[byteBuffer.remaining()];
       byteBuffer.get(b);
-      return ImageIO.read(new ByteArrayInputStream(b));
+
+      BufferedImage result = ImageIO.read(new ByteArrayInputStream(b));
+      if (result != null) {
+        ColorSpace ics = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        ColorConvertOp cco = new ColorConvertOp(ics, null);
+        return cco.filter(result, null);
+      }
+      return null;
     }
     catch (Throwable t) {
       LOG.error(t);