From: DRC Date: Tue, 27 Jun 2017 15:54:21 +0000 (-0500) Subject: TurboJPEG: Improve error handling X-Git-Tag: 1.5.90~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4092f6b4dd94c64864662987b070d517c399490;p=libjpeg-turbo TurboJPEG: Improve error handling - Provide a new C API function and TJException method that allows calling programs to query the severity of a compression/decompression/ transform error. - Provide a new flag that instructs the library to immediately stop compressing/decompressing/transforming if a warning is encountered. Fixes #151 --- diff --git a/ChangeLog.md b/ChangeLog.md index f96d5fc..731500b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -48,6 +48,17 @@ in a thread-safe manner. Retrieving error messages from global functions, such as `tjInitCompress()` or `tjBufSize()`, is still thread-unsafe, but since those functions will only throw errors if passed an invalid argument or if a memory allocation failure occurs, thread safety is not as much of a concern. + - Introduced a new function (`tjGetErrorCode()`) in the TurboJPEG C API +and a new method (`TJException.getErrorCode()`) in the TurboJPEG Java API that +can be used to determine the severity of the last +compression/decompression/transform error. This allows applications to +choose whether to ignore warnings (non-fatal errors) from the underlying +libjpeg API or to treat them as fatal. + - Introduced a new flag (`TJFLAG_STOPONWARNING` in the TurboJPEG C API and +`TJ.FLAG_STOPONWARNING` in the TurboJPEG Java API) that causes the library to +immediately halt a compression/decompression/transform operation if it +encounters a warning from the underlying libjpeg API (the default behavior is +to allow the operation to complete unless a fatal error is encountered.) 1.5.2 diff --git a/doc/html/group___turbo_j_p_e_g.html b/doc/html/group___turbo_j_p_e_g.html index fb5da8c..49c54ca 100644 --- a/doc/html/group___turbo_j_p_e_g.html +++ b/doc/html/group___turbo_j_p_e_g.html @@ -128,6 +128,12 @@ Macros #define TJFLAG_ACCURATEDCT Use the most accurate DCT/IDCT algorithm available in the underlying codec. More...
+#define TJFLAG_STOPONWARNING + Immediately discontinue the current compression/decompression/transform operation if the underlying codec throws a warning (non-fatal error). More...
+ +#define TJ_NUMERR + The number of error codes. More...
+ #define TJ_NUMXOP The number of transform operations. More...
@@ -206,6 +212,11 @@ Enumerations } JPEG colorspaces. More...
+enum TJERR { TJERR_WARNING, +TJERR_FATAL + } + Error codes. More...
+ enum TJXOP {
TJXOP_NONE, TJXOP_HFLIP, @@ -298,6 +309,9 @@ Functions DLLEXPORT char *DLLCALL tjGetErrorStr2 (tjhandle handle) Returns a descriptive error message explaining why the last command failed. More...
+DLLEXPORT int DLLCALL tjGetErrorCode (tjhandle handle) + Returns a code indicating the severity of the last error. More...
+ @@ -341,6 +355,20 @@ Variables

The number of JPEG colorspaces.

+ + + +

Variables

+ + + +

#define TJ_NUMERR

+ +

The number of error codes.

@@ -457,6 +485,21 @@ Variables

Disable buffer (re)allocation.

If passed to tjCompress2() or tjTransform(), this flag will cause those functions to generate an error if the JPEG image buffer is invalid or too small rather than attempting to allocate or reallocate that buffer. This reproduces the behavior of earlier versions of TurboJPEG.

+ + + +

+ + + + +

#define TJFLAG_STOPONWARNING

+ +

Immediately discontinue the current compression/decompression/transform operation if the underlying codec throws a warning (non-fatal error).

The default behavior is to allow the operation to complete unless a fatal error is encountered.

@@ -642,6 +685,28 @@ Variables + + + +

+ + + + +

enum TJERR

+ +

Error codes.

+ + + +

Enumerator
TJERR_WARNING	+ The error was non-fatal and recoverable, but the image may still be corrupt. +
TJERR_FATAL	+ The error was fatal and non-recoverable. +

@@ -1018,7 +1083,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1115,7 +1180,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1212,7 +1277,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1305,7 +1370,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1398,7 +1463,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1483,7 +1548,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1554,7 +1619,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1633,7 +1698,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1712,7 +1777,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1830,7 +1895,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1923,7 +1988,7 @@ If you choose option 1, *jpegSize should be set to the size of your -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

@@ -1951,6 +2016,32 @@ If you choose option 1, *jpegSize should be set to the size of your

See Also: tjAlloc()

+ + + +

+ + + + + + + + +

DLLEXPORT int DLLCALL tjGetErrorCode ( tjhandle handle )

+ +

Returns a code indicating the severity of the last error.

See Error codes.

Parameters

+ + +

handle a handle to a TurboJPEG compressor, decompressor or transformer instance

Returns: a code indicating the severity of the last error. See Error codes.

@@ -2285,7 +2376,7 @@ If you choose option 1, dstSizes[i] should be set to the size of yo -

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2().)

