diff --git a/ChangeLog.txt b/ChangeLog.txt index e1069f5e..65e64de0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -17,7 +17,8 @@ try-with-resources statement. [4] The TurboJPEG Java classes now throw unchecked idiomatic exceptions (IllegalArgumentException, IllegalStateException) for unrecoverable errors -caused by incorrect API usage. +caused by incorrect API usage, and those classes throw a new checked exception +type (TJException) for errors that are passed through from the C library. 1.4.1 diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index f9f9e572..0af8ae15 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -5,6 +5,7 @@ set(JAVA_CLASSNAMES org/libjpegturbo/turbojpeg/TJ org/libjpegturbo/turbojpeg/TJCompressor org/libjpegturbo/turbojpeg/TJCustomFilter org/libjpegturbo/turbojpeg/TJDecompressor + org/libjpegturbo/turbojpeg/TJException org/libjpegturbo/turbojpeg/TJScalingFactor org/libjpegturbo/turbojpeg/TJTransform org/libjpegturbo/turbojpeg/TJTransformer diff --git a/java/Makefile.am b/java/Makefile.am index 23e34129..475dd3fe 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -10,6 +10,7 @@ JAVASOURCES = org/libjpegturbo/turbojpeg/TJ.java \ org/libjpegturbo/turbojpeg/TJCompressor.java \ org/libjpegturbo/turbojpeg/TJCustomFilter.java \ org/libjpegturbo/turbojpeg/TJDecompressor.java \ + org/libjpegturbo/turbojpeg/TJException.java \ org/libjpegturbo/turbojpeg/TJScalingFactor.java \ org/libjpegturbo/turbojpeg/TJTransform.java \ org/libjpegturbo/turbojpeg/TJTransformer.java \ @@ -31,6 +32,7 @@ JAVA_CLASSES = org/libjpegturbo/turbojpeg/TJ.class \ org/libjpegturbo/turbojpeg/TJCompressor.class \ org/libjpegturbo/turbojpeg/TJCustomFilter.class \ org/libjpegturbo/turbojpeg/TJDecompressor.class \ + org/libjpegturbo/turbojpeg/TJException.class \ org/libjpegturbo/turbojpeg/TJLoader.class \ org/libjpegturbo/turbojpeg/TJScalingFactor.class \ org/libjpegturbo/turbojpeg/TJTransform.class \ diff --git a/java/TJExample.java b/java/TJExample.java index 75621143..da098078 100644 --- a/java/TJExample.java +++ b/java/TJExample.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2012, 2014 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012, 2014-2015 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -351,7 +351,7 @@ public class TJExample implements TJCustomFilter { public void customFilter(ShortBuffer coeffBuffer, Rectangle bufferRegion, Rectangle planeRegion, int componentIndex, int transformIndex, TJTransform transform) - throws Exception { + throws TJException { for (int i = 0; i < bufferRegion.width * bufferRegion.height; i++) { coeffBuffer.put(i, (short)(-coeffBuffer.get(i))); } diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index 509ea508..fecac06d 100644 --- a/java/doc/allclasses-frame.html +++ b/java/doc/allclasses-frame.html @@ -13,6 +13,7 @@
  • TJCompressor
  • TJCustomFilter
  • TJDecompressor
    • +
  • TJException
  • TJScalingFactor
  • TJTransform
  • TJTransformer
    • diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index 3eac18fa..1f7fd3c6 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -13,6 +13,7 @@
  • TJCompressor
  • TJCustomFilter
  • TJDecompressor
    • +
  • TJException
  • TJScalingFactor
  • TJTransform
  • TJTransformer
    • diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 1af78bed..a02d9c46 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -821,6 +821,16 @@ source image stored in yuvImage with the newly created instance. +
    TJException - Exception in org.libjpegturbo.turbojpeg
    +
     
    +
    TJException() - Constructor for exception org.libjpegturbo.turbojpeg.TJException
    +
     
    +
    TJException(String, Throwable) - Constructor for exception org.libjpegturbo.turbojpeg.TJException
    +
     
    +
    TJException(String) - Constructor for exception org.libjpegturbo.turbojpeg.TJException
    +
     
    +
    TJException(Throwable) - Constructor for exception org.libjpegturbo.turbojpeg.TJException
    +
     
    TJScalingFactor - Class in org.libjpegturbo.turbojpeg
    Fractional scaling factor
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index 3ff9b89d..ffef6578 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -1075,16 +1075,13 @@ public static final int FLAG_FORCESSE3

    bufSize

    public static int bufSize(int width,
           int height,
-          int jpegSubsamp)
-                   throws java.lang.Exception
    + int jpegSubsamp)
    Returns the maximum size of the buffer (in bytes) required to hold a JPEG image with the given width, height, and level of chrominance subsampling.
    Parameters:
    width - the width (in pixels) of the JPEG image
    height - the height (in pixels) of the JPEG image
    jpegSubsamp - the level of chrominance subsampling to be used when generating the JPEG image (one of TJ.SAMP_*)
    Returns:
    the maximum size of the buffer (in bytes) required to hold a JPEG - image with the given width, height, and level of chrominance subsampling.
    -
    Throws:
    -
    java.lang.Exception
    + image with the given width, height, and level of chrominance subsampling.
    @@ -1096,17 +1093,14 @@ public static final int FLAG_FORCESSE3 
    public static int bufSizeYUV(int width,
              int pad,
              int height,
-             int subsamp)
-                      throws java.lang.Exception
    + int subsamp)
    Returns the size of the buffer (in bytes) required to hold a YUV planar image with the given width, height, and level of chrominance subsampling.
    Parameters:
    width - the width (in pixels) of the YUV image
    pad - the width of each line in each plane of the image is padded to the nearest multiple of this number of bytes (must be a power of 2.)
    height - the height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling used in the YUV image (one of TJ.SAMP_*)
    Returns:
    the size of the buffer (in bytes) required to hold a YUV planar - image with the given width, height, and level of chrominance subsampling.
    -
    Throws:
    -
    java.lang.Exception
    + image with the given width, height, and level of chrominance subsampling. @@ -1118,11 +1112,8 @@ public static final int FLAG_FORCESSE3 
    @Deprecated
 public static int bufSizeYUV(int width,
                         int height,
-                        int subsamp)
-                      throws java.lang.Exception
    + int subsamp)
    Deprecated. Use bufSizeYUV(int, int, int, int) instead.
    -
    Throws:
    -
    java.lang.Exception
    @@ -1135,8 +1126,7 @@ public static int bufSizeYUV(int width, int width, int stride, int height, - int subsamp) - throws java.lang.Exception + int subsamp)
    Returns the size of the buffer (in bytes) required to hold a YUV image plane with the given parameters.
    Parameters:
    componentID - ID number of the image plane (0 = Y, 1 = U/Cb, @@ -1145,9 +1135,7 @@ public static int bufSizeYUV(int width, height of the whole image, not the plane height.
    subsamp - the level of chrominance subsampling used in the YUV image (one of TJ.SAMP_*)
    Returns:
    the size of the buffer (in bytes) required to hold a YUV planar - image with the given parameters.
    -
    Throws:
    -
    java.lang.Exception
    + image with the given parameters. @@ -1158,16 +1146,13 @@ public static int bufSizeYUV(int width,

    planeWidth

    public static int planeWidth(int componentID,
              int width,
-             int subsamp)
-                      throws java.lang.Exception
    + int subsamp)
    Returns the plane width of a YUV image plane with the given parameters. Refer to YUVImage for a description of plane width.
    Parameters:
    componentID - ID number of the image plane (0 = Y, 1 = U/Cb, 2 = V/Cr)
    width - width (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling used in the YUV image (one of TJ.SAMP_*)
    -
    Returns:
    the plane width of a YUV image plane with the given parameters.
    -
    Throws:
    -
    java.lang.Exception
    +
    Returns:
    the plane width of a YUV image plane with the given parameters.
    @@ -1178,16 +1163,13 @@ public static int bufSizeYUV(int width,

    planeHeight

    public static int planeHeight(int componentID,
               int height,
-              int subsamp)
-                       throws java.lang.Exception
    + int subsamp)
    Returns the plane height of a YUV image plane with the given parameters. Refer to YUVImage for a description of plane height.
    Parameters:
    componentID - ID number of the image plane (0 = Y, 1 = U/Cb, 2 = V/Cr)
    height - height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling used in the YUV image (one of TJ.SAMP_*)
    -
    Returns:
    the plane height of a YUV image plane with the given parameters.
    -
    Throws:
    -
    java.lang.Exception
    +
    Returns:
    the plane height of a YUV image plane with the given parameters.
    @@ -1196,14 +1178,11 @@ public static int bufSizeYUV(int width, diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index 9fe4f995..29f12b79 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -381,10 +381,10 @@ implements java.io.Closeable

  • TJCompressor

    public TJCompressor()
-             throws java.lang.Exception
    + throws TJException
    Create a TurboJPEG compressor instance.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    • @@ -400,14 +400,14 @@ implements java.io.Closeable int pitch, int height, int pixelFormat) - throws java.lang.Exception + throws TJException
    Create a TurboJPEG compressor instance and associate the uncompressed source image stored in srcImage with the newly created instance.
    Parameters:
    srcImage - see setSourceImage(byte[], int, int, int, int, int, int) for description
    x - see setSourceImage(byte[], int, int, int, int, int, int) for description
    y - see setSourceImage(byte[], int, int, int, int, int, int) for description
    width - see setSourceImage(byte[], int, int, int, int, int, int) for description
    pitch - see setSourceImage(byte[], int, int, int, int, int, int) for description
    height - see setSourceImage(byte[], int, int, int, int, int, int) for description
    pixelFormat - pixel format of the source image (one of TJ.PF_*)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -422,11 +422,11 @@ public TJCompressor(byte[] srcImage, int pitch, int height, int pixelFormat) - throws java.lang.Exception + throws TJException
    Deprecated. Use TJCompressor(byte[], int, int, int, int, int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -440,7 +440,7 @@ public TJCompressor(byte[] srcImage, int y, int width, int height) - throws java.lang.Exception + throws TJException
    Create a TurboJPEG compressor instance and associate the uncompressed source image stored in srcImage with the newly created instance.
    @@ -451,7 +451,7 @@ public TJCompressor(byte[] srcImage, setSourceImage(BufferedImage, int, int, int, int) for description
    height - see setSourceImage(BufferedImage, int, int, int, int) for description
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -475,7 +475,7 @@ public TJCompressor(byte[] srcImage, int pitch, int height, int pixelFormat) - throws java.lang.Exception + throws TJException
    Associate an uncompressed RGB, grayscale, or CMYK source image with this compressor instance.
    Parameters:
    srcImage - image buffer containing RGB, grayscale, or CMYK pixels to @@ -493,7 +493,7 @@ public TJCompressor(byte[] srcImage, which the JPEG or YUV image should be compressed/encoded
    pixelFormat - pixel format of the source image (one of TJ.PF_*)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -508,11 +508,11 @@ public void setSourceImage(byte[] srcImage, int pitch, int height, int pixelFormat) - throws java.lang.Exception + throws TJException
    Deprecated. Use setSourceImage(byte[], int, int, int, int, int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -526,7 +526,7 @@ public void setSourceImage(byte[] srcImage, int y, int width, int height) - throws java.lang.Exception + throws TJException
    Associate an uncompressed RGB or grayscale source image with this compressor instance.
    Parameters:
    srcImage - a BufferedImage instance containing RGB or @@ -538,7 +538,7 @@ public void setSourceImage(byte[] srcImage, which the JPEG or YUV image should be compressed/encoded (0 = use the height of the source image)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -548,13 +548,13 @@ public void setSourceImage(byte[] srcImage,

  • setSourceImage

    public void setSourceImage(YUVImage srcImage)
-                    throws java.lang.Exception
    + throws TJException
    Associate an uncompressed YUV planar source image with this compressor instance.
    Parameters:
    srcImage - YUV planar image to be compressed. This image is not modified.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    • @@ -604,7 +604,7 @@ public void setSourceImage(byte[] srcImage,

    compress

    public void compress(byte[] dstBuf,
             int flags)
-              throws java.lang.Exception
    + throws     TJException
    Compress the uncompressed source image associated with this compressor instance and output a JPEG image to the given destination buffer.
    Parameters:
    dstBuf - buffer that will receive the JPEG image. Use @@ -613,7 +613,7 @@ public void setSourceImage(byte[] srcImage, subsampling.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -623,7 +623,7 @@ public void setSourceImage(byte[] srcImage,

  • compress

    public byte[] compress(int flags)
-                throws java.lang.Exception
    + throws     TJException
    Compress the uncompressed source image associated with this compressor instance and return a buffer containing a JPEG image.
    Parameters:
    flags - the bitwise OR of one or more of @@ -631,7 +631,7 @@ public void setSourceImage(byte[] srcImage,
    Returns:
    a buffer containing a JPEG image. The length of this buffer will not be equal to the size of the JPEG image. Use getCompressedSize() to obtain the size of the JPEG image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    • @@ -644,12 +644,12 @@ public void setSourceImage(byte[] srcImage, public void compress(java.awt.image.BufferedImage srcImage, byte[] dstBuf, int flags) - throws java.lang.Exception + throws TJException
    Deprecated. Use setSourceImage(BufferedImage, int, int, int, int) and compress(byte[], int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -661,12 +661,12 @@ public void compress(java.awt.image.BufferedImage srcImage, 
    @Deprecated
 public byte[] compress(java.awt.image.BufferedImage srcImage,
                          int flags)
-                throws java.lang.Exception
    + throws     TJException
    Deprecated. Use setSourceImage(BufferedImage, int, int, int, int) and compress(int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -677,7 +677,7 @@ public byte[] compress(java.awt.image.BufferedImage srcImage,

    encodeYUV

    public void encodeYUV(YUVImage dstImage,
              int flags)
-               throws java.lang.Exception
    + throws TJException
    Encode the uncompressed source image associated with this compressor instance into a YUV planar image and store it in the given YUVImage instance. This method uses the accelerated color @@ -688,7 +688,7 @@ public byte[] compress(java.awt.image.BufferedImage srcImage, image
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -700,10 +700,10 @@ public byte[] compress(java.awt.image.BufferedImage srcImage, 
    @Deprecated
 public void encodeYUV(byte[] dstBuf,
                         int flags)
-               throws java.lang.Exception
    + throws     TJException
    Deprecated. Use encodeYUV(YUVImage, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -714,7 +714,7 @@ public void encodeYUV(byte[] dstBuf,

    encodeYUV

    public YUVImage encodeYUV(int pad,
                  int flags)
-                   throws java.lang.Exception
    + throws TJException
    Encode the uncompressed source image associated with this compressor instance into a unified YUV planar image buffer and return a YUVImage instance containing the encoded image. This method @@ -727,7 +727,7 @@ public void encodeYUV(byte[] dstBuf, TJ.FLAG_*
    Returns:
    a YUV planar image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -738,7 +738,7 @@ public void encodeYUV(byte[] dstBuf,

    encodeYUV

    public YUVImage encodeYUV(int[] strides,
                  int flags)
-                   throws java.lang.Exception
    + throws TJException
    Encode the uncompressed source image associated with this compressor instance into separate Y, U (Cb), and V (Cr) image planes and return a YUVImage instance containing the encoded image planes. This @@ -755,7 +755,7 @@ public void encodeYUV(byte[] dstBuf, TJ.FLAG_*
    Returns:
    a YUV planar image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -766,10 +766,10 @@ public void encodeYUV(byte[] dstBuf,

    encodeYUV

    @Deprecated
 public byte[] encodeYUV(int flags)
-                 throws java.lang.Exception
    + throws     TJException
    Deprecated. Use encodeYUV(int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -782,12 +782,12 @@ public byte[] encodeYUV(int flags) public void encodeYUV(java.awt.image.BufferedImage srcImage, byte[] dstBuf, int flags) - throws java.lang.Exception + throws TJException
    Deprecated. Use setSourceImage(BufferedImage, int, int, int, int) and encodeYUV(byte[], int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -799,12 +799,12 @@ public void encodeYUV(java.awt.image.BufferedImage srcImage, 
    @Deprecated
 public byte[] encodeYUV(java.awt.image.BufferedImage srcImage,
                           int flags)
-                 throws java.lang.Exception
    + throws     TJException
    Deprecated. Use setSourceImage(BufferedImage, int, int, int, int) and encodeYUV(int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -827,7 +827,7 @@ public byte[] encodeYUV(java.awt.image.BufferedImage srcImage,

  • close

    public void close()
-           throws java.io.IOException
    + throws     TJException
    Free the native structures associated with this compressor instance.
    Specified by:
    @@ -835,7 +835,7 @@ public byte[] encodeYUV(java.awt.image.BufferedImage srcImage,
    Specified by:
    close in interface java.lang.AutoCloseable
    Throws:
    -
    java.io.IOException
    +
    TJException
    • diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html index c2b6e613..6bd6fd27 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html @@ -144,7 +144,7 @@ int componentID, int transformID, TJTransform transform) - throws java.lang.Exception + throws TJException
    A callback function that can be used to modify the DCT coefficients after they are losslessly transformed but before they are transcoded to a new JPEG image. This allows for custom filters or other transformations to be @@ -165,7 +165,7 @@ transform in the transforms array that was passed to TJTransformer.transform().
    transform - a TJTransform instance that specifies the parameters and/or cropping region for this transform
    Throws:
    -
    java.lang.Exception
    +
    TJException
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index 6cec2cc2..a914de9e 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html @@ -33,7 +33,7 @@
    • Frames
      • @@ -534,10 +534,10 @@ implements java.io.Closeable

    • TJDecompressor

      public TJDecompressor()
-               throws java.lang.Exception
      + throws TJException
      Create a TurboJPEG decompresssor instance.
      Throws:
      -
      java.lang.Exception
      +
      TJException
    @@ -547,13 +547,13 @@ implements java.io.Closeable

  • TJDecompressor

    public TJDecompressor(byte[] jpegImage)
-               throws java.lang.Exception
    + throws     TJException
    Create a TurboJPEG decompressor instance and associate the JPEG source image stored in jpegImage with the newly created instance.
    Parameters:
    jpegImage - JPEG image buffer (size of the JPEG image is assumed to be the length of the array.) This buffer is not modified.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    • @@ -564,13 +564,13 @@ implements java.io.Closeable

    TJDecompressor

    public TJDecompressor(byte[] jpegImage,
               int imageSize)
-               throws java.lang.Exception
    + throws     TJException
    Create a TurboJPEG decompressor instance and associate the JPEG source image of length imageSize bytes stored in jpegImage with the newly created instance.
    Parameters:
    jpegImage - JPEG image buffer. This buffer is not modified.
    imageSize - size of the JPEG image (in bytes)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -580,14 +580,14 @@ implements java.io.Closeable

  • TJDecompressor

    public TJDecompressor(YUVImage yuvImage)
-               throws java.lang.Exception
    + throws TJException
    Create a TurboJPEG decompressor instance and associate the YUV planar source image stored in yuvImage with the newly created instance.
    Parameters:
    yuvImage - YUVImage instance containing a YUV planar image to be decoded. This image is not modified.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    • @@ -606,13 +606,13 @@ implements java.io.Closeable

    setSourceImage

    public void setSourceImage(byte[] jpegImage,
                   int imageSize)
-                    throws java.lang.Exception
    + throws TJException
    Associate the JPEG image of length imageSize bytes stored in jpegImage with this decompressor instance. This image will be used as the source image for subsequent decompress operations.
    Parameters:
    jpegImage - JPEG image buffer. This buffer is not modified.
    imageSize - size of the JPEG image (in bytes)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -624,10 +624,10 @@ implements java.io.Closeable 
    @Deprecated
 public void setJPEGImage(byte[] jpegImage,
                            int imageSize)
-                  throws java.lang.Exception
    + throws     TJException
    Deprecated. Use setSourceImage(byte[], int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -636,15 +636,12 @@ public void setJPEGImage(byte[] jpegImage,

    • setSourceImage

      -
      public void setSourceImage(YUVImage srcImage)
-                    throws java.lang.Exception
      +
      public void setSourceImage(YUVImage srcImage)
      Associate the specified YUV planar source image with this decompressor instance. Subsequent decompress operations will decode this image into an RGB or grayscale destination image.
      Parameters:
      srcImage - YUVImage instance containing a YUV planar image to - be decoded. This image is not modified.
      -
      Throws:
      -
      java.lang.Exception
      + be decoded. This image is not modified.
    @@ -732,8 +729,7 @@ public void setJPEGImage(byte[] jpegImage,

  • getScaledWidth

    public int getScaledWidth(int desiredWidth,
-                 int desiredHeight)
-                   throws java.lang.Exception
    + int desiredHeight)
    Returns the width of the largest scaled-down image that the TurboJPEG decompressor can generate without exceeding the desired image width and height.
    @@ -746,9 +742,7 @@ public void setJPEGImage(byte[] jpegImage, the scaled image size.)
    Returns:
    the width of the largest scaled-down image that the TurboJPEG decompressor can generate without exceeding the desired image width and - height.
    -
    Throws:
    -
    java.lang.Exception
    + height.
    • @@ -758,8 +752,7 @@ public void setJPEGImage(byte[] jpegImage,

  • getScaledHeight

    public int getScaledHeight(int desiredWidth,
-                  int desiredHeight)
-                    throws java.lang.Exception
    + int desiredHeight)
    Returns the height of the largest scaled-down image that the TurboJPEG decompressor can generate without exceeding the desired image width and height.
    @@ -772,9 +765,7 @@ public void setJPEGImage(byte[] jpegImage, the scaled image size.)
    Returns:
    the height of the largest scaled-down image that the TurboJPEG decompressor can generate without exceeding the desired image width and - height.
    -
    Throws:
    -
    java.lang.Exception
    + height.
    • @@ -791,7 +782,7 @@ public void setJPEGImage(byte[] jpegImage, int desiredHeight, int pixelFormat, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image or decode the YUV source image associated with this decompressor instance and output a grayscale, RGB, or CMYK image to the given destination buffer.
    @@ -839,7 +830,7 @@ public void setJPEGImage(byte[] jpegImage, TJ.PF_*)
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -855,11 +846,11 @@ public void decompress(byte[] dstBuf, int desiredHeight, int pixelFormat, int flags) - throws java.lang.Exception + throws TJException
    Deprecated. Use decompress(byte[], int, int, int, int, int, int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -873,7 +864,7 @@ public void decompress(byte[] dstBuf, int desiredHeight, int pixelFormat, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image associated with this decompressor instance and return a buffer containing the decompressed image.
    Parameters:
    desiredWidth - see @@ -887,7 +878,7 @@ public void decompress(byte[] dstBuf, TJ.FLAG_*
    Returns:
    a buffer containing the decompressed image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -898,7 +889,7 @@ public void decompress(byte[] dstBuf,

    decompressToYUV

    public void decompressToYUV(YUVImage dstImage,
                    int flags)
-                     throws java.lang.Exception
    + throws TJException
    Decompress the JPEG source image associated with this decompressor instance into a YUV planar image and store it in the given YUVImage instance. This method performs JPEG decompression @@ -913,7 +904,7 @@ public void decompress(byte[] dstBuf, source image.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -925,10 +916,10 @@ public void decompress(byte[] dstBuf, 
    @Deprecated
 public void decompressToYUV(byte[] dstBuf,
                               int flags)
-                     throws java.lang.Exception
    + throws     TJException
    Deprecated. Use decompressToYUV(YUVImage, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -941,7 +932,7 @@ public void decompressToYUV(byte[] dstBuf, int[] strides, int desiredHeight, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image associated with this decompressor instance into a set of Y, U (Cb), and V (Cr) image planes and return a YUVImage instance containing the decompressed image planes. @@ -971,7 +962,7 @@ public void decompressToYUV(byte[] dstBuf, TJ.FLAG_*
    Returns:
    a YUV planar image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -984,7 +975,7 @@ public void decompressToYUV(byte[] dstBuf, int pad, int desiredHeight, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image associated with this decompressor instance into a unified YUV planar image buffer and return a YUVImage instance containing the decompressed image. This @@ -1010,7 +1001,7 @@ public void decompressToYUV(byte[] dstBuf, TJ.FLAG_*
    Returns:
    a YUV planar image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -1021,10 +1012,10 @@ public void decompressToYUV(byte[] dstBuf,

    decompressToYUV

    @Deprecated
 public byte[] decompressToYUV(int flags)
-                       throws java.lang.Exception
    + throws     TJException
    Deprecated. Use decompressToYUV(int, int, int, int) instead.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -1041,7 +1032,7 @@ public byte[] decompressToYUV(int flags) int desiredHeight, int pixelFormat, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image or decode the YUV source image associated with this decompressor instance and output a grayscale, RGB, or CMYK image to the given destination buffer.
    @@ -1087,7 +1078,7 @@ public byte[] decompressToYUV(int flags) TJ.PF_*)
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -1098,7 +1089,7 @@ public byte[] decompressToYUV(int flags)

    decompress

    public void decompress(java.awt.image.BufferedImage dstImage,
               int flags)
-                throws java.lang.Exception
    + throws     TJException
    Decompress the JPEG source image or decode the YUV source image associated with this decompressor instance and output a decompressed/decoded image to the given BufferedImage instance.
    @@ -1111,7 +1102,7 @@ public byte[] decompressToYUV(int flags) height of the YUV image.
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -1124,7 +1115,7 @@ public byte[] decompressToYUV(int flags) int desiredHeight, int bufferedImageType, int flags) - throws java.lang.Exception + throws TJException
    Decompress the JPEG source image or decode the YUV source image associated with this decompressor instance and return a BufferedImage instance containing the decompressed/decoded image.
    @@ -1139,7 +1130,7 @@ public byte[] decompressToYUV(int flags)
    Returns:
    a BufferedImage instance containing the decompressed/decoded image.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -1149,7 +1140,7 @@ public byte[] decompressToYUV(int flags)

  • close

    public void close()
-           throws java.io.IOException
    + throws     TJException
    Free the native structures associated with this decompressor instance.
    Specified by:
    @@ -1157,7 +1148,7 @@ public byte[] decompressToYUV(int flags)
    Specified by:
    close in interface java.lang.AutoCloseable
    Throws:
    -
    java.io.IOException
    +
    TJException
    • @@ -1200,7 +1191,7 @@ public byte[] decompressToYUV(int flags)
    • Frames
      • diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJException.html b/java/doc/org/libjpegturbo/turbojpeg/TJException.html new file mode 100644 index 00000000..60880661 --- /dev/null +++ b/java/doc/org/libjpegturbo/turbojpeg/TJException.html @@ -0,0 +1,287 @@ + + + + +TJException + + + + + + +
      + + + + + +
      +
      + + + +
      + +
      +
      +
        +
      • Summary: 
        • +
      • Nested | 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
        +
      • Detail: 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
      + + +
      + + +
      +
      org.libjpegturbo.turbojpeg
      +

      Class TJException

      +
      +
      +
        +
      • java.lang.Object
        • +
      • +
          +
        • java.lang.Throwable
          • +
        • +
            +
          • java.lang.Exception
            • +
          • +
              +
            • java.io.IOException
              • +
            • +
                +
              • org.libjpegturbo.turbojpeg.TJException
                • +
              +
              • +
            +
            • +
          +
          • +
        +
        • +
      +
      +
        +
      • +
        +
        All Implemented Interfaces:
        +
        java.io.Serializable
        +
        +
        +
        +
        public class TJException
+extends java.io.IOException
        +
        See Also:
        Serialized Form
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Constructor Summary

          + + + + + + + + + + + + + + + + + +
          Constructors 
          Constructor and Description
          TJException() 
          TJException(java.lang.String message) 
          TJException(java.lang.String message, + java.lang.Throwable cause) 
          TJException(java.lang.Throwable cause) 
          +
          • +
        + +
          +
        • + + +

          Method Summary

          +
            +
          • + + +

            Methods inherited from class java.lang.Throwable

            +addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
            • +
          +
            +
          • + + +

            Methods inherited from class java.lang.Object

            +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
            • +
          +
          • +
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Constructor Detail

          + + + +
            +
          • +

            TJException

            +
            public TJException()
            +
            • +
          + + + +
            +
          • +

            TJException

            +
            public TJException(java.lang.String message,
+           java.lang.Throwable cause)
            +
            • +
          + + + +
            +
          • +

            TJException

            +
            public TJException(java.lang.String message)
            +
            • +
          + + + +
            +
          • +

            TJException

            +
            public TJException(java.lang.Throwable cause)
            +
            • +
          +
          • +
        +
        • +
      +
      +
      + + +
      + + + + + +
      +
      + + + +
      + +
      +
      +
        +
      • Summary: 
        • +
      • Nested | 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
        +
      • Detail: 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
      + + +
      + + + diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html index d6be7271..35d68826 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html @@ -32,7 +32,7 @@
      @@ -288,7 +288,7 @@ extends java.lang.Object
      diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html index daabfb3f..cf65bd2d 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html @@ -608,8 +608,7 @@ extends java.awt.Rectangle int h, int op, int options, - TJCustomFilter cf) - throws java.lang.Exception + TJCustomFilter cf)
      Create a new lossless transform instance with the given parameters.
      Parameters:
      x - the left boundary of the cropping region. This must be evenly divisible by the MCU block width (see TJ.getMCUWidth(int))
      y - the upper boundary of the cropping region. This must be evenly @@ -618,9 +617,7 @@ extends java.awt.Rectangle x).
      h - the height of the cropping region. Setting this to 0 is the equivalent of setting it to (height of the source JPEG image - y).
      op - one of the transform operations (OP_*)
      options - the bitwise OR of one or more of the transform options - (OPT_*)
      cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
      -
      Throws:
      -
      java.lang.Exception
      + (OPT_*)
      cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
    @@ -632,15 +629,12 @@ extends java.awt.Rectangle 
    public TJTransform(java.awt.Rectangle r,
            int op,
            int options,
-           TJCustomFilter cf)
-            throws java.lang.Exception
    + TJCustomFilter cf)
    Create a new lossless transform instance with the given parameters.
    Parameters:
    r - a Rectangle instance that specifies the cropping region. See TJTransform(int, int, int, int, int, int, TJCustomFilter) for more detail.
    op - one of the transform operations (OP_*)
    options - the bitwise OR of one or more of the transform options - (OPT_*)
    cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
    -
    Throws:
    -
    java.lang.Exception
    + (OPT_*)
    cf - an instance of an object that implements the TJCustomFilter interface, or null if no custom filter is needed
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html index 4d3a030c..36cbdb12 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html @@ -232,10 +232,10 @@ extends

    TJTransformer

    public TJTransformer()
-              throws java.lang.Exception
    + throws     TJException
    Create a TurboJPEG lossless transformer instance.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -245,13 +245,13 @@ extends

    TJTransformer

    public TJTransformer(byte[] jpegImage)
-              throws java.lang.Exception
    + throws     TJException
    Create a TurboJPEG lossless transformer instance and associate the JPEG image stored in jpegImage with the newly created instance.
    Parameters:
    jpegImage - JPEG image buffer (size of the JPEG image is assumed to be the length of the array.) This buffer is not modified.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -262,13 +262,13 @@ extends TJTransformer 
    public TJTransformer(byte[] jpegImage,
              int imageSize)
-              throws java.lang.Exception
    + throws     TJException
    Create a TurboJPEG lossless transformer instance and associate the JPEG image of length imageSize bytes stored in jpegImage with the newly created instance.
    Parameters:
    jpegImage - JPEG image buffer. This buffer is not modified.
    imageSize - size of the JPEG image (in bytes)
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -288,7 +288,7 @@ extends public void transform(byte[][] dstBufs, TJTransform[] transforms, int flags) - throws java.lang.Exception + throws TJException
    Losslessly transform the JPEG image associated with this transformer instance into one or more JPEG images stored in the given destination buffers. Lossless transforms work by moving the raw coefficients from one @@ -310,7 +310,7 @@ extends
    flags - the bitwise OR of one or more of TJ.FLAG_*
    Throws:
    -
    java.lang.Exception
    +
    TJException
    @@ -321,7 +321,7 @@ extends transform 
    public TJDecompressor[] transform(TJTransform[] transforms,
                          int flags)
-                           throws java.lang.Exception
    + throws TJException
    Losslessly transform the JPEG image associated with this transformer instance and return an array of TJDecompressor instances, each of which has a transformed JPEG image associated with it.
    @@ -332,7 +332,7 @@ extends Returns:
    an array of TJDecompressor instances, each of which has a transformed JPEG image associated with it.
    Throws:
    -
    java.lang.Exception
    +
    TJException
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/YUVImage.html b/java/doc/org/libjpegturbo/turbojpeg/YUVImage.html index 3efa218f..b2be0a09 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/YUVImage.html +++ b/java/doc/org/libjpegturbo/turbojpeg/YUVImage.html @@ -434,8 +434,7 @@ extends java.lang.Object 
    public YUVImage(int width,
         int[] strides,
         int height,
-        int subsamp)
-         throws java.lang.Exception
    + int subsamp)
    Create a new YUVImage instance backed by separate image planes, and allocate memory for the image planes.
    Parameters:
    width - width (in pixels) of the YUV image
    strides - an array of integers, each specifying the number of bytes @@ -445,9 +444,7 @@ extends java.lang.Object strides for all planes will be set to their respective plane widths. When using this constructor, the stride for each plane must be equal to or greater than the plane width.
    height - height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling to be used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -459,15 +456,12 @@ extends java.lang.Object 
    public YUVImage(int width,
         int pad,
         int height,
-        int subsamp)
-         throws java.lang.Exception
    + int subsamp)
    Create a new YUVImage instance backed by a unified image buffer, and allocate memory for the image buffer.
    Parameters:
    width - width (in pixels) of the YUV image
    pad - Each line of each plane in the YUV image buffer will be padded to this number of bytes (must be a power of 2.)
    height - height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling to be used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -481,8 +475,7 @@ extends java.lang.Object int width, int[] strides, int height, - int subsamp) - throws java.lang.Exception + int subsamp)
    Create a new YUVImage instance from a set of existing image planes.
    Parameters:
    planes - an array of buffers representing the Y, U (Cb), and V (Cr) @@ -503,9 +496,7 @@ extends java.lang.Object to each plane or to specify that this YUVImage instance is a subregion of a larger image (in which case, strides[i] should be set to the plane width of plane i in the larger image.)
    height - height (in pixels) of the new YUV image (or subregion)
    subsamp - the level of chrominance subsampling used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -518,8 +509,7 @@ extends java.lang.Object int width, int pad, int height, - int subsamp) - throws java.lang.Exception + int subsamp)
    Create a new YUVImage instance from an existing unified image buffer.
    Parameters:
    yuvImage - image buffer that contains or will contain YUV planar @@ -529,9 +519,7 @@ extends java.lang.Object of the image format.)
    width - width (in pixels) of the YUV image
    pad - the line padding used in the YUV image buffer. For instance, if each line in each plane of the buffer is padded to the nearest multiple of 4 bytes, then pad should be set to 4.
    height - height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -553,8 +541,7 @@ extends java.lang.Object int width, int[] strides, int height, - int subsamp) - throws java.lang.Exception + int subsamp)
    Assign a set of image planes to this YUVImage instance.
    Parameters:
    planes - an array of buffers representing the Y, U (Cb), and V (Cr) image planes (or just the Y plane, if the image is grayscale.) These @@ -574,9 +561,7 @@ extends java.lang.Object to each plane or to specify that this YUVImage image is a subregion of a larger image (in which case, strides[i] should be set to the plane width of plane i in the larger image.)
    height - height (in pixels) of the YUV image (or subregion)
    subsamp - the level of chrominance subsampling used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -589,8 +574,7 @@ extends java.lang.Object int width, int pad, int height, - int subsamp) - throws java.lang.Exception + int subsamp)
    Assign a unified image buffer to this YUVImage instance.
    Parameters:
    yuvImage - image buffer that contains or will contain YUV planar image data. Use TJ.bufSizeYUV(int, int, int, int) to determine the minimum size for @@ -599,9 +583,7 @@ extends java.lang.Object of the image format.)
    width - width (in pixels) of the YUV image
    pad - the line padding used in the YUV image buffer. For instance, if each line in each plane of the buffer is padded to the nearest multiple of 4 bytes, then pad should be set to 4.
    height - height (in pixels) of the YUV image
    subsamp - the level of chrominance subsampling used in the YUV - image (one of TJ.SAMP_*)
    -
    Throws:
    -
    java.lang.Exception
    + image (one of TJ.SAMP_*) @@ -704,13 +686,10 @@ extends java.lang.Object

    • getSize

      -
      public int getSize()
-            throws java.lang.Exception
      +
      public int getSize()
      Returns the size (in bytes) of the YUV image buffer (if this image is stored in a unified buffer rather than separate image planes.)
      -
      Returns:
      the size (in bytes) of the YUV image buffer
      -
      Throws:
      -
      java.lang.Exception
      +
      Returns:
      the size (in bytes) of the YUV image buffer
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html index 7cb8fa0b..08a8bf83 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-frame.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-frame.html @@ -22,6 +22,10 @@
  • TJTransformer
  • YUVImage
    • +

    Exceptions

    +
    diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html index ea360576..f94656ee 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-summary.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-summary.html @@ -134,6 +134,21 @@ +
  • + + + + + + + + + + + + +
    Exception Summary 
    ExceptionDescription
    TJException 
    +
    • diff --git a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html index cda68577..02a5cde1 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/package-tree.html +++ b/java/doc/org/libjpegturbo/turbojpeg/package-tree.html @@ -79,6 +79,19 @@ +
  • java.lang.Throwable (implements java.io.Serializable) +
      +
    • java.lang.Exception +
        +
      • java.io.IOException + +
        • +
      +
      • +
    +
  • org.libjpegturbo.turbojpeg.TJ
  • org.libjpegturbo.turbojpeg.TJCompressor (implements java.io.Closeable)
  • org.libjpegturbo.turbojpeg.TJDecompressor (implements java.io.Closeable) diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index c5a0ab9c..2ae76c61 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -83,6 +83,19 @@
    • +
  • java.lang.Throwable (implements java.io.Serializable) +
      +
    • java.lang.Exception +
        +
      • java.io.IOException + +
        • +
      +
      • +
    +
  • org.libjpegturbo.turbojpeg.TJ
  • org.libjpegturbo.turbojpeg.TJCompressor (implements java.io.Closeable)
  • org.libjpegturbo.turbojpeg.TJDecompressor (implements java.io.Closeable) diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index bbe18053..846cabc8 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -66,6 +66,15 @@

  • Package org.libjpegturbo.turbojpeg

      +
    • + + +

      Class org.libjpegturbo.turbojpeg.TJException extends java.io.IOException implements Serializable

      +
      +
      serialVersionUID:
      +
      1L
      +
      +
    • diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java index 5d355700..02d14c06 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -1,5 +1,6 @@ /* * Copyright (C)2011-2013 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -401,8 +402,7 @@ public final class TJ { * @return the maximum size of the buffer (in bytes) required to hold a JPEG * image with the given width, height, and level of chrominance subsampling. */ - public static native int bufSize(int width, int height, int jpegSubsamp) - throws Exception; + public static native int bufSize(int width, int height, int jpegSubsamp); /** * Returns the size of the buffer (in bytes) required to hold a YUV planar @@ -422,15 +422,13 @@ public final class TJ { * image with the given width, height, and level of chrominance subsampling. */ public static native int bufSizeYUV(int width, int pad, int height, - int subsamp) - throws Exception; + int subsamp); /** * @deprecated Use {@link #bufSizeYUV(int, int, int, int)} instead. */ @Deprecated - public static native int bufSizeYUV(int width, int height, int subsamp) - throws Exception; + public static native int bufSizeYUV(int width, int height, int subsamp); /** * Returns the size of the buffer (in bytes) required to hold a YUV image @@ -454,8 +452,7 @@ public final class TJ { * image with the given parameters. */ public static native int planeSizeYUV(int componentID, int width, int stride, - int height, int subsamp) - throws Exception; + int height, int subsamp); /** * Returns the plane width of a YUV image plane with the given parameters. @@ -471,8 +468,7 @@ public final class TJ { * * @return the plane width of a YUV image plane with the given parameters. */ - public static native int planeWidth(int componentID, int width, int subsamp) - throws Exception; + public static native int planeWidth(int componentID, int width, int subsamp); /** * Returns the plane height of a YUV image plane with the given parameters. @@ -489,8 +485,7 @@ public final class TJ { * @return the plane height of a YUV image plane with the given parameters. */ public static native int planeHeight(int componentID, int height, - int subsamp) - throws Exception; + int subsamp); /** * Returns a list of fractional scaling factors that the JPEG decompressor in @@ -499,8 +494,7 @@ public final class TJ { * @return a list of fractional scaling factors that the JPEG decompressor in * this implementation of TurboJPEG supports. */ - public static native TJScalingFactor[] getScalingFactors() - throws Exception; + public static native TJScalingFactor[] getScalingFactors(); static { TJLoader.load(); diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index b7df7212..2ff8e4d5 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -1,5 +1,6 @@ /* * Copyright (C)2011-2015 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -43,7 +44,7 @@ public class TJCompressor implements Closeable { /** * Create a TurboJPEG compressor instance. */ - public TJCompressor() throws Exception { + public TJCompressor() throws TJException { init(); } @@ -68,7 +69,7 @@ public class TJCompressor implements Closeable { * {@link TJ#PF_RGB TJ.PF_*}) */ public TJCompressor(byte[] srcImage, int x, int y, int width, int pitch, - int height, int pixelFormat) throws Exception { + int height, int pixelFormat) throws TJException { setSourceImage(srcImage, x, y, width, pitch, height, pixelFormat); } @@ -78,7 +79,7 @@ public class TJCompressor implements Closeable { */ @Deprecated public TJCompressor(byte[] srcImage, int width, int pitch, int height, - int pixelFormat) throws Exception { + int pixelFormat) throws TJException { setSourceImage(srcImage, width, pitch, height, pixelFormat); } @@ -103,7 +104,7 @@ public class TJCompressor implements Closeable { * {@link #setSourceImage(BufferedImage, int, int, int, int)} for description */ public TJCompressor(BufferedImage srcImage, int x, int y, int width, - int height) throws Exception { + int height) throws TJException { setSourceImage(srcImage, x, y, width, height); } @@ -140,7 +141,7 @@ public class TJCompressor implements Closeable { */ public void setSourceImage(byte[] srcImage, int x, int y, int width, int pitch, int height, int pixelFormat) - throws Exception { + throws TJException { if (handle == 0) init(); if (srcImage == null || x < 0 || y < 0 || width < 1 || height < 1 || pitch < 0 || pixelFormat < 0 || pixelFormat >= TJ.NUMPF) @@ -165,7 +166,7 @@ public class TJCompressor implements Closeable { */ @Deprecated public void setSourceImage(byte[] srcImage, int width, int pitch, - int height, int pixelFormat) throws Exception { + int height, int pixelFormat) throws TJException { setSourceImage(srcImage, 0, 0, width, pitch, height, pixelFormat); srcX = srcY = -1; } @@ -192,7 +193,7 @@ public class TJCompressor implements Closeable { * height of the source image) */ public void setSourceImage(BufferedImage srcImage, int x, int y, int width, - int height) throws Exception { + int height) throws TJException { if (handle == 0) init(); if (srcImage == null || x < 0 || y < 0 || width < 0 || height < 0) throw new IllegalArgumentException("Invalid argument in setSourceImage()"); @@ -263,7 +264,7 @@ public class TJCompressor implements Closeable { * @param srcImage YUV planar image to be compressed. This image is not * modified. */ - public void setSourceImage(YUVImage srcImage) throws Exception { + public void setSourceImage(YUVImage srcImage) throws TJException { if (handle == 0) init(); if (srcImage == null) throw new IllegalArgumentException("Invalid argument in setSourceImage()"); @@ -323,7 +324,7 @@ public class TJCompressor implements Closeable { * @param flags the bitwise OR of one or more of * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ - public void compress(byte[] dstBuf, int flags) throws Exception { + public void compress(byte[] dstBuf, int flags) throws TJException { if (dstBuf == null || flags < 0) throw new IllegalArgumentException("Invalid argument in compress()"); if (srcBuf == null && srcBufInt == null && srcYUVImage == null) @@ -373,7 +374,7 @@ public class TJCompressor implements Closeable { * not be equal to the size of the JPEG image. Use {@link * #getCompressedSize} to obtain the size of the JPEG image. */ - public byte[] compress(int flags) throws Exception { + public byte[] compress(int flags) throws TJException { checkSourceImage(); byte[] buf = new byte[TJ.bufSize(srcWidth, srcHeight, subsamp)]; compress(buf, flags); @@ -387,7 +388,7 @@ public class TJCompressor implements Closeable { */ @Deprecated public void compress(BufferedImage srcImage, byte[] dstBuf, int flags) - throws Exception { + throws TJException { setSourceImage(srcImage, 0, 0, 0, 0); compress(dstBuf, flags); } @@ -398,7 +399,8 @@ public class TJCompressor implements Closeable { * {@link #compress(int)} instead. */ @Deprecated - public byte[] compress(BufferedImage srcImage, int flags) throws Exception { + public byte[] compress(BufferedImage srcImage, int flags) + throws TJException { setSourceImage(srcImage, 0, 0, 0, 0); return compress(flags); } @@ -417,7 +419,7 @@ public class TJCompressor implements Closeable { * @param flags the bitwise OR of one or more of * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ - public void encodeYUV(YUVImage dstImage, int flags) throws Exception { + public void encodeYUV(YUVImage dstImage, int flags) throws TJException { if (dstImage == null || flags < 0) throw new IllegalArgumentException("Invalid argument in encodeYUV()"); if (srcBuf == null && srcBufInt == null) @@ -444,7 +446,7 @@ public class TJCompressor implements Closeable { * @deprecated Use {@link #encodeYUV(YUVImage, int)} instead. */ @Deprecated - public void encodeYUV(byte[] dstBuf, int flags) throws Exception { + public void encodeYUV(byte[] dstBuf, int flags) throws TJException { if(dstBuf == null) throw new IllegalArgumentException("Invalid argument in encodeYUV()"); checkSourceImage(); @@ -470,7 +472,7 @@ public class TJCompressor implements Closeable { * * @return a YUV planar image. */ - public YUVImage encodeYUV(int pad, int flags) throws Exception { + public YUVImage encodeYUV(int pad, int flags) throws TJException { checkSourceImage(); checkSubsampling(); if(pad < 1 || ((pad & (pad - 1)) != 0)) @@ -501,7 +503,7 @@ public class TJCompressor implements Closeable { * * @return a YUV planar image. */ - public YUVImage encodeYUV(int[] strides, int flags) throws Exception { + public YUVImage encodeYUV(int[] strides, int flags) throws TJException { checkSourceImage(); checkSubsampling(); YUVImage yuvImage = new YUVImage(srcWidth, strides, srcHeight, subsamp); @@ -513,7 +515,7 @@ public class TJCompressor implements Closeable { * @deprecated Use {@link #encodeYUV(int, int)} instead. */ @Deprecated - public byte[] encodeYUV(int flags) throws Exception { + public byte[] encodeYUV(int flags) throws TJException { checkSourceImage(); checkSubsampling(); YUVImage yuvImage = new YUVImage(srcWidth, 4, srcHeight, subsamp); @@ -528,7 +530,7 @@ public class TJCompressor implements Closeable { */ @Deprecated public void encodeYUV(BufferedImage srcImage, byte[] dstBuf, int flags) - throws Exception { + throws TJException { setSourceImage(srcImage, 0, 0, 0, 0); encodeYUV(dstBuf, flags); } @@ -539,7 +541,8 @@ public class TJCompressor implements Closeable { * {@link #encodeYUV(int, int)} instead. */ @Deprecated - public byte[] encodeYUV(BufferedImage srcImage, int flags) throws Exception { + public byte[] encodeYUV(BufferedImage srcImage, int flags) + throws TJException { setSourceImage(srcImage, 0, 0, 0, 0); return encodeYUV(flags); } @@ -559,7 +562,7 @@ public class TJCompressor implements Closeable { * Free the native structures associated with this compressor instance. */ @Override - public void close() throws IOException { + public void close() throws TJException { if (handle != 0) destroy(); } @@ -568,55 +571,59 @@ public class TJCompressor implements Closeable { protected void finalize() throws Throwable { try { close(); - } catch(Exception e) { + } catch(TJException e) { } finally { super.finalize(); } }; - private native void init() throws Exception; + private native void init() throws TJException; - private native void destroy() throws IOException; + private native void destroy() throws TJException; // JPEG size in bytes is returned + @Deprecated private native int compress(byte[] srcBuf, int width, int pitch, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, int jpegQual, - int flags) throws Exception; // deprecated + int flags) throws TJException; private native int compress(byte[] srcBuf, int x, int y, int width, int pitch, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, - int jpegQual, int flags) throws Exception; + int jpegQual, int flags) throws TJException; + @Deprecated private native int compress(int[] srcBuf, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, int jpegQual, - int flags) throws Exception; // deprecated + int flags) throws TJException; private native int compress(int[] srcBuf, int x, int y, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int jpegSubsamp, - int jpegQual, int flags) throws Exception; + int jpegQual, int flags) throws TJException; private native int compressFromYUV(byte[][] srcPlanes, int[] srcOffsets, int width, int[] srcStrides, int height, int subsamp, byte[] dstBuf, int jpegQual, int flags) - throws Exception; + throws TJException; + @Deprecated private native void encodeYUV(byte[] srcBuf, int width, int pitch, int height, int pixelFormat, byte[] dstBuf, int subsamp, int flags) - throws Exception; // deprecated + throws TJException; private native void encodeYUV(byte[] srcBuf, int x, int y, int width, int pitch, int height, int pixelFormat, byte[][] dstPlanes, int[] dstOffsets, int[] dstStrides, int subsamp, int flags) - throws Exception; + throws TJException; + @Deprecated private native void encodeYUV(int[] srcBuf, int width, int stride, int height, int pixelFormat, byte[] dstBuf, int subsamp, int flags) - throws Exception; // deprecated + throws TJException; private native void encodeYUV(int[] srcBuf, int x, int y, int width, int srcStride, int height, int pixelFormat, byte[][] dstPlanes, int[] dstOffsets, int[] dstStrides, int subsamp, int flags) - throws Exception; + throws TJException; static { TJLoader.load(); diff --git a/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java index bf78f2e8..9a34587a 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java +++ b/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java @@ -72,5 +72,5 @@ public interface TJCustomFilter { void customFilter(ShortBuffer coeffBuffer, Rectangle bufferRegion, Rectangle planeRegion, int componentID, int transformID, TJTransform transform) - throws Exception; + throws TJException; } diff --git a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java index 7ca656b3..bd0e6943 100644 --- a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java @@ -1,5 +1,6 @@ /* * Copyright (C)2011-2015 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -43,7 +44,7 @@ public class TJDecompressor implements Closeable { /** * Create a TurboJPEG decompresssor instance. */ - public TJDecompressor() throws Exception { + public TJDecompressor() throws TJException { init(); } @@ -54,7 +55,7 @@ public class TJDecompressor implements Closeable { * @param jpegImage JPEG image buffer (size of the JPEG image is assumed to * be the length of the array.) This buffer is not modified. */ - public TJDecompressor(byte[] jpegImage) throws Exception { + public TJDecompressor(byte[] jpegImage) throws TJException { init(); setSourceImage(jpegImage, jpegImage.length); } @@ -68,7 +69,7 @@ public class TJDecompressor implements Closeable { * * @param imageSize size of the JPEG image (in bytes) */ - public TJDecompressor(byte[] jpegImage, int imageSize) throws Exception { + public TJDecompressor(byte[] jpegImage, int imageSize) throws TJException { init(); setSourceImage(jpegImage, imageSize); } @@ -81,7 +82,7 @@ public class TJDecompressor implements Closeable { * @param yuvImage {@link YUVImage} instance containing a YUV planar * image to be decoded. This image is not modified. */ - public TJDecompressor(YUVImage yuvImage) throws Exception { + public TJDecompressor(YUVImage yuvImage) throws TJException { init(); setSourceImage(yuvImage); } @@ -96,7 +97,7 @@ public class TJDecompressor implements Closeable { * @param imageSize size of the JPEG image (in bytes) */ public void setSourceImage(byte[] jpegImage, int imageSize) - throws Exception { + throws TJException { if (jpegImage == null || imageSize < 1) throw new IllegalArgumentException("Invalid argument in setSourceImage()"); jpegBuf = jpegImage; @@ -109,7 +110,8 @@ public class TJDecompressor implements Closeable { * @deprecated Use {@link #setSourceImage(byte[], int)} instead. */ @Deprecated - public void setJPEGImage(byte[] jpegImage, int imageSize) throws Exception { + public void setJPEGImage(byte[] jpegImage, int imageSize) + throws TJException { setSourceImage(jpegImage, imageSize); } @@ -121,7 +123,7 @@ public class TJDecompressor implements Closeable { * @param srcImage {@link YUVImage} instance containing a YUV planar image to * be decoded. This image is not modified. */ - public void setSourceImage(YUVImage srcImage) throws Exception { + public void setSourceImage(YUVImage srcImage) { if (srcImage == null) throw new IllegalArgumentException("Invalid argument in setSourceImage()"); yuvImage = srcImage; @@ -239,8 +241,7 @@ public class TJDecompressor implements Closeable { * decompressor can generate without exceeding the desired image width and * height. */ - public int getScaledWidth(int desiredWidth, int desiredHeight) - throws Exception { + public int getScaledWidth(int desiredWidth, int desiredHeight) { if (jpegWidth < 1 || jpegHeight < 1) throw new IllegalStateException(NO_ASSOC_ERROR); if (desiredWidth < 0 || desiredHeight < 0) @@ -281,8 +282,7 @@ public class TJDecompressor implements Closeable { * decompressor can generate without exceeding the desired image width and * height. */ - public int getScaledHeight(int desiredWidth, int desiredHeight) - throws Exception { + public int getScaledHeight(int desiredWidth, int desiredHeight) { if (jpegWidth < 1 || jpegHeight < 1) throw new IllegalStateException(NO_ASSOC_ERROR); if (desiredWidth < 0 || desiredHeight < 0) @@ -370,7 +370,7 @@ public class TJDecompressor implements Closeable { */ public void decompress(byte[] dstBuf, int x, int y, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, - int flags) throws Exception { + int flags) throws TJException { if (jpegBuf == null && yuvImage == null) throw new IllegalStateException(NO_ASSOC_ERROR); if (dstBuf == null || x < 0 || y < 0 || pitch < 0 || @@ -399,7 +399,7 @@ public class TJDecompressor implements Closeable { @Deprecated public void decompress(byte[] dstBuf, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, int flags) - throws Exception { + throws TJException { decompress(dstBuf, 0, 0, desiredWidth, pitch, desiredHeight, pixelFormat, flags); } @@ -429,7 +429,7 @@ public class TJDecompressor implements Closeable { * @return a buffer containing the decompressed image. */ public byte[] decompress(int desiredWidth, int pitch, int desiredHeight, - int pixelFormat, int flags) throws Exception { + int pixelFormat, int flags) throws TJException { if (pitch < 0 || (yuvImage == null && (desiredWidth < 0 || desiredHeight < 0)) || pixelFormat < 0 || pixelFormat >= TJ.NUMPF || flags < 0) @@ -462,7 +462,8 @@ public class TJDecompressor implements Closeable { * @param flags the bitwise OR of one or more of * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ - public void decompressToYUV(YUVImage dstImage, int flags) throws Exception { + public void decompressToYUV(YUVImage dstImage, int flags) + throws TJException { if (jpegBuf == null) throw new IllegalStateException(NO_ASSOC_ERROR); if (dstImage == null || flags < 0) @@ -486,7 +487,7 @@ public class TJDecompressor implements Closeable { * @deprecated Use {@link #decompressToYUV(YUVImage, int)} instead. */ @Deprecated - public void decompressToYUV(byte[] dstBuf, int flags) throws Exception { + public void decompressToYUV(byte[] dstBuf, int flags) throws TJException { YUVImage dstImage = new YUVImage(dstBuf, jpegWidth, 4, jpegHeight, jpegSubsamp); decompressToYUV(dstImage, flags); @@ -532,7 +533,7 @@ public class TJDecompressor implements Closeable { */ public YUVImage decompressToYUV(int desiredWidth, int[] strides, int desiredHeight, - int flags) throws Exception { + int flags) throws TJException { if (flags < 0) throw new IllegalArgumentException("Invalid argument in decompressToYUV()"); if (jpegWidth < 1 || jpegHeight < 1 || jpegSubsamp < 0) @@ -585,7 +586,7 @@ public class TJDecompressor implements Closeable { * @return a YUV planar image. */ public YUVImage decompressToYUV(int desiredWidth, int pad, int desiredHeight, - int flags) throws Exception { + int flags) throws TJException { if (flags < 0) throw new IllegalArgumentException("Invalid argument in decompressToYUV()"); if (jpegWidth < 1 || jpegHeight < 1 || jpegSubsamp < 0) @@ -607,7 +608,7 @@ public class TJDecompressor implements Closeable { * @deprecated Use {@link #decompressToYUV(int, int, int, int)} instead. */ @Deprecated - public byte[] decompressToYUV(int flags) throws Exception { + public byte[] decompressToYUV(int flags) throws TJException { YUVImage dstImage = new YUVImage(jpegWidth, 4, jpegHeight, jpegSubsamp); decompressToYUV(dstImage, flags); return dstImage.getBuf(); @@ -677,7 +678,7 @@ public class TJDecompressor implements Closeable { */ public void decompress(int[] dstBuf, int x, int y, int desiredWidth, int stride, int desiredHeight, int pixelFormat, - int flags) throws Exception { + int flags) throws TJException { if (jpegBuf == null && yuvImage == null) throw new IllegalStateException(NO_ASSOC_ERROR); if (dstBuf == null || x < 0 || y < 0 || stride < 0 || @@ -710,7 +711,8 @@ public class TJDecompressor implements Closeable { * @param flags the bitwise OR of one or more of * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ - public void decompress(BufferedImage dstImage, int flags) throws Exception { + public void decompress(BufferedImage dstImage, int flags) + throws TJException { if (dstImage == null || flags < 0) throw new IllegalArgumentException("Invalid argument in decompress()"); int desiredWidth = dstImage.getWidth(); @@ -819,7 +821,7 @@ public class TJDecompressor implements Closeable { */ public BufferedImage decompress(int desiredWidth, int desiredHeight, int bufferedImageType, int flags) - throws Exception { + throws TJException { if ((yuvImage == null && (desiredWidth < 0 || desiredHeight < 0)) || flags < 0) throw new IllegalArgumentException("Invalid argument in decompress()"); @@ -835,7 +837,7 @@ public class TJDecompressor implements Closeable { * Free the native structures associated with this decompressor instance. */ @Override - public void close() throws IOException { + public void close() throws TJException { if (handle != 0) destroy(); } @@ -844,49 +846,52 @@ public class TJDecompressor implements Closeable { protected void finalize() throws Throwable { try { close(); - } catch(Exception e) { + } catch(TJException e) { } finally { super.finalize(); } }; - private native void init() throws Exception; + private native void init() throws TJException; - private native void destroy() throws IOException; + private native void destroy() throws TJException; private native void decompressHeader(byte[] srcBuf, int size) - throws Exception; + throws TJException; + @Deprecated private native void decompress(byte[] srcBuf, int size, byte[] dstBuf, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, int flags) - throws Exception; // deprecated + throws TJException; private native void decompress(byte[] srcBuf, int size, byte[] dstBuf, int x, int y, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, - int flags) throws Exception; + int flags) throws TJException; + @Deprecated private native void decompress(byte[] srcBuf, int size, int[] dstBuf, int desiredWidth, int stride, int desiredHeight, int pixelFormat, - int flags) throws Exception; // deprecated + int flags) throws TJException; private native void decompress(byte[] srcBuf, int size, int[] dstBuf, int x, int y, int desiredWidth, int stride, int desiredHeight, int pixelFormat, - int flags) throws Exception; + int flags) throws TJException; + @Deprecated private native void decompressToYUV(byte[] srcBuf, int size, byte[] dstBuf, - int flags) throws Exception; // deprecated + int flags) throws TJException; private native void decompressToYUV(byte[] srcBuf, int size, byte[][] dstPlanes, int[] dstOffsets, int desiredWidth, int[] dstStrides, - int desiredheight, int flags) throws Exception; + int desiredheight, int flags) throws TJException; private native void decodeYUV(byte[][] srcPlanes, int[] srcOffsets, int[] srcStrides, int subsamp, byte[] dstBuf, int x, int y, int width, - int pitch, int height, int pixelFormat, int flags) throws Exception; + int pitch, int height, int pixelFormat, int flags) throws TJException; private native void decodeYUV(byte[][] srcPlanes, int[] srcOffsets, int[] srcStrides, int subsamp, int[] dstBuf, int x, int y, int width, - int stride, int height, int pixelFormat, int flags) throws Exception; + int stride, int height, int pixelFormat, int flags) throws TJException; static { TJLoader.load(); diff --git a/java/org/libjpegturbo/turbojpeg/TJException.java b/java/org/libjpegturbo/turbojpeg/TJException.java new file mode 100644 index 00000000..59c20413 --- /dev/null +++ b/java/org/libjpegturbo/turbojpeg/TJException.java @@ -0,0 +1,53 @@ +/* + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither the name of the libjpeg-turbo Project nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS", + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package org.libjpegturbo.turbojpeg; + +import java.io.IOException; + +public class TJException extends IOException { + + private static final long serialVersionUID = 1L; + + public TJException() { + super(); + } + + public TJException(String message, Throwable cause) { + super(message, cause); + } + + public TJException(String message) { + super(message); + } + + public TJException(Throwable cause) { + super(cause); + } + +} diff --git a/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java b/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java index 069d15a6..ddb1d75a 100644 --- a/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java +++ b/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java @@ -1,5 +1,6 @@ /* * Copyright (C)2011 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/java/org/libjpegturbo/turbojpeg/TJTransform.java b/java/org/libjpegturbo/turbojpeg/TJTransform.java index b464ffd4..7381f36e 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransform.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransform.java @@ -160,7 +160,7 @@ public class TJTransform extends Rectangle { * TJCustomFilter} interface, or null if no custom filter is needed */ public TJTransform(int x, int y, int w, int h, int op, int options, - TJCustomFilter cf) throws Exception { + TJCustomFilter cf) { super(x, y, w, h); this.op = op; this.options = options; @@ -184,7 +184,7 @@ public class TJTransform extends Rectangle { * TJCustomFilter} interface, or null if no custom filter is needed */ public TJTransform(Rectangle r, int op, int options, - TJCustomFilter cf) throws Exception { + TJCustomFilter cf) { super(r); this.op = op; this.options = options; diff --git a/java/org/libjpegturbo/turbojpeg/TJTransformer.java b/java/org/libjpegturbo/turbojpeg/TJTransformer.java index 6d3d81d3..d76647fd 100644 --- a/java/org/libjpegturbo/turbojpeg/TJTransformer.java +++ b/java/org/libjpegturbo/turbojpeg/TJTransformer.java @@ -1,5 +1,6 @@ /* * Copyright (C)2011, 2013-2015 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -36,7 +37,7 @@ public class TJTransformer extends TJDecompressor { /** * Create a TurboJPEG lossless transformer instance. */ - public TJTransformer() throws Exception { + public TJTransformer() throws TJException { init(); } @@ -47,7 +48,7 @@ public class TJTransformer extends TJDecompressor { * @param jpegImage JPEG image buffer (size of the JPEG image is assumed to * be the length of the array.) This buffer is not modified. */ - public TJTransformer(byte[] jpegImage) throws Exception { + public TJTransformer(byte[] jpegImage) throws TJException { init(); setSourceImage(jpegImage, jpegImage.length); } @@ -61,7 +62,7 @@ public class TJTransformer extends TJDecompressor { * * @param imageSize size of the JPEG image (in bytes) */ - public TJTransformer(byte[] jpegImage, int imageSize) throws Exception { + public TJTransformer(byte[] jpegImage, int imageSize) throws TJException { init(); setSourceImage(jpegImage, imageSize); } @@ -94,7 +95,7 @@ public class TJTransformer extends TJDecompressor { * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ public void transform(byte[][] dstBufs, TJTransform[] transforms, - int flags) throws Exception { + int flags) throws TJException { if (jpegBuf == null) throw new IllegalStateException("JPEG buffer not initialized"); transformedSizes = transform(jpegBuf, jpegBufSize, dstBufs, transforms, @@ -117,7 +118,7 @@ public class TJTransformer extends TJDecompressor { * {@link TJ#FLAG_BOTTOMUP TJ.FLAG_*} */ public TJDecompressor[] transform(TJTransform[] transforms, int flags) - throws Exception { + throws TJException { byte[][] dstBufs = new byte[transforms.length][]; if (jpegWidth < 1 || jpegHeight < 1) throw new IllegalStateException("JPEG buffer not initialized"); @@ -149,10 +150,10 @@ public class TJTransformer extends TJDecompressor { return transformedSizes; } - private native void init() throws Exception; + private native void init() throws TJException; private native int[] transform(byte[] srcBuf, int srcSize, byte[][] dstBufs, - TJTransform[] transforms, int flags) throws Exception; + TJTransform[] transforms, int flags) throws TJException; static { TJLoader.load(); diff --git a/java/org/libjpegturbo/turbojpeg/YUVImage.java b/java/org/libjpegturbo/turbojpeg/YUVImage.java index 44a81c70..1a05e62f 100644 --- a/java/org/libjpegturbo/turbojpeg/YUVImage.java +++ b/java/org/libjpegturbo/turbojpeg/YUVImage.java @@ -1,5 +1,6 @@ /* * Copyright (C)2014 D. R. Commander. All Rights Reserved. + * Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -86,8 +87,7 @@ public class YUVImage { * @param subsamp the level of chrominance subsampling to be used in the YUV * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ - public YUVImage(int width, int[] strides, int height, int subsamp) - throws Exception { + public YUVImage(int width, int[] strides, int height, int subsamp) { setBuf(null, null, width, strides, height, subsamp, true); } @@ -105,8 +105,7 @@ public class YUVImage { * @param subsamp the level of chrominance subsampling to be used in the YUV * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ - public YUVImage(int width, int pad, int height, int subsamp) - throws Exception { + public YUVImage(int width, int pad, int height, int subsamp) { setBuf(new byte[TJ.bufSizeYUV(width, pad, height, subsamp)], width, pad, height, subsamp); } @@ -146,7 +145,7 @@ public class YUVImage { * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ public YUVImage(byte[][] planes, int[] offsets, int width, int[] strides, - int height, int subsamp) throws Exception { + int height, int subsamp) { setBuf(planes, offsets, width, strides, height, subsamp, false); } @@ -172,7 +171,7 @@ public class YUVImage { * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ public YUVImage(byte[] yuvImage, int width, int pad, int height, - int subsamp) throws Exception { + int subsamp) { setBuf(yuvImage, width, pad, height, subsamp); } @@ -210,12 +209,12 @@ public class YUVImage { * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ public void setBuf(byte[][] planes, int[] offsets, int width, int strides[], - int height, int subsamp) throws Exception { + int height, int subsamp) { setBuf(planes, offsets, width, strides, height, subsamp, false); } private void setBuf(byte[][] planes, int[] offsets, int width, int strides[], - int height, int subsamp, boolean alloc) throws Exception { + int height, int subsamp, boolean alloc) { if ((planes == null && !alloc) || width < 1 || height < 1 || subsamp < 0 || subsamp >= TJ.NUMSAMP) throw new IllegalArgumentException("Invalid argument in YUVImage::setBuf()"); @@ -279,7 +278,7 @@ public class YUVImage { * image (one of {@link TJ#SAMP_444 TJ.SAMP_*}) */ public void setBuf(byte[] yuvImage, int width, int pad, int height, - int subsamp) throws Exception { + int subsamp) { if (yuvImage == null || width < 1 || pad < 1 || ((pad & (pad - 1)) != 0) || height < 1 || subsamp < 0 || subsamp >= TJ.NUMSAMP) throw new IllegalArgumentException("Invalid argument in YUVImage::setBuf()"); @@ -413,7 +412,7 @@ public class YUVImage { * * @return the size (in bytes) of the YUV image buffer */ - public int getSize() throws Exception { + public int getSize() { if (yuvPlanes == null || yuvSubsamp < 0 || yuvSubsamp >= TJ.NUMSAMP) throw new IllegalStateException(NO_ASSOC_ERROR); int nc = (yuvSubsamp == TJ.SAMP_GRAY ? 1 : 3); diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c index 0d0b80c5..b3e99fbc 100644 --- a/turbojpeg-jni.c +++ b/turbojpeg-jni.c @@ -46,9 +46,7 @@ goto bailout; \ } -#define _throwio(msg) _throw(msg, "java/io/IOException") - -#define _throwtj() _throw(tjGetErrorStr(), "java/lang/Exception") +#define _throwtj() _throw(tjGetErrorStr(), "org/libjpegturbo/turbojpeg/TJException") #define _throwarg(msg) _throw(msg, "java/lang/IllegalArgumentException") @@ -107,7 +105,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize (JNIEnv *env, jclass cls, jint width, jint height, jint jpegSubsamp) { jint retval=(jint)tjBufSize(width, height, jpegSubsamp); - if(retval==-1) _throwtj(); + if(retval==-1) _throwarg(tjGetErrorStr()); bailout: return retval; @@ -118,7 +116,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__IIII (JNIEnv *env, jclass cls, jint width, jint pad, jint height, jint subsamp) { jint retval=(jint)tjBufSizeYUV2(width, pad, height, subsamp); - if(retval==-1) _throwtj(); + if(retval==-1) _throwarg(tjGetErrorStr()); bailout: return retval; @@ -139,7 +137,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeSizeYUV__IIIII { jint retval=(jint)tjPlaneSizeYUV(componentID, width, stride, height, subsamp); - if(retval==-1) _throwtj(); + if(retval==-1) _throwarg(tjGetErrorStr()); bailout: return retval; @@ -150,7 +148,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeWidth__III (JNIEnv *env, jclass cls, jint componentID, jint width, jint subsamp) { jint retval=(jint)tjPlaneWidth(componentID, width, subsamp); - if(retval==-1) _throwtj(); + if(retval==-1) _throwarg(tjGetErrorStr()); bailout: return retval; @@ -161,7 +159,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeHeight__III (JNIEnv *env, jclass cls, jint componentID, jint height, jint subsamp) { jint retval=(jint)tjPlaneHeight(componentID, height, subsamp); - if(retval==-1) _throwtj(); + if(retval==-1) _throwarg(tjGetErrorStr()); bailout: return retval; @@ -323,7 +321,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compressFrom int pw=tjPlaneWidth(i, width, subsamp); if(planeSize<0 || pw<0) - _throwtj(); + _throwarg(tjGetErrorStr()); if(srcOffsets[i]<0) _throwarg("Invalid argument in compressFromYUV()"); @@ -402,7 +400,7 @@ static void TJCompressor_encodeYUV int pw=tjPlaneWidth(i, width, subsamp); if(planeSize<0 || pw<0) - _throwtj(); + _throwarg(tjGetErrorStr()); if(dstOffsets[i]<0) _throwarg("Invalid argument in encodeYUV()"); @@ -537,7 +535,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy gethandle(); - if(tjDestroy(handle)==-1) _throwio(tjGetErrorStr()); + if(tjDestroy(handle)==-1) _throwtj(); (*env)->SetLongField(env, obj, _fid, 0); bailout: @@ -572,7 +570,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_libjpegturbo_turbojpeg_TJ_getScalingFact jobjectArray sfjava=NULL; if((sf=tjGetScalingFactors(&n))==NULL || n==0) - _throwtj(); + _throwarg(tjGetErrorStr()); bailif0(sfcls=(*env)->FindClass(env, "org/libjpegturbo/turbojpeg/TJScalingFactor")); bailif0(sfjava=(jobjectArray)(*env)->NewObjectArray(env, n, sfcls, 0)); @@ -751,7 +749,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress if(height==0) height=jpegHeight; sf=tjGetScalingFactors(&nsf); if(!sf || nsf<1) - _throwtj(); + _throwarg(tjGetErrorStr()); for(i=0; i