From: DRC Date: Sun, 16 Mar 2014 18:00:59 +0000 (+0000) Subject: Go ahead and deprecate the old constructor in 1.3.1 instead of in 1.4, since it uses... X-Git-Tag: 1.3.1~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcb5f023924d599a7d9112c59fb40a5da8c1ccf5;p=libjpeg-turbo Go ahead and deprecate the old constructor in 1.3.1 instead of in 1.4, since it uses a deprecated method git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1172 632fc199-4ca6-4c93-a231-07263d6284db --- diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index 37ca515..65951d2 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -82,6 +82,7 @@ function windowTitle()
Contents @@ -105,6 +106,21 @@ function windowTitle()  

+ + + + + + + + +
+Deprecated Constructors
org.libjpegturbo.turbojpeg.TJCompressor(byte[], int, int, int, int) +
+          Use + TJCompressor.TJCompressor(byte[], int, int, int, int, int, int) instead. 
+  +


diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 8560b85..e38d230 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -499,16 +499,15 @@ Constructor for class org.libjpegturbo.turbojpeg.TJCompressor - Class in org.libjpegturbo.turbojpeg
TurboJPEG compressor
TJCompressor() - Constructor for class org.libjpegturbo.turbojpeg.TJCompressor
Create a TurboJPEG compressor instance. -
TJCompressor(byte[], int, int, int, int) - -Constructor for class org.libjpegturbo.turbojpeg.TJCompressor -
Create a TurboJPEG compressor instance and associate the uncompressed - source image stored in srcImage with the newly-created - instance.
TJCompressor(byte[], int, int, int, int, int, int) - Constructor for class org.libjpegturbo.turbojpeg.TJCompressor
Create a TurboJPEG compressor instance and associate the uncompressed source image stored in srcImage with the newly-created instance. +
TJCompressor(byte[], int, int, int, int) - +Constructor for class org.libjpegturbo.turbojpeg.TJCompressor +
Deprecated. Use + TJCompressor.TJCompressor(byte[], int, int, int, int, int, int) instead.
TJCustomFilter - Interface in org.libjpegturbo.turbojpeg
Custom filter callback interface
TJDecompressor - Class in org.libjpegturbo.turbojpeg
TurboJPEG decompressor
TJDecompressor() - Constructor for class org.libjpegturbo.turbojpeg.TJDecompressor
Create a TurboJPEG decompresssor instance. diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html index 7fa3d0f..46feb37 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html @@ -127,9 +127,8 @@ TurboJPEG compressor int pixelFormat)
-          Create a TurboJPEG compressor instance and associate the uncompressed - source image stored in srcImage with the newly-created - instance. +          Deprecated. Use + TJCompressor(byte[], int, int, int, int, int, int) instead. TJCompressor(byte[] srcImage, @@ -342,10 +341,12 @@ public TJCompressor()
-

+

TJCompressor

 public TJCompressor(byte[] srcImage,
+                    int x,
+                    int y,
                     int width,
                     int pitch,
                     int height,
@@ -357,32 +358,29 @@ public TJCompressor(byte[] srcImage,
  instance.
 

-
Parameters:
srcImage - 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 +
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

-

+

TJCompressor

-public TJCompressor(byte[] srcImage,
-                    int x,
-                    int y,
-                    int width,
-                    int pitch,
-                    int height,
-                    int pixelFormat)
+@Deprecated
+public TJCompressor(byte[] srcImage,
+                               int width,
+                               int pitch,
+                               int height,
+                               int pixelFormat)
              throws java.lang.Exception
-
Create a TurboJPEG compressor instance and associate the uncompressed - source image stored in srcImage with the newly-created - instance. +
Deprecated. Use + TJCompressor(byte[], int, int, int, int, int, int) instead.

-
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
@@ -435,11 +433,12 @@ public void setSourceImage(byte[] srcImage,

setSourceImage

-public void setSourceImage(byte[] srcImage,
-                           int width,
-                           int pitch,
-                           int height,
-                           int pixelFormat)
+@Deprecated
+public void setSourceImage(byte[] srcImage,
+                                      int width,
+                                      int pitch,
+                                      int height,
+                                      int pixelFormat)
                     throws java.lang.Exception
Deprecated. Use diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html index 8f03736..5d24f31 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html @@ -777,12 +777,13 @@ public void decompress(byte[] dstBuf,

decompress

-public void decompress(byte[] dstBuf,
-                       int desiredWidth,
-                       int pitch,
-                       int desiredHeight,
-                       int pixelFormat,
-                       int flags)
+@Deprecated
+public void decompress(byte[] dstBuf,
+                                  int desiredWidth,
+                                  int pitch,
+                                  int desiredHeight,
+                                  int pixelFormat,
+                                  int flags)
                 throws java.lang.Exception
Deprecated. Use diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index 69b630f..8c4afdf 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -46,27 +46,6 @@ public class TJCompressor { init(); } - /** - * Create a TurboJPEG compressor instance and associate the uncompressed - * source image stored in srcImage with the newly-created - * instance. - * - * @param srcImage see {@link #setSourceImage} for description - * - * @param width see {@link #setSourceImage} for description - * - * @param pitch see {@link #setSourceImage} for description - * - * @param height see {@link #setSourceImage} for description - * - * @param pixelFormat pixel format of the source image (one of - * {@link TJ TJ.PF_*}) - */ - public TJCompressor(byte[] srcImage, int width, int pitch, int height, - int pixelFormat) throws Exception { - setSourceImage(srcImage, width, pitch, height, pixelFormat); - } - /** * Create a TurboJPEG compressor instance and associate the uncompressed * source image stored in srcImage with the newly-created @@ -92,6 +71,16 @@ public class TJCompressor { setSourceImage(srcImage, x, y, width, pitch, height, pixelFormat); } + /** + * @deprecated Use + * {@link #TJCompressor(byte[], int, int, int, int, int, int)} instead. + */ + @Deprecated + public TJCompressor(byte[] srcImage, int width, int pitch, int height, + int pixelFormat) throws Exception { + setSourceImage(srcImage, width, pitch, height, pixelFormat); + } + /** * Associate an uncompressed source image with this compressor instance. *