comparison libmpcodecs/vd_sgi.c @ 18856:8f3099900d8c

correct handling of sgi compressed images on amd64, patch by Paul-Francois Fontigny - pff AT filmik-be

18855:a60bcf4969c3

/* decode a run length encoded sgi image */
static void
decode_rle_sgi(SGIInfo *info, unsigned char *data, mp_image_t *mpi)
{
  unsigned char *rle_data, *dest_row;
  unsigned long *starttab;
  int y, z, xsize, ysize, zsize, chan_offset;
  long start_offset;
  
  xsize = info->xsize;
  ysize = info->ysize;
  zsize = info->zsize;

  /* rle offset table is right after the header */
  starttab = (long*)(data + SGI_HEADER_LEN); 
  
   for (z = 0; z < zsize; z++) {

     /* set chan_offset so RGB ends up BGR */
     chan_offset = (zsize - 1) - z;

        so read scan lines from bottom to top */
     for (y = ysize - 1; y >= 0; y--) {
       dest_row = mpi->planes[0] + mpi->stride[0] * (ysize - 1 - y);
    
      /* set start of next run (offsets are from start of header) */
      start_offset = be2me_32(*(unsigned long*) &starttab[y + z * ysize]);
      
      rle_data = &data[start_offset];
    
      if(info->zsize == SGI_GRAYSCALE_IMAGE) {
        expandrow_gs(dest_row, rle_data);

18856:8f3099900d8c

/* decode a run length encoded sgi image */
static void
decode_rle_sgi(SGIInfo *info, unsigned char *data, mp_image_t *mpi)
{
  unsigned char *rle_data, *dest_row;
  uint32_t *starttab;
  int y, z, xsize, ysize, zsize, chan_offset;
  long start_offset;
  
  xsize = info->xsize;
  ysize = info->ysize;
  zsize = info->zsize;

  /* rle offset table is right after the header */
  starttab = (uint32_t*)(data + SGI_HEADER_LEN); 
  
   for (z = 0; z < zsize; z++) {

     /* set chan_offset so RGB ends up BGR */
     chan_offset = (zsize - 1) - z;

        so read scan lines from bottom to top */
     for (y = ysize - 1; y >= 0; y--) {
       dest_row = mpi->planes[0] + mpi->stride[0] * (ysize - 1 - y);
    
      /* set start of next run (offsets are from start of header) */
      start_offset = be2me_32(*(uint32_t*) &starttab[y + z * ysize]);
      
      rle_data = &data[start_offset];
    
      if(info->zsize == SGI_GRAYSCALE_IMAGE) {
        expandrow_gs(dest_row, rle_data);