diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/doc/deprecated-list.html | 30 | ||||
| -rw-r--r-- | java/doc/index-all.html | 12 | ||||
| -rw-r--r-- | java/doc/org/libjpegturbo/turbojpeg/TJ.html | 44 | ||||
| -rw-r--r-- | java/org/libjpegturbo/turbojpeg/TJ.java | 22 | ||||
| -rw-r--r-- | java/org_libjpegturbo_turbojpeg_TJ.h | 8 |
5 files changed, 56 insertions, 60 deletions
diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index 2430387..9f3b4fd 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -81,9 +81,39 @@ function windowTitle() </CENTER> <HR SIZE="4" NOSHADE> <B>Contents</B><UL> +<LI><A HREF="#field">Deprecated Fields</A> <LI><A HREF="#method">Deprecated Methods</A> </UL> +<A NAME="field"><!-- --></A> +<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> +<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> +<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> +<B>Deprecated Fields</B></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCEMMX">org.libjpegturbo.turbojpeg.TJ.FLAG_FORCEMMX</A> +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE">org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE</A> +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE2">org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE2</A> +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE3">org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE3</A> +<BR> + </TD> +</TR> +</TABLE> + +<P> <A NAME="method"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 916b3c2..81d9b45 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -239,20 +239,16 @@ Static variable in class org.libjpegturbo.turbojpeg.<A HREF="./org/libjpegturbo/ the underlying codec. <DT><A HREF="./org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCEMMX"><B>FLAG_FORCEMMX</B></A> - Static variable in class org.libjpegturbo.turbojpeg.<A HREF="./org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</A> -<DD>Turn off CPU auto-detection and force TurboJPEG to use MMX code - (if the underlying codec supports it.) +<DD><B>Deprecated.</B> <DT><A HREF="./org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE"><B>FLAG_FORCESSE</B></A> - Static variable in class org.libjpegturbo.turbojpeg.<A HREF="./org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</A> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE code - (if the underlying codec supports it.) +<DD><B>Deprecated.</B> <DT><A HREF="./org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE2"><B>FLAG_FORCESSE2</B></A> - Static variable in class org.libjpegturbo.turbojpeg.<A HREF="./org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</A> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (if the underlying codec supports it.) +<DD><B>Deprecated.</B> <DT><A HREF="./org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE3"><B>FLAG_FORCESSE3</B></A> - Static variable in class org.libjpegturbo.turbojpeg.<A HREF="./org/libjpegturbo/turbojpeg/TJ.html" title="class in org.libjpegturbo.turbojpeg">TJ</A> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE3 code - (if the underlying codec supports it.) +<DD><B>Deprecated.</B> </DL> <HR> <A NAME="_G_"><!-- --></A><H2> diff --git a/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/java/doc/org/libjpegturbo/turbojpeg/TJ.html index 3a94cba..bad022e 100644 --- a/java/doc/org/libjpegturbo/turbojpeg/TJ.html +++ b/java/doc/org/libjpegturbo/turbojpeg/TJ.html @@ -194,8 +194,7 @@ TurboJPEG utility class (cannot be instantiated) <TD><CODE><B><A HREF="../../../org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCEMMX">FLAG_FORCEMMX</A></B></CODE> <BR> - Turn off CPU auto-detection and force TurboJPEG to use MMX code - (if the underlying codec supports it.)</TD> + <B>Deprecated.</B> </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -203,8 +202,7 @@ TurboJPEG utility class (cannot be instantiated) <TD><CODE><B><A HREF="../../../org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE">FLAG_FORCESSE</A></B></CODE> <BR> - Turn off CPU auto-detection and force TurboJPEG to use SSE code - (if the underlying codec supports it.)</TD> + <B>Deprecated.</B> </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -212,8 +210,7 @@ TurboJPEG utility class (cannot be instantiated) <TD><CODE><B><A HREF="../../../org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE2">FLAG_FORCESSE2</A></B></CODE> <BR> - Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (if the underlying codec supports it.)</TD> + <B>Deprecated.</B> </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -221,8 +218,7 @@ TurboJPEG utility class (cannot be instantiated) <TD><CODE><B><A HREF="../../../org/libjpegturbo/turbojpeg/TJ.html#FLAG_FORCESSE3">FLAG_FORCESSE3</A></B></CODE> <BR> - Turn off CPU auto-detection and force TurboJPEG to use SSE3 code - (if the underlying codec supports it.)</TD> + <B>Deprecated.</B> </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -943,12 +939,10 @@ public static final int <B>FLAG_BOTTOMUP</B></PRE> <A NAME="FLAG_FORCEMMX"><!-- --></A><H3> FLAG_FORCEMMX</H3> <PRE> -public static final int <B>FLAG_FORCEMMX</B></PRE> -<DL> -<DD>Turn off CPU auto-detection and force TurboJPEG to use MMX code - (if the underlying codec supports it.) -<P> +<FONT SIZE="-1">@Deprecated +</FONT>public static final int <B>FLAG_FORCEMMX</B></PRE> <DL> +<DD><B>Deprecated.</B> <DL> <DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.FLAG_FORCEMMX">Constant Field Values</A></DL> </DL> <HR> @@ -956,12 +950,10 @@ public static final int <B>FLAG_FORCEMMX</B></PRE> <A NAME="FLAG_FORCESSE"><!-- --></A><H3> FLAG_FORCESSE</H3> <PRE> -public static final int <B>FLAG_FORCESSE</B></PRE> -<DL> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE code - (if the underlying codec supports it.) -<P> +<FONT SIZE="-1">@Deprecated +</FONT>public static final int <B>FLAG_FORCESSE</B></PRE> <DL> +<DD><B>Deprecated.</B> <DL> <DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE">Constant Field Values</A></DL> </DL> <HR> @@ -969,12 +961,10 @@ public static final int <B>FLAG_FORCESSE</B></PRE> <A NAME="FLAG_FORCESSE2"><!-- --></A><H3> FLAG_FORCESSE2</H3> <PRE> -public static final int <B>FLAG_FORCESSE2</B></PRE> -<DL> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - (if the underlying codec supports it.) -<P> +<FONT SIZE="-1">@Deprecated +</FONT>public static final int <B>FLAG_FORCESSE2</B></PRE> <DL> +<DD><B>Deprecated.</B> <DL> <DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE2">Constant Field Values</A></DL> </DL> <HR> @@ -982,12 +972,10 @@ public static final int <B>FLAG_FORCESSE2</B></PRE> <A NAME="FLAG_FORCESSE3"><!-- --></A><H3> FLAG_FORCESSE3</H3> <PRE> -public static final int <B>FLAG_FORCESSE3</B></PRE> -<DL> -<DD>Turn off CPU auto-detection and force TurboJPEG to use SSE3 code - (if the underlying codec supports it.) -<P> +<FONT SIZE="-1">@Deprecated +</FONT>public static final int <B>FLAG_FORCESSE3</B></PRE> <DL> +<DD><B>Deprecated.</B> <DL> <DT><B>See Also:</B><DD><A HREF="../../../constant-values.html#org.libjpegturbo.turbojpeg.TJ.FLAG_FORCESSE3">Constant Field Values</A></DL> </DL> <HR> diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java index 9fe3058..ac4a4dd 100644 --- a/java/org/libjpegturbo/turbojpeg/TJ.java +++ b/java/org/libjpegturbo/turbojpeg/TJ.java @@ -353,26 +353,16 @@ public final class TJ { * OpenGL) order, not top-down (X11) order. */ public static final int FLAG_BOTTOMUP = 2; - /** - * Turn off CPU auto-detection and force TurboJPEG to use MMX code - * (if the underlying codec supports it.) - */ + + @Deprecated public static final int FLAG_FORCEMMX = 8; - /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE code - * (if the underlying codec supports it.) - */ + @Deprecated public static final int FLAG_FORCESSE = 16; - /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE2 code - * (if the underlying codec supports it.) - */ + @Deprecated public static final int FLAG_FORCESSE2 = 32; - /** - * Turn off CPU auto-detection and force TurboJPEG to use SSE3 code - * (if the underlying codec supports it.) - */ + @Deprecated public static final int FLAG_FORCESSE3 = 128; + /** * When decompressing an image that was compressed using chrominance * subsampling, use the fastest chrominance upsampling algorithm available in diff --git a/java/org_libjpegturbo_turbojpeg_TJ.h b/java/org_libjpegturbo_turbojpeg_TJ.h index d590831..b00a128 100644 --- a/java/org_libjpegturbo_turbojpeg_TJ.h +++ b/java/org_libjpegturbo_turbojpeg_TJ.h @@ -61,14 +61,6 @@ extern "C" { #define org_libjpegturbo_turbojpeg_TJ_CS_YCCK 4L #undef org_libjpegturbo_turbojpeg_TJ_FLAG_BOTTOMUP #define org_libjpegturbo_turbojpeg_TJ_FLAG_BOTTOMUP 2L -#undef org_libjpegturbo_turbojpeg_TJ_FLAG_FORCEMMX -#define org_libjpegturbo_turbojpeg_TJ_FLAG_FORCEMMX 8L -#undef org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE -#define org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE 16L -#undef org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE2 -#define org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE2 32L -#undef org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE3 -#define org_libjpegturbo_turbojpeg_TJ_FLAG_FORCESSE3 128L #undef org_libjpegturbo_turbojpeg_TJ_FLAG_FASTUPSAMPLE #define org_libjpegturbo_turbojpeg_TJ_FLAG_FASTUPSAMPLE 256L #undef org_libjpegturbo_turbojpeg_TJ_FLAG_FASTDCT |