From 87c4c756e4ec6c65f6e46f1d159cb380a3767b12 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 8 Mar 2002 01:38:12 +0000
Subject: [PATCH] Pass a color rather than an integer to the recoloration
 routine.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1100 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/media/image/ImageUtil.java    | 9 ++++-----
 src/java/com/threerings/media/tools/RecolorImage.java | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java
index 1699792cc..f814642dd 100644
--- a/src/java/com/threerings/media/image/ImageUtil.java
+++ b/src/java/com/threerings/media/image/ImageUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageUtil.java,v 1.5 2002/02/25 07:14:56 mdb Exp $
+// $Id: ImageUtil.java,v 1.6 2002/03/08 01:38:12 mdb Exp $
 
 package com.threerings.media.util;
 
@@ -98,7 +98,7 @@ public class ImageUtil
      * and modifying it.
      */
     public static BufferedImage recolorImage (
-        BufferedImage image, int rootColor, float[] dists, float[] offsets)
+        BufferedImage image, Color rootColor, float[] dists, float[] offsets)
     {
         ColorModel cm = image.getColorModel();
         if (!(cm instanceof IndexColorModel)) {
@@ -108,9 +108,8 @@ public class ImageUtil
         }
 
         // first convert the root color to HSV for later comparison
-        Color rcolor = new Color(rootColor);
-        float[] rHSV = Color.RGBtoHSB(rcolor.getRed(), rcolor.getGreen(),
-                                      rcolor.getBlue(), null);
+        float[] rHSV = Color.RGBtoHSB(rootColor.getRed(), rootColor.getGreen(),
+                                      rootColor.getBlue(), null);
         int[] frHSV = toFixedHSV(rHSV, null);
 
         // now process the image
diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/java/com/threerings/media/tools/RecolorImage.java
index 3918177e1..2e13717a2 100644
--- a/src/java/com/threerings/media/tools/RecolorImage.java
+++ b/src/java/com/threerings/media/tools/RecolorImage.java
@@ -1,5 +1,5 @@
 //
-// $Id: RecolorImage.java,v 1.1 2002/02/25 07:28:34 mdb Exp $
+// $Id: RecolorImage.java,v 1.2 2002/03/08 01:38:12 mdb Exp $
 
 package com.threerings.media.tools;
 
@@ -141,8 +141,8 @@ public class RecolorImage extends JPanel
                 float valO = Float.parseFloat(_valueO.getText());
                 float[] offsets = new float[] { hueO, satO, valO };
 
-                BufferedImage image = 
-                    ImageUtil.recolorImage(_image, color, dists, offsets);
+                BufferedImage image = ImageUtil.recolorImage(
+                    _image, new Color(color), dists, offsets);
                 _newImage.setIcon(new ImageIcon(image));
                 _status.setText("Recolored image.");
                 repaint();