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

*** 180,190 ****
  
  /***************************************************************/
  #define STRIP(pd, ps, w, h, data_type) {                        \
    data_type s0, s1;                                             \
    for ( i = 0; i < h; i++ ) {                                   \
!     if (j = w & 1)                                              \
        pd[i * dst_stride] = ps[i * src_stride];                  \
      for (; j < w; j += 2) {                                     \
        s0 = ps[i * src_stride + j];                              \
        s1 = ps[i * src_stride + j + 1];                          \
        pd[i * dst_stride + j]   = s0;                            \
--- 180,190 ----
  
  /***************************************************************/
  #define STRIP(pd, ps, w, h, data_type) {                        \
    data_type s0, s1;                                             \
    for ( i = 0; i < h; i++ ) {                                   \
!     if ((j = (w & 1)))                                              \
        pd[i * dst_stride] = ps[i * src_stride];                  \
      for (; j < w; j += 2) {                                     \
        s0 = ps[i * src_stride + j];                              \
        s1 = ps[i * src_stride + j + 1];                          \
        pd[i * dst_stride + j]   = s0;                            \
*** 544,554 ****
  
    for (i = 0; i < src_height; i++) {
      mlib_u32 *psrc_row = psrc + i * src_stride, *pdst_row = pdst + i * dst_stride;
  
      if (!(((mlib_addr) psrc_row ^ (mlib_addr) pdst_row) & 7)) {
!       if (j = ((mlib_s32) ((mlib_addr) psrc_row & 4) >> 2)) {
          pdst_row[0] = psrc_row[0];
        }
  
  #ifdef __SUNPRO_C
  #pragma pipeloop(0)
--- 544,554 ----
  
    for (i = 0; i < src_height; i++) {
      mlib_u32 *psrc_row = psrc + i * src_stride, *pdst_row = pdst + i * dst_stride;
  
      if (!(((mlib_addr) psrc_row ^ (mlib_addr) pdst_row) & 7)) {
!       if ((j = ((mlib_s32) ((mlib_addr) psrc_row & 4) >> 2))) {
          pdst_row[0] = psrc_row[0];
        }
  
  #ifdef __SUNPRO_C
  #pragma pipeloop(0)
*** 573,583 ****
  #else
  
        {
          mlib_u64 *ps, src0, src1;
  
!         if (j = ((mlib_s32) ((mlib_addr) pdst_row & 4) >> 2))
            pdst_row[0] = psrc_row[0];
          ps = (mlib_u64 *) (psrc_row + j - 1);
          src1 = ps[0];
  #ifdef __SUNPRO_C
  #pragma pipeloop(0)
--- 573,583 ----
  #else
  
        {
          mlib_u64 *ps, src0, src1;
  
!         if ((j = ((mlib_s32) ((mlib_addr) pdst_row & 4) >> 2)))
            pdst_row[0] = psrc_row[0];
          ps = (mlib_u64 *) (psrc_row + j - 1);
          src1 = ps[0];
  #ifdef __SUNPRO_C
  #pragma pipeloop(0)