@@ -943,12 +939,10 @@ public static final int FLAG_BOTTOMUP
FLAG_FORCEMMX
-public static final int FLAG_FORCEMMX
-
-- 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
+- Deprecated.
- See Also:
- Constant Field Values
@@ -956,12 +950,10 @@ public static final int FLAG_FORCEMMX
FLAG_FORCESSE
-public static final int FLAG_FORCESSE
-
-- 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
+- Deprecated.
- See Also:
- Constant Field Values
@@ -969,12 +961,10 @@ public static final int FLAG_FORCESSE
FLAG_FORCESSE2
-public static final int FLAG_FORCESSE2
-
-- 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
+- Deprecated.
- See Also:
- Constant Field Values
@@ -982,12 +972,10 @@ public static final int FLAG_FORCESSE2
FLAG_FORCESSE3
-public static final int FLAG_FORCESSE3
-
-- 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
+- Deprecated.
- See Also:
- Constant Field Values
diff --git a/java/org/libjpegturbo/turbojpeg/TJ.java b/java/org/libjpegturbo/turbojpeg/TJ.java
index 9fe30589..ac4a4dd1 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 d590831c..b00a128a 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
diff --git a/tjbench.c b/tjbench.c
index 58ed1473..0164d9b8 100644
--- a/tjbench.c
+++ b/tjbench.c
@@ -697,8 +697,6 @@ void usage(char *progname)
printf("-bottomup = Test bottom-up compression/decompression\n");
printf("-tile = Test performance of the codec when the image is encoded as separate\n");
printf(" tiles of varying sizes.\n");
- printf("-forcemmx, -forcesse, -forcesse2, -forcesse3 =\n");
- printf(" Force MMX, SSE, SSE2, or SSE3 code paths in the underlying codec\n");
printf("-rgb, -bgr, -rgbx, -bgrx, -xbgr, -xrgb =\n");
printf(" Test the specified color conversion path in the codec (default: BGR)\n");
printf("-fastupsample = Use the fastest chrominance upsampling algorithm available in\n");
@@ -798,26 +796,6 @@ int main(int argc, char *argv[])
{
dotile=1; xformopt|=TJXOPT_CROP;
}
- if(!strcasecmp(argv[i], "-forcesse3"))
- {
- printf("Forcing SSE3 code\n\n");
- flags|=TJFLAG_FORCESSE3;
- }
- if(!strcasecmp(argv[i], "-forcesse2"))
- {
- printf("Forcing SSE2 code\n\n");
- flags|=TJFLAG_FORCESSE2;
- }
- if(!strcasecmp(argv[i], "-forcesse"))
- {
- printf("Forcing SSE code\n\n");
- flags|=TJFLAG_FORCESSE;
- }
- if(!strcasecmp(argv[i], "-forcemmx"))
- {
- printf("Forcing MMX code\n\n");
- flags|=TJFLAG_FORCEMMX;
- }
if(!strcasecmp(argv[i], "-fastupsample"))
{
printf("Using fast upsampling code\n\n");
diff --git a/turbojpeg.h b/turbojpeg.h
index b6597f1c..0dfafeb5 100644
--- a/turbojpeg.h
+++ b/turbojpeg.h
@@ -322,26 +322,6 @@ enum TJCS
* OpenGL) order, not top-down (X11) order.
*/
#define TJFLAG_BOTTOMUP 2
-/**
- * Turn off CPU auto-detection and force TurboJPEG to use MMX code (if the
- * underlying codec supports it.)
- */
-#define TJFLAG_FORCEMMX 8
-/**
- * Turn off CPU auto-detection and force TurboJPEG to use SSE code (if the
- * underlying codec supports it.)
- */
-#define TJFLAG_FORCESSE 16
-/**
- * Turn off CPU auto-detection and force TurboJPEG to use SSE2 code (if the
- * underlying codec supports it.)
- */
-#define TJFLAG_FORCESSE2 32
-/**
- * Turn off CPU auto-detection and force TurboJPEG to use SSE3 code (if the
- * underlying codec supports it.)
- */
-#define TJFLAG_FORCESSE3 128
/**
* When decompressing an image that was compressed using chrominance
* subsampling, use the fastest chrominance upsampling algorithm available in
@@ -1056,6 +1036,13 @@ DLLEXPORT void DLLCALL tjFree(unsigned char *buffer);
DLLEXPORT char* DLLCALL tjGetErrorStr(void);
+/* Deprecated functions and macros */
+#define TJFLAG_FORCEMMX 8
+#define TJFLAG_FORCESSE 16
+#define TJFLAG_FORCESSE2 32
+#define TJFLAG_FORCESSE3 128
+
+
/* Backward compatibility functions and macros (nothing to see here) */
#define NUMSUBOPT TJ_NUMSAMP
#define TJ_444 TJSAMP_444
|