picrate 0.2.0-java → 0.3.0-java

data/src/main/java/processing/core/PImage.java

@@ -99,11 +99,7 @@ public class PImage implements PConstants, Cloneable {
 
   /** Actual dimensions of pixels array, taking into account the 2x setting. */
   public int pixelWidth;
-
-    /**
-     *
-     */
-    public int pixelHeight;
+  public int pixelHeight;
 
   /**
    * ( begin auto-generated from PImage_width.xml )
@@ -141,26 +137,7 @@ public class PImage implements PConstants, Cloneable {
 
   /** modified portion of the image */
   protected boolean modified;
-
-    /**
-     *
-     */
-    protected int mx1,
-
-    /**
-     *
-     */
-    my1,
-
-    /**
-     *
-     */
-    mx2,
-
-    /**
-     *
-     */
-    my2;
+  protected int mx1, my1, mx2, my2;
 
   /** Loaded pixels flag */
   public boolean loaded = false;
@@ -189,26 +166,10 @@ public class PImage implements PConstants, Cloneable {
   private int[][] blurMult;
 
   // colour component bitmasks (moved from PConstants in 2.0b7)
-
-    /**
-     *
-     */
   public static final int ALPHA_MASK = 0xff000000;
-
-    /**
-     *
-     */
-    public static final int RED_MASK   = 0x00ff0000;
-
-    /**
-     *
-     */
-    public static final int GREEN_MASK = 0x0000ff00;
-
-    /**
-     *
-     */
-    public static final int BLUE_MASK  = 0x000000ff;
+  public static final int RED_MASK   = 0x00ff0000;
+  public static final int GREEN_MASK = 0x0000ff00;
+  public static final int BLUE_MASK  = 0x000000ff;
 
 
   //////////////////////////////////////////////////////////////
@@ -266,8 +227,6 @@ public class PImage implements PConstants, Cloneable {
 
 
   /**
-     * @param width
-     * @param height
    * @nowebref
    * @param format Either RGB, ARGB, ALPHA (grayscale alpha channel)
    */
@@ -275,23 +234,14 @@ public class PImage implements PConstants, Cloneable {
     init(width, height, format, 1);
   }
 
-    /**
-     *
-     * @param width
-     * @param height
-     * @param format
-     * @param factor
-     */
-    public PImage(int width, int height, int format, int factor) {
+
+  public PImage(int width, int height, int format, int factor) {
     init(width, height, format, factor);
   }
 
 
   /**
    * Do not remove, see notes in the other variant.
-     * @param width
-     * @param height
-     * @param format
    */
   public void init(int width, int height, int format) {  // ignore
     init(width, height, format, 1);
@@ -304,10 +254,6 @@ public class PImage implements PConstants, Cloneable {
    * Used by Capture and Movie classes (and perhaps others),
    * because the width/height will not be known when super() is called.
    * (Leave this public so that other libraries can do the same.)
-     * @param width
-     * @param factor
-     * @param height
-     * @param format
    */
   public void init(int width, int height, int format, int factor) {  // ignore
     this.width = width;
@@ -400,7 +346,6 @@ public class PImage implements PConstants, Cloneable {
    * Use the getNative() method instead, which allows library interfaces to be
    * written in a cross-platform fashion for desktop, Android, and others.
    * This is still included for PGraphics objects, which may need the image.
-     * @return 
    */
   public Image getImage() {  // ignore
     return (Image) getNative();
@@ -409,7 +354,6 @@ public class PImage implements PConstants, Cloneable {
 
   /**
    * Returns a native BufferedImage from this PImage.
-     * @return 
    */
   public Object getNative() {  // ignore
     loadPixels();
@@ -426,20 +370,13 @@ public class PImage implements PConstants, Cloneable {
 
   // MARKING IMAGE AS MODIFIED / FOR USE w/ GET/SET
 
-    /**
-     *
-     * @return
-     */
-
 
   public boolean isModified() {  // ignore
     return modified;
   }
 
-    /**
-     *
-     */
-    public void setModified() {  // ignore
+
+  public void setModified() {  // ignore
     modified = true;
     mx1 = 0;
     my1 = 0;
@@ -447,43 +384,28 @@ public class PImage implements PConstants, Cloneable {
     my2 = pixelHeight;
   }
 
-    /**
-     *
-     * @param m
-     */
-    public void setModified(boolean m) {  // ignore
+
+  public void setModified(boolean m) {  // ignore
     modified = m;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getModifiedX1() {  // ignore
+
+  public int getModifiedX1() {  // ignore
     return mx1;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getModifiedX2() {  // ignore
+
+  public int getModifiedX2() {  // ignore
     return mx2;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getModifiedY1() {  // ignore
+
+  public int getModifiedY1() {  // ignore
     return my1;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getModifiedY2() {  // ignore
+
+  public int getModifiedY2() {  // ignore
     return my2;
   }
 
@@ -520,10 +442,8 @@ public class PImage implements PConstants, Cloneable {
     setLoaded();
   }
 
-    /**
-     *
-     */
-    public void updatePixels() {  // ignore
+
+  public void updatePixels() {  // ignore
     updatePixels(0, 0, pixelWidth, pixelHeight);
   }
 
@@ -596,8 +516,6 @@ public class PImage implements PConstants, Cloneable {
    * override of Object.clone(). We recommend using get() instead,
    * because it prevents you from needing to catch the
    * CloneNotSupportedException, and from doing a cast from the result.
-     * @return 
-     * @throws java.lang.CloneNotSupportedException
    */
   @Override
   public Object clone() throws CloneNotSupportedException {  // ignore
@@ -734,28 +652,18 @@ public class PImage implements PConstants, Cloneable {
 
   // MARKING IMAGE AS LOADED / FOR USE IN RENDERERS
 
-    /**
-     *
-     * @return
-     */
-
 
   public boolean isLoaded() { // ignore
     return loaded;
   }
 
-    /**
-     *
-     */
-    public void setLoaded() {  // ignore
+
+  public void setLoaded() {  // ignore
     loaded = true;
   }
 
-    /**
-     *
-     * @param l
-     */
-    public void setLoaded(boolean l) {  // ignore
+
+  public void setLoaded(boolean l) {  // ignore
     loaded = l;
   }
 
@@ -807,7 +715,6 @@ public class PImage implements PConstants, Cloneable {
    * type it is. If you want things to be more efficient, access the
    * pixels[] array directly.
    *
-     * @return 
    * @webref image:pixels
    * @brief Reads the color of any pixel or grabs a rectangle of pixels
    * @usage web_application
@@ -835,11 +742,8 @@ public class PImage implements PConstants, Cloneable {
 
 
   /**
-     * @param x
-     * @param y
    * @param w width of pixel rectangle to get
    * @param h height of pixel rectangle to get
-     * @return 
    */
   public PImage get(int x, int y, int w, int h) {
     int targetX = 0;
@@ -896,7 +800,6 @@ public class PImage implements PConstants, Cloneable {
   /**
    * Returns a copy of this PImage. Equivalent to get(0, 0, width, height).
    * Deprecated, just use copy() instead.
-     * @return 
    */
   public PImage get() {
     // Formerly this used clone(), which caused memory problems.
@@ -904,11 +807,8 @@ public class PImage implements PConstants, Cloneable {
     return get(0, 0, pixelWidth, pixelHeight);
   }
 
-    /**
-     *
-     * @return
-     */
-    public PImage copy() {
+
+  public PImage copy() {
     return get(0, 0, pixelWidth, pixelHeight);
   }
 
@@ -918,13 +818,6 @@ public class PImage implements PConstants, Cloneable {
    * has already been properly cropped to a valid region. That is, x/y/w/h
    * are guaranteed to be inside the image space, so the implementation can
    * use the fastest possible pixel copying method.
-     * @param sourceX
-     * @param sourceY
-     * @param sourceWidth
-     * @param target
-     * @param sourceHeight
-     * @param targetX
-     * @param targetY
    */
   protected void getImpl(int sourceX, int sourceY,
                          int sourceWidth, int sourceHeight,
@@ -983,9 +876,7 @@ public class PImage implements PConstants, Cloneable {
    * No variations are employed, meaning that any scale, tint, or imageMode
    * settings will be ignored.
    *
-     * @param x
    * @param img image to copy into the original image
-     * @param y
    */
   public void set(int x, int y, PImage img) {
     int sx = 0;
@@ -1020,13 +911,6 @@ public class PImage implements PConstants, Cloneable {
   /**
    * Internal function to actually handle setting a block of pixels that
    * has already been properly cropped from the image to a valid region.
-     * @param sourceImage
-     * @param sourceX
-     * @param targetY
-     * @param sourceHeight
-     * @param sourceY
-     * @param sourceWidth
-     * @param targetX
    */
   protected void setImpl(PImage sourceImage,
                          int sourceX, int sourceY,
@@ -1116,11 +1000,6 @@ public class PImage implements PConstants, Cloneable {
 
   // IMAGE FILTERS
 
-    /**
-     *
-     * @param kind
-     */
-
 
   public void filter(int kind) {
     loadPixels();
@@ -1329,7 +1208,6 @@ public class PImage implements PConstants, Cloneable {
    * bigger speed gains for larger radii (~30%)
    * added support for various image types (ALPHA, RGB, ARGB)
    * [toxi 050728]
-     * @param r
    */
   protected void buildBlurKernel(float r) {
     int radius = (int) (r * 3.5f);
@@ -1357,11 +1235,8 @@ public class PImage implements PConstants, Cloneable {
     }
   }
 
-    /**
-     *
-     * @param r
-     */
-    protected void blurAlpha(float r) {
+
+  protected void blurAlpha(float r) {
     int sum, cb;
     int read, ri, ym, ymi, bk0;
     int b2[] = new int[pixels.length];
@@ -1431,11 +1306,8 @@ public class PImage implements PConstants, Cloneable {
     }
   }
 
-    /**
-     *
-     * @param r
-     */
-    protected void blurRGB(float r) {
+
+  protected void blurRGB(float r) {
     int sum, cr, cg, cb; //, k;
     int /*pixel,*/ read, ri, /*roff,*/ ym, ymi, /*riw,*/ bk0;
     int r2[] = new int[pixels.length];
@@ -1516,11 +1388,8 @@ public class PImage implements PConstants, Cloneable {
     }
   }
 
-    /**
-     *
-     * @param r
-     */
-    protected void blurARGB(float r) {
+
+  protected void blurARGB(float r) {
     int sum, cr, cg, cb, ca;
     int /*pixel,*/ read, ri, /*roff,*/ ym, ymi, /*riw,*/ bk0;
     int wh = pixels.length;
@@ -1679,10 +1548,8 @@ public class PImage implements PConstants, Cloneable {
     System.arraycopy(outgoing, 0, pixels, 0, maxIndex);
   }
 
-    /**
-     *
-     */
-    protected void erode() {  // formerly dilate(true)
+
+  protected void erode() {  // formerly dilate(true)
     int index = 0;
     int maxIndex = pixels.length;
     int[] outgoing = new int[maxIndex];
@@ -1792,14 +1659,6 @@ public class PImage implements PConstants, Cloneable {
 
 /**
  * @param src an image variable referring to the source image.
-     * @param sx
-     * @param sy
-     * @param dh
-     * @param sw
-     * @param dx
-     * @param sh
-     * @param dy
-     * @param dw
  */
   public void copy(PImage src,
                    int sx, int sy, int sw, int sh,
@@ -1885,7 +1744,6 @@ public class PImage implements PConstants, Cloneable {
    * are preferrable, and the difference is insignificant for applications
    * built with Processing.</P>
    *
-     * @return 
    * @webref color:creating_reading
    * @usage web_application
    * @param c1 the first color to blend
@@ -1921,19 +1779,8 @@ public class PImage implements PConstants, Cloneable {
     return 0;
   }
 
-    /**
-     *
-     * @param sx
-     * @param sy
-     * @param sw
-     * @param sh
-     * @param dx
-     * @param dy
-     * @param dw
-     * @param dh
-     * @param mode
-     */
-    public void blend(int sx, int sy, int sw, int sh,
+
+  public void blend(int sx, int sy, int sw, int sh,
                     int dx, int dy, int dw, int dh, int mode) {
     blend(this, sx, sy, sw, sh, dx, dy, dw, dh, mode);
   }
@@ -3114,12 +2961,7 @@ int testFunction(int dst, int src) {
   static final String TIFF_ERROR =
     "Error: Processing can only read its own TIFF files.";
 
-    /**
-     *
-     * @param tiff
-     * @return
-     */
-    static protected PImage loadTIFF(byte tiff[]) {
+  static protected PImage loadTIFF(byte tiff[]) {
     if ((tiff[42] != tiff[102]) ||  // width/height in both places
         (tiff[43] != tiff[103])) {
       System.err.println(TIFF_ERROR);
@@ -3166,12 +3008,8 @@ int testFunction(int dst, int src) {
     return outgoing;
   }
 
-    /**
-     *
-     * @param output
-     * @return
-     */
-    protected boolean saveTIFF(OutputStream output) {
+
+  protected boolean saveTIFF(OutputStream output) {
     // shutting off the warning, people can figure this out themselves
     /*
     if (format != RGB) {
@@ -3229,8 +3067,6 @@ int testFunction(int dst, int src) {
    * </p>
    * Contributed by toxi 8-10 May 2005, based on this RLE
    * <A HREF="http://www.wotsit.org/download.asp?f=tga">specification</A>
-     * @param output
-     * @return 
    */
   protected boolean saveTGA(OutputStream output) {
     byte header[] = new byte[18];
@@ -3373,9 +3209,6 @@ int testFunction(int dst, int src) {
    * Various formats are supported, typically jpeg, png, bmp, and wbmp.
    * To get a list of the supported formats for writing, use: <BR>
    * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
-     * @param path
-     * @return 
-     * @throws java.io.IOException
    */
   protected boolean saveImageIO(String path) throws IOException {
     try {
@@ -3489,10 +3322,8 @@ int testFunction(int dst, int src) {
     return null;
   }
 
-    /**
-     *
-     */
-    protected String[] saveImageFormats;
+
+  protected String[] saveImageFormats;
 
   /**
    * ( begin auto-generated from PImage_save.xml )
@@ -3535,7 +3366,6 @@ int testFunction(int dst, int src) {
    * require a black and white image. Basic testing produced a zero-length
    * file with no error.
    *
-     * @return 
    * @webref pimage:method
    * @brief Saves the image to a TIFF, TARGA, PNG, or JPEG file
    * @usage application