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

*** 537,547 ****
      k[i] = kernel[i]*fscale;
    }
  
    if (m == 1) {
      status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
!     FREE_AND_RETURN_STATUS;
    }
  
    swid = wid + (m - 1);
  
    bsize = (n + 3)*swid;
--- 537,547 ----
      k[i] = kernel[i]*fscale;
    }
  
    if (m == 1) {
      status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
!     FREE_AND_RETURN_STATUS
    }
  
    swid = wid + (m - 1);
  
    bsize = (n + 3)*swid;
*** 549,559 ****
    if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
      pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
  
      if (pbuff == NULL) {
        status = MLIB_FAILURE;
!       FREE_AND_RETURN_STATUS;
      }
      buffs = (FTYPE   **)(pbuff + bsize);
    }
  
    for (l = 0; l < (n + 1); l++) buffs[l] = pbuff + l*swid;
--- 549,559 ----
    if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
      pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
  
      if (pbuff == NULL) {
        status = MLIB_FAILURE;
!       FREE_AND_RETURN_STATUS
      }
      buffs = (FTYPE   **)(pbuff + bsize);
    }
  
    for (l = 0; l < (n + 1); l++) buffs[l] = pbuff + l*swid;
*** 954,964 ****
  
        if (buff_ind >= n + 1) buff_ind = 0;
      }
    }
  
!   FREE_AND_RETURN_STATUS;
  }
  
  /***************************************************************/
  #ifndef __sparc /* for x86, using integer multiplies is faster */
  
--- 954,964 ----
  
        if (buff_ind >= n + 1) buff_ind = 0;
      }
    }
  
!   FREE_AND_RETURN_STATUS
  }
  
  /***************************************************************/
  #ifndef __sparc /* for x86, using integer multiplies is faster */