Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEDFBD311 for ; Tue, 11 Dec 2012 18:00:34 +0000 (UTC) Received: (qmail 7322 invoked by uid 500); 11 Dec 2012 18:00:34 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 6890 invoked by uid 500); 11 Dec 2012 18:00:31 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 6848 invoked by uid 99); 11 Dec 2012 18:00:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 18:00:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 18:00:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CACD22388ABB; Tue, 11 Dec 2012 18:00:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1420309 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java Date: Tue, 11 Dec 2012 18:00:08 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121211180008.CACD22388ABB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: damjan Date: Tue Dec 11 18:00:07 2012 New Revision: 1420309 URL: http://svn.apache.org/viewvc?rev=1420309&view=rev Log: Use an enum for color components. Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java?rev=1420309&r1=1420308&r2=1420309&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java Tue Dec 11 18:00:07 2012 @@ -290,14 +290,14 @@ public class MedianCutQuantizer { && color_group.alpha_diff > color_group.red_diff && color_group.alpha_diff > color_group.green_diff && color_group.alpha_diff > color_group.blue_diff) { - doCut(color_group, ALPHA, color_groups); + doCut(color_group, ColorComponent.ALPHA, color_groups); } else if (color_group.red_diff > color_group.green_diff && color_group.red_diff > color_group.blue_diff) { - doCut(color_group, RED, color_groups); + doCut(color_group, ColorComponent.RED, color_groups); } else if (color_group.green_diff > color_group.blue_diff) { - doCut(color_group, GREEN, color_groups); + doCut(color_group, ColorComponent.GREEN, color_groups); } else { - doCut(color_group, BLUE, color_groups); + doCut(color_group, ColorComponent.BLUE, color_groups); } } @@ -328,12 +328,36 @@ public class MedianCutQuantizer { return new MedianCutPalette(root, palette); } - private static final int ALPHA = 0; - private static final int RED = 1; - private static final int GREEN = 2; - private static final int BLUE = 3; + private static enum ColorComponent { + ALPHA { + @Override + public int argbComponent(int argb) { + return (argb >> 24) & 0xff; + } + }, + RED { + @Override + public int argbComponent(int argb) { + return (argb >> 16) & 0xff; + } + }, + GREEN { + @Override + public int argbComponent(int argb) { + return (argb >> 8) & 0xff; + } + }, + BLUE { + @Override + public int argbComponent(int argb) { + return (argb & 0xff); + } + }; + + public abstract int argbComponent(int argb); + } - private void doCut(final ColorGroup color_group, final int mode, + private void doCut(final ColorGroup color_group, final ColorComponent mode, final List color_groups) throws ImageWriteException { int count_total = 0; for (int i = 0; i < color_group.color_counts.size(); i++) { @@ -421,9 +445,10 @@ public class MedianCutQuantizer { private static class ColorGroupCut { public final ColorGroup less, more; - public final int mode, limit; + public final ColorComponent mode; + public final int limit; - public ColorGroupCut(final ColorGroup less, final ColorGroup more, final int mode, + public ColorGroupCut(final ColorGroup less, final ColorGroup more, final ColorComponent mode, final int limit) { this.less = less; this.more = more; @@ -432,23 +457,7 @@ public class MedianCutQuantizer { } public ColorGroup getColorGroup(final int argb) { - int value; - switch (mode) { - case ALPHA: - value = 0xff & (argb >> 24); - break; - case RED: - value = 0xff & (argb >> 16); - break; - case GREEN: - value = 0xff & (argb >> 8); - break; - case BLUE: - value = 0xff & (argb >> 0); - break; - default: - throw new Error("bad mode."); - } + int value = mode.argbComponent(argb); if (value <= limit) { return less; }