Returns: 0 if successful, or -1 if an error occurred (see tjGetErrorStr2() and tjGetErrorCode().)

diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index eec0aee..b18cdcd 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -1,6 +1,7 @@ var searchData= [ ['tj_5fnumcs',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]], + ['tj_5fnumerr',['TJ_NUMERR',['../group___turbo_j_p_e_g.html#ga79bde1b4a3e2351e00887e47781b966e',1,'turbojpeg.h']]], ['tj_5fnumpf',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]], ['tj_5fnumsamp',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]], ['tj_5fnumxop',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]], @@ -26,12 +27,17 @@ var searchData= ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga674adee917b95ad4a896f1ba39e12540',1,'turbojpeg.h']]], ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gaabe05acd734990053ad1294b5ef239aa',1,'turbojpeg.h']]], ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga8a65ed3bd12df57c219d46afbc9008f1',1,'turbojpeg.h']]], + ['tjerr',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]], + ['tjerr_5ffatal',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]], + ['tjerr_5fwarning',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]], ['tjflag_5faccuratedct',['TJFLAG_ACCURATEDCT',['../group___turbo_j_p_e_g.html#gacb233cfd722d66d1ccbf48a7de81f0e0',1,'turbojpeg.h']]], ['tjflag_5fbottomup',['TJFLAG_BOTTOMUP',['../group___turbo_j_p_e_g.html#ga72ecf4ebe6eb702d3c6f5ca27455e1ec',1,'turbojpeg.h']]], ['tjflag_5ffastdct',['TJFLAG_FASTDCT',['../group___turbo_j_p_e_g.html#gaabce235db80d3f698b27f36cbd453da2',1,'turbojpeg.h']]], ['tjflag_5ffastupsample',['TJFLAG_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ga4ee4506c81177a06f77e2504a22efd2d',1,'turbojpeg.h']]], ['tjflag_5fnorealloc',['TJFLAG_NOREALLOC',['../group___turbo_j_p_e_g.html#ga8808d403c68b62aaa58a4c1e58e98963',1,'turbojpeg.h']]], + ['tjflag_5fstoponwarning',['TJFLAG_STOPONWARNING',['../group___turbo_j_p_e_g.html#ga519cfa4ef6c18d9e5b455fdf59306a3a',1,'turbojpeg.h']]], ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]], + ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga0be00a62bd1be897f170fa1fed5fb4cb',1,'turbojpeg.h']]], ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga94a235bd4f1088f61ad87b4eadb64c9c',1,'turbojpeg.h']]], ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]], ['tjgreenoffset',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]], @@ -70,7 +76,7 @@ var searchData= ['tjsamp_5fgray',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]], ['tjscaled',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]], ['tjscalingfactor',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]], - ['tjtransform',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#gad02cd42b69f193a0623a9c801788df3a',1,'tjTransform(tjhandle handle, const unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags): turbojpeg.h'],['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'tjtransform(): turbojpeg.h']]], + ['tjtransform',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'tjtransform(): turbojpeg.h'],['../group___turbo_j_p_e_g.html#gad02cd42b69f193a0623a9c801788df3a',1,'tjTransform(tjhandle handle, const unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags): turbojpeg.h']]], ['tjxop',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]], ['tjxop_5fhflip',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]], ['tjxop_5fnone',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]], diff --git a/doc/html/search/enums_74.js b/doc/html/search/enums_74.js index 276aa24..19c20cf 100644 --- a/doc/html/search/enums_74.js +++ b/doc/html/search/enums_74.js @@ -1,6 +1,7 @@ var searchData= [ ['tjcs',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]], + ['tjerr',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]], ['tjpf',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]], ['tjsamp',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]], ['tjxop',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]] diff --git a/doc/html/search/enumvalues_74.js b/doc/html/search/enumvalues_74.js index 7dc2f8d..799f9ac 100644 --- a/doc/html/search/enumvalues_74.js +++ b/doc/html/search/enumvalues_74.js @@ -5,6 +5,8 @@ var searchData= ['tjcs_5frgb',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]], ['tjcs_5fycbcr',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]], ['tjcs_5fycck',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]], + ['tjerr_5ffatal',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]], + ['tjerr_5fwarning',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]], ['tjpf_5fabgr',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]], ['tjpf_5fargb',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]], ['tjpf_5fbgr',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index f284a2c..d2164bb 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -16,6 +16,7 @@ var searchData= ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gaabe05acd734990053ad1294b5ef239aa',1,'turbojpeg.h']]], ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga8a65ed3bd12df57c219d46afbc9008f1',1,'turbojpeg.h']]], ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]], + ['tjgeterrorcode',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga0be00a62bd1be897f170fa1fed5fb4cb',1,'turbojpeg.h']]], ['tjgeterrorstr2',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga94a235bd4f1088f61ad87b4eadb64c9c',1,'turbojpeg.h']]], ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]], ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga3d10c47fbe4a2489a2b30c931551d01a',1,'turbojpeg.h']]], diff --git a/java/TJBench.java b/java/TJBench.java index 618cc97..3a63505 100644 --- a/java/TJBench.java +++ b/java/TJBench.java @@ -663,7 +663,10 @@ class TJBench { System.out.println(" taking performance measurements (default = 1)"); System.out.println("-componly = Stop after running compression tests. Do not test decompression."); System.out.println("-nowrite = Do not write reference or output images (improves consistency"); - System.out.println(" of performance measurements.)\n"); + System.out.println(" of performance measurements.)"); + System.out.println("-stoponwarning = Immediately discontinue the current"); + System.out.println(" compression/decompression/transform operation if the underlying codec"); + System.out.println(" throws a warning (non-fatal error)\n"); System.out.println("NOTE: If the quality is specified as a range (e.g. 90-100), a separate"); System.out.println("test will be performed for all quality values in the range.\n"); System.exit(1); @@ -833,6 +836,8 @@ class TJBench { System.out.format("Warmup runs = %d\n\n", warmup); } } + if (argv[i].equalsIgnoreCase("-stoponwarning")) + flags |= TJ.FLAG_STOPONWARNING; if (argv[i].equalsIgnoreCase("-?")) usage(); } @@ -905,7 +910,12 @@ class TJBench { } } catch (Exception e) { - System.out.println("ERROR: " + e.getMessage()); + if (e instanceof TJException) { + TJException tje = (TJException)e; + System.out.println((tje.getErrorCode() == TJ.ERR_WARNING ? + "WARNING: " : "ERROR: ") + tje.getMessage()); + } else + System.out.println("ERROR: " + e.getMessage()); e.printStackTrace(); retval = -1; } diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index ec1b21d..a180b68 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -115,6 +115,20 @@ 4 + + +public static final int +ERR_FATAL +1 + + + + +public static final int +ERR_WARNING +0 + + public static final int @@ -171,12 +185,26 @@ 128 + + +public static final int +FLAG_STOPONWARNING +8192 + + public static final int NUMCS 5 + + + +public static final int +NUMERR +2 + diff --git a/java/doc/index-all.html b/java/doc/index-all.html index a02d9c4..b88c20f 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -278,6 +278,15 @@

