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

rev 59106 : imported patch client

*** 161,172 ****
    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
--- 161,170 ----
*** 205,215 ****
      dst = MLIB_U16_MIN;                                         \
    else                                                          \
      dst = (mlib_u16)val
  
  #endif /* IMG_TYPE == 1 */
- #endif /* __sparc */
  
  /***************************************************************/
  #define MAX_KER   7
  #define MAX_N    15
  
--- 203,212 ----
*** 851,861 ****
  
    FREE_AND_RETURN_STATUS;
  }
  
  /***************************************************************/
! #ifndef __sparc /* for x86, using integer multiplies is faster */
  
  #define STORE_RES(res, x)                                       \
    x >>= shift2;                                                 \
    CLAMP_STORE(res, x)
  
--- 848,858 ----
  
    FREE_AND_RETURN_STATUS;
  }
  
  /***************************************************************/
! /* for x86, using integer multiplies is faster */
  
  #define STORE_RES(res, x)                                       \
    x >>= shift2;                                                 \
    CLAMP_STORE(res, x)
  
*** 1264,1271 ****
  
    return MLIB_SUCCESS;
  }
  
  /***************************************************************/
- #endif /* __sparc ( for x86, using integer multiplies is faster ) */
- 
- /***************************************************************/
--- 1261,1265 ----