src/demo/share/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java

*** 58,68 ****
  import j2dbench.tests.iio.IIOTests;
  
  public class ColorConvertOpTests extends ColorConversionTests {
  
      private static class ImageContent {
!         static ImageContent BLANK = new ImageContent("bank", "Blank (opaque black)");
          static ImageContent RANDOM = new ImageContent("random", "Random");
          static ImageContent VECTOR = new ImageContent("vector", "Vector Art");
          static ImageContent PHOTO= new ImageContent("photo", "Photograph");
  
          public final String name;
--- 58,68 ----
  import j2dbench.tests.iio.IIOTests;
  
  public class ColorConvertOpTests extends ColorConversionTests {
  
      private static class ImageContent {
!         static ImageContent BLANK = new ImageContent("blank", "Blank (opaque black)");
          static ImageContent RANDOM = new ImageContent("random", "Random");
          static ImageContent VECTOR = new ImageContent("vector", "Vector Art");
          static ImageContent PHOTO= new ImageContent("photo", "Photograph");
  
          public final String name;
*** 81,91 ****
      private static class ImageType {
          static ImageType INT_ARGB = new ImageType(BufferedImage.TYPE_INT_ARGB, "INT_ARGB", "TYPE_INT_ARGB");
          static ImageType INT_RGB = new ImageType(BufferedImage.TYPE_INT_RGB, "INT_RGB", "TYPE_INT_RGB");
          static ImageType INT_BGR = new ImageType(BufferedImage.TYPE_INT_BGR, "INT_BGR", "TYPE_INT_BGR");
          static ImageType BYTE_3BYTE_BGR = new ImageType(BufferedImage.TYPE_3BYTE_BGR, "3BYTE_BGR", "TYPE_3BYTE_BGR");
!         static ImageType BYTE_4BYTE_ABGR = new ImageType(BufferedImage.TYPE_4BYTE_ABGR, "4BYTE_BGR", "TYPE_4BYTE_BGR");
          static ImageType COMPATIBLE_DST = new ImageType(0, "Compatible", "Compatible destination");
  
          private ImageType(int type, String abbr, String descr) {
              this.type = type;
              this.abbrev = abbr;
--- 81,91 ----
      private static class ImageType {
          static ImageType INT_ARGB = new ImageType(BufferedImage.TYPE_INT_ARGB, "INT_ARGB", "TYPE_INT_ARGB");
          static ImageType INT_RGB = new ImageType(BufferedImage.TYPE_INT_RGB, "INT_RGB", "TYPE_INT_RGB");
          static ImageType INT_BGR = new ImageType(BufferedImage.TYPE_INT_BGR, "INT_BGR", "TYPE_INT_BGR");
          static ImageType BYTE_3BYTE_BGR = new ImageType(BufferedImage.TYPE_3BYTE_BGR, "3BYTE_BGR", "TYPE_3BYTE_BGR");
!         static ImageType BYTE_4BYTE_ABGR = new ImageType(BufferedImage.TYPE_4BYTE_ABGR, "4BYTE_ABGR", "TYPE_4BYTE_ABGR");
          static ImageType COMPATIBLE_DST = new ImageType(0, "Compatible", "Compatible destination");
  
          private ImageType(int type, String abbr, String descr) {
              this.type = type;
              this.abbrev = abbr;
*** 128,138 ****
          String[] abbrev = new String[num];
          String[] descr = new String[num];
  
          for (int i = 0; i < num; i++) {
              t[i] = allTypes[i];
!             names[i] = t[i].toString();
              abbrev[i] = t[i].abbrev;
              descr[i] = t[i].descr;
          }
  
          Option list = new Option.ObjectList(opOptionsRoot,
--- 128,138 ----
          String[] abbrev = new String[num];
          String[] descr = new String[num];
  
          for (int i = 0; i < num; i++) {
              t[i] = allTypes[i];
!             names[i] = t[i].abbrev;
              abbrev[i] = t[i].abbrev;
              descr[i] = t[i].descr;
          }
  
          Option list = new Option.ObjectList(opOptionsRoot,