Returns true or false, depending on whether this instance and other have the same numerator and denominator.

ERR_FATAL - Static variable in class org.libjpegturbo.turbojpeg.TJ

The error was fatal and non-recoverable.

ERR_WARNING - Static variable in class org.libjpegturbo.turbojpeg.TJ

The error was non-fatal and recoverable, but the image may still be + corrupt.

@@ -324,6 +333,11 @@

Deprecated.

FLAG_STOPONWARNING - Static variable in class org.libjpegturbo.turbojpeg.TJ

Immediately discontinue the current compression/decompression/transform + operation if the underlying codec throws a warning (non-fatal error).

@@ -354,6 +368,11 @@

Returns denominator

getErrorCode() - Method in exception org.libjpegturbo.turbojpeg.TJException

Returns a code (one of TJ.ERR_*) indicating the severity of the + last error.

getGreenOffset(int) - Static method in class org.libjpegturbo.turbojpeg.TJ

For the given pixel format, returns the number of bytes that the green @@ -516,6 +535,10 @@

The number of JPEG colorspaces

NUMERR - Static variable in class org.libjpegturbo.turbojpeg.TJ

The number of error codes

NUMOP - Static variable in class org.libjpegturbo.turbojpeg.TJTransform

The number of lossless transform operations

@@ -829,6 +852,8 @@

TJException(String) - Constructor for exception org.libjpegturbo.turbojpeg.TJException

TJException(String, int) - Constructor for exception org.libjpegturbo.turbojpeg.TJException

TJException(Throwable) - Constructor for exception org.libjpegturbo.turbojpeg.TJException

TJScalingFactor - Class in org.libjpegturbo.turbojpeg

diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index ffef657..6733749 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -145,6 +145,19 @@ extends java.lang.Object static int +ERR_FATAL +

