src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c

rev 59106 : imported patch client

@@ -161,12 +161,10 @@
   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
    negative or >255. If over/underflows of 8 bits

@@ -205,11 +203,10 @@
     dst = MLIB_U16_MIN;                                         \
   else                                                          \
     dst = (mlib_u16)val
 
 #endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
 
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
 

@@ -851,11 +848,11 @@
 
   FREE_AND_RETURN_STATUS;
 }
 
 /***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
+/* for x86, using integer multiplies is faster */
 
 #define STORE_RES(res, x)                                       \
   x >>= shift2;                                                 \
   CLAMP_STORE(res, x)
 

@@ -1264,8 +1261,5 @@
 
   return MLIB_SUCCESS;
 }
 
 /***************************************************************/
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/