propane 3.4.0-java → 3.4.1-java

data/src/main/java/processing/core/util/image/constants/TifConstants.java

@@ -1,45 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image.constants;
-
-
-/**
- * Constants to use for tif images.
- */
-public class TifConstants {
-
-  public static final byte TIFF_HEADER[] = {
-      77, 77, 0, 42, 0, 0, 0, 8, 0, 9, 0, -2, 0, 4, 0, 0, 0, 1, 0, 0,
-      0, 0, 1, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 0, 1,
-      0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 122, 1, 6, 0, 3, 0,
-      0, 0, 1, 0, 2, 0, 0, 1, 17, 0, 4, 0, 0, 0, 1, 0, 0, 3, 0, 1, 21,
-      0, 3, 0, 0, 0, 1, 0, 3, 0, 0, 1, 22, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0,
-      1, 23, 0, 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8
-  };
-
-  public static final String TIFF_ERROR =
-      "Error: Processing can only read its own TIFF files.";
-
-}

data/src/main/java/processing/core/util/image/load/AwtImageLoadStrategy.java

@@ -1,80 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image.load;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-
-
-/**
- * Strategy to load an image through ImageIcon / abstract window toolkit.
- */
-public class AwtImageLoadStrategy implements ImageLoadStrategy {
-
-  @Override
-  public PImage load(PApplet pApplet, String path, String extension) {
-    byte bytes[] = pApplet.loadBytes(path);
-    if (bytes == null) {
-      return null;
-    } else {
-      //Image awtImage = Toolkit.getDefaultToolkit().createImage(bytes);
-      Image awtImage = new ImageIcon(bytes).getImage();
-
-      if (awtImage instanceof BufferedImage) {
-        BufferedImage buffImage = (BufferedImage) awtImage;
-        int space = buffImage.getColorModel().getColorSpace().getType();
-        if (space == ColorSpace.TYPE_CMYK) {
-          System.err.println(path + " is a CMYK image, " +
-              "only RGB images are supported.");
-          return null;
-              /*
-              // wishful thinking, appears to not be supported
-              // https://community.oracle.com/thread/1272045?start=0&tstart=0
-              BufferedImage destImage =
-                new BufferedImage(buffImage.getWidth(),
-                                  buffImage.getHeight(),
-                                  BufferedImage.TYPE_3BYTE_BGR);
-              ColorConvertOp op = new ColorConvertOp(null);
-              op.filter(buffImage, destImage);
-              image = new PImage(destImage);
-              */
-        }
-      }
-
-      boolean checkAlpha = extension.equalsIgnoreCase("gif")
-          || extension.equalsIgnoreCase("png")
-          || extension.equalsIgnoreCase("unknown");
-
-      PImage image = new PImage(awtImage, checkAlpha, pApplet);
-      return image;
-    }
-  }
-
-}

data/src/main/java/processing/core/util/image/load/Base64StringImageLoadStrategy.java

@@ -1,73 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image.load;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.util.Base64;
-
-
-/**
- * Strategy for loading images from Base64 strings.
- */
-public class Base64StringImageLoadStrategy implements ImageLoadStrategy {
-
-  @Override
-  public PImage load(PApplet pApplet, String content, String extension) {
-    byte[] decodedBytes = Base64.getDecoder().decode(content);
-
-    if(decodedBytes == null){
-      System.err.println("Decode Error on image: " + content.substring(0, 20));
-      return null;
-    }
-
-    Image awtImage = new ImageIcon(decodedBytes).getImage();
-
-    if (awtImage instanceof BufferedImage) {
-      BufferedImage buffImage = (BufferedImage) awtImage;
-      int space = buffImage.getColorModel().getColorSpace().getType();
-      if (space == ColorSpace.TYPE_CMYK) {
-        return null;
-      }
-    }
-
-    PImage loadedImage = new PImage(
-        awtImage,
-        ImageLoadUtil.checkExtensionRequiresAlpha(extension)
-    );
-
-    if (loadedImage.width == -1) {
-      // error...
-    }
-
-    return loadedImage;
-  }
-
-}

data/src/main/java/processing/core/util/image/load/FallbackImageLoadStrategy.java

@@ -1,70 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image.load;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-
-
-/**
- * Image load strategy which uses a secondary strategy if failed.
- *
- * <p>
- * Image loading strategy strategy which attempts to load an image first through a "primary
- * strategy" and, if the primary failed, it then attemps loading through an alternative "secondary
- * strategy".
- * </p>
- */
-public class FallbackImageLoadStrategy implements ImageLoadStrategy {
-
-  private ImageLoadStrategy primaryStrategy;
-  private ImageLoadStrategy secondaryStrategy;
-
-  /**
-   * Create a new fallback image loading strategy.
-   *
-   * @param newPrimaryStrategy The strategy to try first.
-   * @param newSecondaryStrategy The strategy to try if the first fails.
-   */
-  public FallbackImageLoadStrategy(ImageLoadStrategy newPrimaryStrategy,
-      ImageLoadStrategy newSecondaryStrategy) {
-
-    primaryStrategy = newPrimaryStrategy;
-    secondaryStrategy = newSecondaryStrategy;
-  }
-
-  @Override
-  public PImage load(PApplet pApplet, String path, String extension) {
-    try {
-      return primaryStrategy.load(pApplet, path, extension);
-    } catch (Exception e) {
-      // show error, but move on to the stuff below, see if it'll work
-      e.printStackTrace();
-
-      return secondaryStrategy.load(pApplet, path, extension);
-    }
-  }
-
-}

