< prev index next >
src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
Print this page
rev 59383 : [mq]: final
*** 1,7 ****
/*
! * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
--- 1,7 ----
/*
! * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
*** 187,197 ****
dll = mlib_ImageGetStride(dst) / sizeof(type); \
adr_src = (type *)mlib_ImageGetData(src); \
adr_dst = (type *)mlib_ImageGetData(dst)
/***************************************************************/
- #ifndef __sparc
#if IMG_TYPE == 1
/*
* Test for the presence of any "1" bit in bits
8 to 31 of val. If present, then val is either
--- 187,196 ----
*** 231,241 ****
dst = MLIB_U16_MIN; \
else \
dst = (mlib_u16)val
#endif /* IMG_TYPE == 1 */
- #endif /* __sparc */
/***************************************************************/
#define MAX_KER 7
#define MAX_N 15
#define BUFF_SIZE 1600
--- 230,239 ----
*** 299,323 ****
if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
sl = adr_src + c;
dl = adr_dst + c;
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < hsize; i++) buffd[i] = 0.0;
for (j = 0; j < wid; j++) {
FTYPE *buff = sbuff;
for (i = k_off, ii = 0; (i < dy_t) && (ii < smax_hsize); i++, ii++) {
sbuff[i - k_off] = (FTYPE)sl[0];
}
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (; (i < shgt + dy_t) && (ii < smax_hsize); i++, ii++) {
sbuff[i - k_off] = (FTYPE)sl[(i - dy_t)*sll];
}
for (; (i < shgt + dy_t + dy_b) && (ii < smax_hsize); i++, ii++) {
--- 297,315 ----
*** 329,341 ****
for (off = 0; off < (n - 4); off += 4) {
p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < hsize; i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
--- 321,330 ----
*** 352,364 ****
if (kh == 4) {
p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (hsize - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
--- 341,350 ----
*** 385,397 ****
} else if (kh == 3) {
p2 = buff[0]; p3 = buff[1];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2];
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (hsize - 2); i += 2) {
p0 = p2; p1 = p3;
p2 = buff[i + 2]; p3 = buff[i + 3];
--- 371,380 ----
*** 419,431 ****
} else if (kh == 2) {
p2 = buff[0];
k0 = pk[0]; k1 = pk[1];
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (hsize - 2); i += 2) {
p0 = p2;
p1 = buff[i + 1]; p2 = buff[i + 2];
--- 402,411 ----
*** 452,464 ****
} else /* kh == 1 */{
k0 = pk[0];
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (hsize - 2); i += 2) {
p0 = buff[i]; p1 = buff[i + 1];
d0 = D2I(p0*k0 + buffd[i ]);
d1 = D2I(p1*k0 + buffd[i + 1]);
--- 432,441 ----
*** 577,589 ****
for (i = 0; i < dx_l; i++) {
buff[i] = (FTYPE)sl[0];
}
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < swid; i++) {
buff[i + dx_l] = (FTYPE)sl[i*chan1];
}
for (i = 0; i < dx_r; i++) {
--- 554,563 ----
*** 593,605 ****
if ((l >= dy_t) && (l < hgt + n - dy_b - 2)) sl += sll;
}
buff_ind = 0;
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < wid; i++) buffd[i] = 0.0;
for (j = 0; j < hgt; j++) {
FTYPE **buffc = buffs + buff_ind;
FTYPE *buffn = buffc[n];
--- 567,576 ----
*** 627,652 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4]; k5 = pk[5]; k6 = pk[6];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
p6 = buff[i + 6]; p7 = buff[i + 7];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
p6 = buff[i + 6]; p7 = buff[i + 7];
--- 598,617 ----
*** 677,702 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4]; k5 = pk[5];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6;
p5 = buff[i + 5]; p6 = buff[i + 6];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6;
p5 = buff[i + 5]; p6 = buff[i + 6];
--- 642,661 ----
*** 727,752 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5;
p4 = buff[i + 4]; p5 = buff[i + 5];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5;
p4 = buff[i + 4]; p5 = buff[i + 5];
--- 686,705 ----
*** 775,800 ****
p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
--- 728,747 ----
*** 822,847 ****
p2 = buff[0]; p3 = buff[1];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3;
p2 = buff[i + 2]; p3 = buff[i + 3];
buffd[i ] += p0*k0 + p1*k1 + p2*k2;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3;
p2 = buff[i + 2]; p3 = buff[i + 3];
--- 769,788 ----
*** 869,894 ****
p2 = buff[0];
k0 = pk[0]; k1 = pk[1];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2;
p1 = buff[i + 1]; p2 = buff[i + 2];
buffd[i ] += p0*k0 + p1*k1;
buffd[i + 1] += p1*k0 + p2*k1;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2;
p1 = buff[i + 1]; p2 = buff[i + 2];
--- 810,829 ----
*** 958,969 ****
FREE_AND_RETURN_STATUS;
}
/***************************************************************/
- #ifndef __sparc /* for x86, using integer multiplies is faster */
-
#define STORE_RES(res, x) \
x >>= shift2; \
CLAMP_STORE(res, x)
mlib_status CONV_FUNC_MxN_I
--- 893,902 ----
*** 1035,1047 ****
for (i = 0; i < dx_l; i++) {
buff[i] = (mlib_s32)sl[0];
}
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < swid; i++) {
buff[i + dx_l] = (mlib_s32)sl[i*chan1];
}
for (i = 0; i < dx_r; i++) {
--- 968,977 ----
*** 1051,1063 ****
if ((l >= dy_t) && (l < hgt + n - dy_b - 2)) sl += sll;
}
buff_ind = 0;
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i < wid; i++) buffd[i] = 0;
for (j = 0; j < hgt; j++) {
mlib_s32 **buffc = buffs + buff_ind;
mlib_s32 *buffn = buffc[n];
--- 981,990 ----
*** 1085,1110 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4]; k5 = pk[5]; k6 = pk[6];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
p6 = buff[i + 6]; p7 = buff[i + 7];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
p6 = buff[i + 6]; p7 = buff[i + 7];
--- 1012,1031 ----
*** 1132,1157 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4]; k5 = pk[5];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6;
p5 = buff[i + 5]; p6 = buff[i + 6];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6;
p5 = buff[i + 5]; p6 = buff[i + 6];
--- 1053,1072 ----
*** 1179,1204 ****
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
k4 = pk[4];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5;
p4 = buff[i + 4]; p5 = buff[i + 5];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4; p3 = p5;
p4 = buff[i + 4]; p5 = buff[i + 5];
--- 1094,1113 ----
*** 1224,1249 ****
p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2]; k3 = pk[3];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
buffd[i ] += p0*k0 + p1*k1 + p2*k2 + p3*k3;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3; p2 = p4;
p3 = buff[i + 3]; p4 = buff[i + 4];
--- 1133,1152 ----
*** 1268,1293 ****
p2 = buff[0]; p3 = buff[1];
k0 = pk[0]; k1 = pk[1]; k2 = pk[2];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3;
p2 = buff[i + 2]; p3 = buff[i + 3];
buffd[i ] += p0*k0 + p1*k1 + p2*k2;
buffd[i + 1] += p1*k0 + p2*k1 + p3*k2;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2; p1 = p3;
p2 = buff[i + 2]; p3 = buff[i + 3];
--- 1171,1190 ----
*** 1312,1337 ****
p2 = buff[0];
k0 = pk[0]; k1 = pk[1];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2;
p1 = buff[i + 1]; p2 = buff[i + 2];
buffd[i ] += p0*k0 + p1*k1;
buffd[i + 1] += p1*k0 + p2*k1;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = p2;
p1 = buff[i + 1]; p2 = buff[i + 2];
--- 1209,1228 ----
*** 1355,1378 ****
} else /* kw == 1 */{
k0 = pk[0];
if (l < (n - 1) || off < m) {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = buff[i]; p1 = buff[i + 1];
buffd[i ] += p0*k0;
buffd[i + 1] += p1*k0;
}
} else {
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
for (i = 0; i <= (wid - 2); i += 2) {
p0 = buff[i]; p1 = buff[i + 1];
buffn[i + dx_l ] = (mlib_s32)sp[0];
buffn[i + dx_l + 1] = (mlib_s32)sp[chan1];
--- 1246,1263 ----
*** 1437,1444 ****
if (k != k_locl) mlib_free(k);
return MLIB_SUCCESS;
}
- #endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
/***************************************************************/
--- 1322,1327 ----
< prev index next >