From c33347c0aa808dda3735bff7e03a0d7e7dfe7046 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 15 Mar 2014 13:25:11 +0000 Subject: [PATCH] Add @Deprecated to the deprecated Java methods, so javac will actually print deprecation warnings, as opposed to just listing the methods as deprecated in javadoc; remove the use of the deprecated methods by our own test programs. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1171 632fc199-4ca6-4c93-a231-07263d6284db --- java/TJBench.java | 4 ++-- java/TJExample.java | 4 ++-- java/TJUnitTest.java | 6 +++--- java/org/libjpegturbo/turbojpeg/TJCompressor.java | 3 ++- java/org/libjpegturbo/turbojpeg/TJDecompressor.java | 3 ++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/java/TJBench.java b/java/TJBench.java index 81a2c48..72e6e10 100644 --- a/java/TJBench.java +++ b/java/TJBench.java @@ -150,7 +150,7 @@ class TJBench { if (yuv == YUVDECODE) tjd.decompressToYUV(dstBuf, flags); else - tjd.decompress(dstBuf, scaledw, pitch, scaledh, pf, flags); + tjd.decompress(dstBuf, 0, 0, scaledw, pitch, scaledh, pf, flags); /* Benchmark */ for (i = 0, start = getTime(); (elapsed = getTime() - start) < benchTime; @@ -341,7 +341,7 @@ class TJBench { subNameLong[subsamp], jpegQual); for (i = 0; i < h; i++) System.arraycopy(srcBuf, w * ps * i, tmpBuf, pitch * i, w * ps); - tjc.setSourceImage(srcBuf, tilew, pitch, tileh, pf); + tjc.setSourceImage(srcBuf, 0, 0, tilew, pitch, tileh, pf); tjc.setJPEGQuality(jpegQual); tjc.setSubsamp(subsamp); diff --git a/java/TJExample.java b/java/TJExample.java index a4971a4..1ae350a 100644 --- a/java/TJExample.java +++ b/java/TJExample.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012, 2014 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: @@ -326,7 +326,7 @@ public class TJExample implements TJCustomFilter { if (img != null) jpegBuf = tjc.compress(img, flags); else { - tjc.setSourceImage(bmpBuf, width, 0, height, TJ.PF_BGRX); + tjc.setSourceImage(bmpBuf, 0, 0, width, 0, height, TJ.PF_BGRX); jpegBuf = tjc.compress(flags); } jpegSize = tjc.getCompressedSize(); diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java index 1e54667..6c7b29e 100644 --- a/java/TJUnitTest.java +++ b/java/TJUnitTest.java @@ -621,7 +621,7 @@ public class TJUnitTest { else tjc.compress(img, dstBuf, flags); } else { - tjc.setSourceImage(srcBuf, w, 0, h, pf); + tjc.setSourceImage(srcBuf, 0, 0, w, 0, h, pf); if (yuv == YUVENCODE) tjc.encodeYUV(dstBuf, flags); else @@ -831,7 +831,7 @@ public class TJUnitTest { for (i = 0; i < w * h * 4; i++) { srcBuf[i] = (byte)(r.nextInt(2) * 255); } - tjc.setSourceImage(srcBuf, w, 0, h, TJ.PF_BGRX); + tjc.setSourceImage(srcBuf, 0, 0, w, 0, h, TJ.PF_BGRX); tjc.setSubsamp(subsamp); tjc.setJPEGQuality(100); if (yuv == YUVENCODE) @@ -847,7 +847,7 @@ public class TJUnitTest { for (i = 0; i < h * w * 4; i++) { srcBuf[i] = (byte)(r.nextInt(2) * 255); } - tjc.setSourceImage(srcBuf, h, 0, w, TJ.PF_BGRX); + tjc.setSourceImage(srcBuf, 0, 0, h, 0, w, TJ.PF_BGRX); if (yuv == YUVENCODE) tjc.encodeYUV(dstBuf, 0); else diff --git a/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/java/org/libjpegturbo/turbojpeg/TJCompressor.java index 52ae613..69b630f 100644 --- a/java/org/libjpegturbo/turbojpeg/TJCompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJCompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2013 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2014 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: @@ -145,6 +145,7 @@ public class TJCompressor { * @deprecated Use * {@link #setSourceImage(byte[], int, int, int, int, int, int)} instead. */ + @Deprecated public void setSourceImage(byte[] srcImage, int width, int pitch, int height, int pixelFormat) throws Exception { setSourceImage(srcImage, 0, 0, width, pitch, height, pixelFormat); diff --git a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java index 737051c..1b7efbe 100644 --- a/java/org/libjpegturbo/turbojpeg/TJDecompressor.java +++ b/java/org/libjpegturbo/turbojpeg/TJDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011-2013 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2014 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: @@ -313,6 +313,7 @@ public class TJDecompressor { * @deprecated Use * {@link #decompress(byte[], int, int, int, int, int, int, int)} instead. */ + @Deprecated public void decompress(byte[] dstBuf, int desiredWidth, int pitch, int desiredHeight, int pixelFormat, int flags) throws Exception { -- 2.50.0