data/src/main/java/processing/core/util/image/load/ImageIoImageLoadStrategy.java

@@ -1,132 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-
-package processing.core.util.image.load;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-import processing.core.util.io.InputFactory;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.atomic.AtomicReference;
-
-
-/**
- * Use Java 1.4 ImageIO methods to load an image.
- */
-public class ImageIoImageLoadStrategy implements ImageLoadStrategy {
-
-  private final AtomicReference<String[]> cachedLoadImageFormats;
-
-  public ImageIoImageLoadStrategy() {
-    cachedLoadImageFormats = new AtomicReference<>(null);
-  }
-
-  /**
-   * Load an image after checking that its format is supported.
-   *
-   * @param pApplet The PApplet on whose behalf an image is being loaded. If null, cannot use sketch
-   *    relative file paths.
-   * @param path The path to the file like "subdirectory/file.png". Note that paths without
-   *    extensions are supported and the extension is not read off this path but instead must be
-   *    specified in the extension parameter.
-   * @param extension The extension of the file to open.
-   * @return The newly loaded image.
-   */
-  @Override
-  public PImage load(PApplet pApplet, String path, String extension) {
-    String[] loadImageFormats = getLoadImageFormats();
-
-    if (loadImageFormats != null) {
-        for (String loadImageFormat : loadImageFormats) {
-            if (extension.equals(loadImageFormat)) {
-                return loadImageIOInner(pApplet, path);
-            }
-        }
-    }
-
-    // failed, could not load image after all those attempts
-    System.err.println("Could not find a method to load " + path);
-    return null;
-  }
-
-  /**
-   * Get the list of supported image formats.
-   *
-   * @return List of image formats like "png" that are supported by this strategy.
-   */
-  private String[] getLoadImageFormats() {
-    cachedLoadImageFormats.compareAndSet(null, ImageIO.getReaderFormatNames());
-    return cachedLoadImageFormats.get();
-  }
-
-  /**
-   * Load an image without checking that its format is supported.
-   *
-   * @param pApplet The PApplet on whose behalf an image is being loaded. If null, cannot use sketch
-   *    relative file paths.
-   * @param path The path to the file like "subdirectory/file.png". Note that paths without
-   *    extensions are supported and the extension is not read off this path but instead must be
-   *    specified in the extension parameter.
-   * @return The newly loaded image.
-   */
-  private PImage loadImageIOInner(PApplet pApplet, String filename) {
-    InputStream stream = InputFactory.createInput(pApplet, filename);
-    if (stream == null) {
-      System.err.println("The image " + filename + " could not be found.");
-      return null;
-    }
-
-    try {
-      BufferedImage bi = ImageIO.read(stream);
-
-      int width = bi.getWidth();
-      int height = bi.getHeight();
-      int[] pixels = new int[width * height];
-
-      bi.getRGB(0, 0, width, height, pixels, 0, width);
-
-      // check the alpha for this image
-      // was gonna call getType() on the image to see if RGB or ARGB,
-      // but it's not actually useful, since gif images will come through
-      // as TYPE_BYTE_INDEXED, which means it'll still have to check for
-      // the transparency. also, would have to iterate through all the other
-      // types and guess whether alpha was in there, so.. just gonna stick
-      // with the old method.
-      PImage outgoing = new PImage(width, height, pixels, true, pApplet);
-
-      stream.close();
-      // return the image
-      return outgoing;
-
-    } catch (IOException e) {
-      return null;
-    }
-  }
-
-}

data/src/main/java/processing/core/util/image/load/ImageLoadStrategy.java

@@ -1,48 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image.load;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-
-
-/**
- * Interface for strategies to load different image formats and through different methods.
- */
-public interface ImageLoadStrategy {
-
-  /**
-   * Load an image.
-   *
-   * @param pApplet The PApplet on whose behalf an image is being loaded.
-   * @param path The path to the file like "subdirectory/file.png". Note that paths without
-   *    extensions are supported and the extension is not read off this path but instead must be
-   *    specified in the extension parameter.
-   * @param extension The extension of the file to open.
-   * @return The PImage loaded from the given path.
-   */
-  PImage load(PApplet pApplet, String path, String extension);
-
-}