--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c Thu May 12 11:03:07 2016 -0700
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c Fri May 13 11:31:05 2016 +0300
@@ -29,34 +29,6 @@
#include "mlib_c_ImageConv.h"
/***************************************************************/
-#define MLIB_PARAMS_CONV_NW \
- mlib_image *dst, \
- const mlib_image *src, \
- const mlib_s32 *kern, \
- mlib_s32 scale, \
- mlib_s32 cmask
-
-/***************************************************************/
-#define MLIB_CALL_PARAMS_CONV_NW \
- dst, src, kern, scale, cmask
-
-/***************************************************************/
-#define MLIB_PARAMS_CONV_EXT \
- mlib_image *dst, \
- const mlib_image *src, \
- mlib_s32 dx_l, \
- mlib_s32 dx_r, \
- mlib_s32 dy_t, \
- mlib_s32 dy_b, \
- const mlib_s32 *kern, \
- mlib_s32 scale, \
- mlib_s32 cmask
-
-/***************************************************************/
-#define MLIB_CALL_PARAMS_CONV_EXT \
- dst, src, dx_l, dx_r, dy_t, dy_b, kern, scale, cmask
-
-/***************************************************************/
#define MLIB_PARAMS_CONV_MN_NW \
mlib_image *dst, \
const mlib_image *src, \
@@ -92,52 +64,6 @@
/***************************************************************/
-mlib_status mlib_conv2x2nw_u8(MLIB_PARAMS_CONV_NW)
-{
- return mlib_c_conv2x2nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv3x3nw_u8(MLIB_PARAMS_CONV_NW)
-{
-#ifdef __sparc
- return mlib_c_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#else
-
- if (mlib_ImageConvVersion(3, 3, scale, MLIB_BYTE) == 0)
- return mlib_c_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
- else
- return mlib_i_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv4x4nw_u8(MLIB_PARAMS_CONV_NW)
-{
- return mlib_c_conv4x4nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv5x5nw_u8(MLIB_PARAMS_CONV_NW)
-{
-#ifdef __sparc
- return mlib_c_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#else
-
- if (mlib_ImageConvVersion(5, 5, scale, MLIB_BYTE) == 0)
- return mlib_c_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
- else
- return mlib_i_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv7x7nw_u8(MLIB_PARAMS_CONV_NW)
-{
- return mlib_c_conv7x7nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
mlib_status mlib_convMxNnw_u8(MLIB_PARAMS_CONV_MN_NW)
{
#ifdef __sparc
@@ -152,52 +78,6 @@
}
/***************************************************************/
-mlib_status mlib_conv2x2ext_u8(MLIB_PARAMS_CONV_EXT)
-{
- return mlib_c_conv2x2ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv3x3ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-#ifdef __sparc
- return mlib_c_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#else
-
- if (mlib_ImageConvVersion(3, 3, scale, MLIB_BYTE) == 0)
- return mlib_c_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
- else
- return mlib_i_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv4x4ext_u8(MLIB_PARAMS_CONV_EXT)
-{
- return mlib_c_conv4x4ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv5x5ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-#ifdef __sparc
- return mlib_c_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#else
-
- if (mlib_ImageConvVersion(5, 5, scale, MLIB_BYTE) == 0)
- return mlib_c_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
- else
- return mlib_i_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv7x7ext_u8(MLIB_PARAMS_CONV_EXT)
-{
- return mlib_c_conv7x7ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
mlib_status mlib_convMxNext_u8(MLIB_PARAMS_CONV_MN_EXT)
{
#ifdef __sparc
@@ -212,27 +92,3 @@
}
/***************************************************************/
-mlib_status mlib_conv2x2nw_s16(MLIB_PARAMS_CONV_NW)
-{
- return mlib_c_conv2x2nw_s16(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2nw_u16(MLIB_PARAMS_CONV_NW)
-{
- return mlib_c_conv2x2nw_u16(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2ext_s16(MLIB_PARAMS_CONV_EXT)
-{
- return mlib_c_conv2x2ext_s16(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2ext_u16(MLIB_PARAMS_CONV_EXT)
-{
- return mlib_c_conv2x2ext_u16(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/