ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw idiomatic unchecked exceptions from the Java classes and JNI wrapper if there is an unrecoverable error caused by incorrect API usage (such as illegal arguments, etc.), and throw Errors if there is an unrecoverable error at the C level (such as a failed malloc() call.)

Browse Source 
Change the behavior of the bailif0() macro in the JNI wrapper so that it doesn't throw an exception for an unexpected NULL condition.  In fact, in all cases, the underlying JNI API function (such as GetFieldID(), etc.) will throw an Error on its own whenever it returns NULL, so our custom exceptions were never being thrown in that case anyhow.  All we need to do is just detect the error and bail out of the C code.

This also corrects a couple of formatting issues (semicolons aren't needed at the end of class definitions, and @Override should be specified for the methods we're overriding from super-classes, so the compiler can sanity-check that we're actually overriding a method and not declaring a new one.)


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1595 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2015-07-14 20:42:52 +00:00
parent 1a4778f8f0
commit b3817dab86
16 changed files with 315 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/org/libjpegturbo/turbojpeg/TJScalingFactor.java
View File

@@ -33,9 +33,9 @@ package org.libjpegturbo.turbojpeg;
*/
public class TJScalingFactor {
public TJScalingFactor(int num, int denom) throws Exception {
public TJScalingFactor(int num, int denom) {
if (num < 1 || denom < 1)
throw new Exception("Numerator and denominator must be >= 1");
throw new IllegalArgumentException("Numerator and denominator must be >= 1");
this.num = num;
this.denom = denom;
}
@@ -77,7 +77,7 @@ public class TJScalingFactor {
* <code>other</code> have the same numerator and denominator.
*/
public boolean equals(TJScalingFactor other) {
return (this.num == other.num && this.denom == other.denom);
return this.num == other.num && this.denom == other.denom;
}
/**
@@ -88,7 +88,7 @@ public class TJScalingFactor {
* 1/1.
*/
public boolean isOne() {
return (num == 1 && denom == 1);
return num == 1 && denom == 1;
}
/**
@@ -100,4 +100,4 @@ public class TJScalingFactor {
* Denominator
*/
private int denom = 1;
};
}