Support for non-TYPE_3BYTE_BGR images

Author: chsin

object_detection/src/main/java/DetectObjects.java

@@ -147,11 +147,12 @@ private static void bgr2rgb(byte[] data) {
   private static Tensor<UInt8> makeImageTensor(String filename) throws IOException {
     BufferedImage img = ImageIO.read(new File(filename));
     if (img.getType() != BufferedImage.TYPE_3BYTE_BGR) {
-      throw new IOException(
-          String.format(
-              "Expected 3-byte BGR encoding in BufferedImage, found %d (file: %s). This code could be made more robust",
-              img.getType(), filename));
+      BufferedImage newImage = new BufferedImage(
+          img.getWidth(), img.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+      newImage.createGraphics().drawImage(img, 0, 0, img.getWidth(), img.getHeight(), null);
+      img = newImage;
     }
+      
     byte[] data = ((DataBufferByte) img.getData().getDataBuffer()).getData();
     // ImageIO.read seems to produce BGR-encoded images, but the model expects RGB.
     bgr2rgb(data);