The error was fatal and non-recoverable.

+ + + +static int +ERR_WARNING +

The error was non-fatal and recoverable, but the image may still be + corrupt.

+ + + +static int FLAG_ACCURATEDCT

Use the most accurate DCT/IDCT algorithm available in the underlying codec.

@@ -197,10 +210,23 @@ extends java.lang.Object static int +FLAG_STOPONWARNING +

Immediately discontinue the current compression/decompression/transform + operation if the underlying codec throws a warning (non-fatal error).

+ + + +static int NUMCS

The number of JPEG colorspaces

+ +static int +NUMERR +

The number of error codes

+ + static int NUMPF @@ -938,7 +964,7 @@ public static final int FLAG_FORCESSE3 -

FLAG_ACCURATEDCT
```
public static final int FLAG_ACCURATEDCT
```
@@ -952,6 +978,54 @@ public static final int FLAG_FORCESSE3
See Also:
Constant Field Values

+ +

+
FLAG_STOPONWARNING
+
```
public static final int FLAG_STOPONWARNING
```
+
Immediately discontinue the current compression/decompression/transform + operation if the underlying codec throws a warning (non-fatal error). The + default behavior is to allow the operation to complete unless a fatal + error is encountered.
+
See Also:
Constant Field Values
+

+ +

+
NUMERR
+
```
public static final int NUMERR
```
+
The number of error codes
+
See Also:
Constant Field Values
+

+ +

+
ERR_WARNING
+
```
public static final int ERR_WARNING
```
+
The error was non-fatal and recoverable, but the image may still be + corrupt.
+
See Also:
Constant Field Values
+

+ +

+
ERR_FATAL
+
```
public static final int ERR_FATAL
```
+
The error was fatal and non-recoverable.
+
See Also:
Constant Field Values
+

diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJException.html b/java/doc/org/libjpegturbo/turbojpeg/TJException.html index 6088066..a57b351 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJException.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJException.html @@ -60,13 +60,13 @@

Nested |

Field |

Constr |

Method

Detail:
Field |
Constr |
Method
Method

@@ -138,10 +138,14 @@ extends java.io.IOException TJException(java.lang.String message) +

TJException(java.lang.String message,
+           int code)

+ +

TJException(java.lang.String message,
            java.lang.Throwable cause)

- + TJException(java.lang.Throwable cause) @@ -153,6 +157,20 @@ extends java.io.IOException

Method Summary

+ + + + + + + + + + +

Methods
Modifier and Type	Method and Description
`int`	`getErrorCode()` + Returns a code (one of `TJ.ERR_*`) indicating the severity of the + last error. +

@@ -209,6 +227,16 @@ extends java.io.IOException
```
public TJException(java.lang.String message)
```

+ + + +

TJException

public TJException(java.lang.String message,
+           int code)

@@ -220,6 +248,27 @@ extends java.io.IOException + +

+ + +
Method Detail
+ + + +
- +
  getErrorCode
  +
```
public int getErrorCode()
```
  +
  Returns a code (one of TJ.ERR_*) indicating the severity of the + last error.
  +
  Returns:
  a code (one of TJ.ERR_*) indicating the severity of the + last error.
  +
+

@@ -270,13 +319,13 @@ extends java.io.IOException

Nested |

Field |

Constr |

Method

Detail:
Field |
Constr |
Method
Method

diff --git a/java/doc/script.js b/java/doc/script.js new file mode 100644 index 0000000..b346356 --- /dev/null +++ b/java/doc/script.js @@ -0,0 +1,30 @@ +function show(type) +{ + count = 0; + for (var key in methods) { + var row = document.getElementById(key); + if ((methods[key] & type) != 0) { + row.style.display = ''; + row.className = (count++ % 2) ? rowColor : altColor; + } + else + row.style.display = 'none'; + } + updateTabs(type); +} + +function updateTabs(type) +{ + for (var value in tabs) { + var sNode = document.getElementById(tabs[value][0]); + var spanNode = sNode.firstChild; + if (value == type) { + sNode.className = activeTableTab; + spanNode.innerHTML = tabs[value][1]; + } + else { + sNode.className = tableTab; + spanNode.innerHTML = "" + tabs[value][1] + ""; + } + } +} diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index 846cabc..9ba3fd9 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -74,6 +74,19 @@

serialVersionUID:

+ + +
Serialized Fields
+
- +
  errorCode
  +
```
int errorCode
```
  +
+

Variables

FLAG_ACCURATEDCT

FLAG_STOPONWARNING

NUMERR

ERR_WARNING

ERR_FATAL

Method Summary

TJException

Method Detail

getErrorCode

Serialized Fields

errorCode