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

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 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, 2018, 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
*** 257,278 ****
          i += 4;
          val1 = p_dd[2*val0+1];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
  #else
!       emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u32*)da)[0] = (val1 & emask) | (((mlib_u32*)da)[0] &~ emask);
  
  #else /* _NO_LONGLONG */
  
  #ifdef _LITTLE_ENDIAN
!       mlib_u64 emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
  #else
!       mlib_u64 emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
  
        ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask);
  
  #endif /* _NO_LONGLONG */
--- 257,278 ----
          i += 4;
          val1 = p_dd[2*val0+1];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (~(mlib_u32)0) >> ((4 - (size - i)) * 8);
  #else
!       emask = (~(mlib_u32)0) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u32*)da)[0] = (val1 & emask) | (((mlib_u32*)da)[0] &~ emask);
  
  #else /* _NO_LONGLONG */
  
  #ifdef _LITTLE_ENDIAN
!       mlib_u64 emask = (~(mlib_u64)0) >> ((8 - (size - i)) * 8);
  #else
!       mlib_u64 emask = (~(mlib_u64)0) << ((8 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
  
        ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask);
  
  #endif /* _NO_LONGLONG */
*** 393,405 ****
          i += 4;
          dd1 = dd2;
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
  #else
!       emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask);
  
  #else /* _NO_LONGLONG */
  
--- 393,405 ----
          i += 4;
          dd1 = dd2;
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (~(mlib_u32)0) >> ((4 - (size - i)) * 8);
  #else
!       emask = (~(mlib_u32)0) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask);
  
  #else /* _NO_LONGLONG */
  
*** 411,423 ****
          i += 8;
          dd = ((mlib_u64*)dd_array)[s0 & 0xf];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
  #else
!       emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask);
  
  #endif /* _NO_LONGLONG */
      }
--- 411,423 ----
          i += 8;
          dd = ((mlib_u64*)dd_array)[s0 & 0xf];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (~(mlib_u64)0) >> ((8 - (size - i)) * 8);
  #else
!       emask = (~(mlib_u64)0) << ((8 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask);
  
  #endif /* _NO_LONGLONG */
      }
*** 563,575 ****
          i += 4;
          dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
  #else
!       emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        da[0] = (dd & emask) | (da[0] &~ emask);
      }
  
      if (dp != dst) mlib_ImageCopy_na(dp, dst, size);
--- 563,575 ----
          i += 4;
          dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1];
        }
  
  #ifdef _LITTLE_ENDIAN
!       emask = (~(mlib_u32)0) >> ((4 - (size - i)) * 8);
  #else
!       emask = (~(mlib_u32)0) << ((4 - (size - i)) * 8);
  #endif /* _LITTLE_ENDIAN */
        da[0] = (dd & emask) | (da[0] &~ emask);
      }
  
      if (dp != dst) mlib_ImageCopy_na(dp, dst, size);