Adds support for IndexColorModel for HTML5 canvas

BobHanson · BobHanson · commit 3a27bef96c7b · 2020-04-29T09:26:42.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/BufferedImage.java b/sources/net.sf.j2s.java.core/src/java/awt/image/BufferedImage.java
@@ -248,7 +248,7 @@ public class BufferedImage extends Image implements RenderedImage, Transparency
 	 * Green, and Red stored in 3 bytes and 1 byte of alpha. The image has a
 	 * <code>ComponentColorModel</code> with alpha. The color data in this image is
 	 * considered not to be premultiplied with alpha. The byte data is interleaved
-	 * in a single byte array in the order B, G, R, A from lower to higher byte
+	 * in a single byte array in the order R, G, B, A from lower to higher byte
 	 * addresses within each pixel.
 	 */
 	public static final int TYPE_4BYTE_HTML5 = JSUtilI.TYPE_4BYTE_HTML5;
@@ -1902,15 +1902,15 @@ public void flush() {
 	}
 
 	/**
-	 * Creates an HTML5 Canvas-compatible int[] {b g r a...} array. We use int[]
+	 * Creates an HTML5 Canvas-compatible int[] {r g b a...} array. We use int[]
 	 * here just because that is what ColorModel.getComponents uses
 	 * 
 	 * @return
 	 */
 	private int[] 秘getPixelsFromRaster() {
 		// Coerse byte[] to int[] for SwingJS
-		if (imageType == TYPE_4BYTE_HTML5) 
-			return 秘pix = (int[])(Object) ((DataBufferByte) raster.getDataBuffer()).getData();
+		if (imageType == TYPE_4BYTE_HTML5)
+			return 秘pix = (int[]) (Object) ((DataBufferByte) raster.getDataBuffer()).getData();
 		int n = 秘wxh;
 		if (秘pix == null || 秘pix.length != n * 4)
 			秘pix = new int[n * 4];
@@ -1929,40 +1929,52 @@ public void flush() {
 		} else {
 			int nc = cm.getNumComponents();
 			raster.getPixels(0, 0, width, height, p);
-			switch (nc) {
-			case 1:
-				PixelConverter pc = PixelConverter.UshortGray.instance;
-				// gray -- first get those into the first 1/4
-				for (int i = n, pt = n * 4; --i >= 0;) {
-					int val = p[i];
-					p[--pt] = 0xFF;
-					switch (val) {
-					case 0xFFFF:
-					case 0:
-						p[--pt] = val;
-						p[--pt] = val;
-						p[--pt] = val;
-						break;
-					default:
-						int rgb = (val == 0 ? 0xFF000000 : val == 0xFFFF ? 0xFFFFFFFF : pc.pixelToRgb(val, null));
-						p[--pt] = rgb & 0xFF; // b
-						p[--pt] = (rgb >> 8) & 0xFF; // g
-						p[--pt] = (rgb >> 16) & 0xFF; // r
-						break;
-					}	
-					
+			if (cm instanceof IndexColorModel) {
+				IndexColorModel icm = (IndexColorModel) cm;
+				byte[] colors = icm.秘getColorMap();
+				for (int i = n, pt = n * 4; i > 0;) {
+					int index = (p[--i] << 2) + 4;
+					p[--pt] = colors[--index];
+					p[--pt] = colors[--index];
+					p[--pt] = colors[--index];
+					p[--pt] = colors[--index];
 				}
-				break;
-			case 3:
-				for (int i = n * 4, j = n * 3; --i >= 0;) {
-					if (i % 4 == 3)
-						p[i--] = 0xFF;
-					p[i] = p[--j];
+			} else {
+				switch (nc) {
+				case 1:
+					PixelConverter pc = PixelConverter.UshortGray.instance;
+					// gray -- first get those into the first 1/4
+					for (int i = n, pt = n * 4; --i >= 0;) {
+						int val = p[i];
+						p[--pt] = 0xFF;
+						switch (val) {
+						case 0xFFFF:
+						case 0:
+							p[--pt] = val;
+							p[--pt] = val;
+							p[--pt] = val;
+							break;
+						default:
+							int rgb = (val == 0 ? 0xFF000000 : val == 0xFFFF ? 0xFFFFFFFF : pc.pixelToRgb(val, null));
+							p[--pt] = rgb & 0xFF; // b
+							p[--pt] = (rgb >> 8) & 0xFF; // g
+							p[--pt] = (rgb >> 16) & 0xFF; // r
+							break;
+						}
+
+					}
+					break;
+				case 3:
+					for (int i = n * 4, j = n * 3; --i >= 0;) {
+						if (i % 4 == 3)
+							p[i--] = 0xFF;
+						p[i] = p[--j];
+					}
+					break;
+				case 4:
+					getRaster().getPixels(0, 0, width, height, p);
+					break;
 				}
-				break;
-			case 4:
-				getRaster().getPixels(0, 0, width, height, p);
-				break;
 			}
 		}
 		return p;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/IndexColorModel.java b/sources/net.sf.j2s.java.core/src/java/awt/image/IndexColorModel.java
@@ -1538,4 +1538,20 @@ public String toString() {
                          + " isAlphaPre = "+isAlphaPremultiplied
                          );
     }
+
+    private byte[] 秘colormap;
+	public byte[] 秘getColorMap() {
+		if (秘colormap != null)
+			return 秘colormap;
+		int n = getMapSize();
+		byte[] rgba = new byte[n * 4];
+		for (int i = 0, pt = 0; i < n; i++) {
+        // REMIND: Needs to change if different color space
+	        rgba[pt++] = (byte) getRed(i);
+	        rgba[pt++] = (byte) getGreen(i);
+	        rgba[pt++] = (byte) getBlue(i);
+	        rgba[pt++] = (byte) getAlpha(i);
+		}
+		return rgba;
+	}
 }
