diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java
index eb342eec..20de6dfd 100644
--- a/java/TJUnitTest.java
+++ b/java/TJUnitTest.java
@@ -844,34 +844,46 @@ final class TJUnitTest {
 
     try {
       exception = false;
-      size = TJ.bufSize(26755, 26755, TJ.SAMP_444);
+      size = TJ.bufSize(18919, 18919, TJ.SAMP_444);
     } catch (Exception e) { exception = true; }
     if (!exception || size != 0)
       throw new Exception("TJ.bufSize() overflow");
     try {
       exception = false;
-      size = TJ.bufSizeYUV(37838, 1, 37838, TJ.SAMP_444);
+      size = TJ.bufSizeYUV(26755, 1, 26755, TJ.SAMP_444);
     } catch (Exception e) { exception = true; }
     if (!exception || size != 0)
       throw new Exception("TJ.bufSizeYUV() overflow");
     try {
       exception = false;
-      size = TJ.bufSizeYUV(37837, 3, 37837, TJ.SAMP_444);
+      size = TJ.bufSizeYUV(26754, 3, 26754, TJ.SAMP_444);
     } catch (Exception e) { exception = true; }
     if (!exception || size != 0)
       throw new Exception("TJ.bufSizeYUV() overflow");
     try {
       exception = false;
-      size = TJ.bufSizeYUV(37837, -1, 37837, TJ.SAMP_444);
+      size = TJ.bufSizeYUV(26754, -1, 26754, TJ.SAMP_444);
     } catch (Exception e) { exception = true; }
     if (!exception || size != 0)
       throw new Exception("TJ.bufSizeYUV() overflow");
     try {
       exception = false;
-      size = TJ.planeSizeYUV(0, 65536, 0, 65536, TJ.SAMP_444);
+      size = TJ.planeSizeYUV(0, 46341, 0, 46341, TJ.SAMP_444);
     } catch (Exception e) { exception = true; }
     if (!exception || size != 0)
       throw new Exception("TJ.planeSizeYUV() overflow");
+    try {
+      exception = false;
+      size = TJ.planeWidth(0, Integer.MAX_VALUE, TJ.SAMP_420);
+    } catch (Exception e) { exception = true; }
+    if (!exception || size != 0)
+      throw new Exception("TJ.planeWidth() overflow");
+    try {
+      exception = false;
+      size = TJ.planeHeight(0, Integer.MAX_VALUE, TJ.SAMP_420);
+    } catch (Exception e) { exception = true; }
+    if (!exception || size != 0)
+      throw new Exception("TJ.planeHeight() overflow");
   }
 
   static void bufSizeTest() throws Exception {
diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c
index 00f56c3b..446cbd2a 100644
--- a/turbojpeg-jni.c
+++ b/turbojpeg-jni.c
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <limits.h>
 #include "turbojpeg.h"
 #include "jinclude.h"
 #include <jni.h>
@@ -135,7 +136,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize
   unsigned long retval = tjBufSize(width, height, jpegSubsamp);
 
   if (retval == (unsigned long)-1) THROW_ARG(tjGetErrorStr());
-  if (retval > (unsigned long)((unsigned int)-1))
+  if (retval > (unsigned long)INT_MAX)
     THROW_ARG("Image is too large");
 
 bailout:
@@ -149,7 +150,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__IIII
   unsigned long retval = tjBufSizeYUV2(width, align, height, subsamp);
 
   if (retval == (unsigned long)-1) THROW_ARG(tjGetErrorStr());
-  if (retval > (unsigned long)((unsigned int)-1))
+  if (retval > (unsigned long)INT_MAX)
     THROW_ARG("Image is too large");
 
 bailout:
@@ -174,7 +175,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeSizeYUV__IIIII
                                         subsamp);
 
   if (retval == (unsigned long)-1) THROW_ARG(tjGetErrorStr());
-  if (retval > (unsigned long)((unsigned int)-1))
+  if (retval > (unsigned long)INT_MAX)
     THROW_ARG("Image is too large");
 
 bailout: