Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/libjpeg/jdcoefct.c

    r2 r846  
    188188                                                    : compptr->last_col_width;
    189189        output_ptr = output_buf[compptr->component_index] +
    190           yoffset * compptr->DCT_scaled_size;
     190          yoffset * compptr->DCT_v_scaled_size;
    191191        start_col = MCU_col_num * compptr->MCU_sample_width;
    192192        for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
     
    198198                              (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
    199199                              output_ptr, output_col);
    200               output_col += compptr->DCT_scaled_size;
     200              output_col += compptr->DCT_h_scaled_size;
    201201            }
    202202          }
    203203          blkn += compptr->MCU_width;
    204           output_ptr += compptr->DCT_scaled_size;
     204          output_ptr += compptr->DCT_v_scaled_size;
    205205        }
    206206      }
     
    363363                        output_ptr, output_col);
    364364        buffer_ptr++;
    365         output_col += compptr->DCT_scaled_size;
     365        output_col += compptr->DCT_h_scaled_size;
    366366      }
    367       output_ptr += compptr->DCT_scaled_size;
     367      output_ptr += compptr->DCT_v_scaled_size;
    368368    }
    369369  }
     
    655655        DC7 = DC8; DC8 = DC9;
    656656        buffer_ptr++, prev_block_row++, next_block_row++;
    657         output_col += compptr->DCT_scaled_size;
     657        output_col += compptr->DCT_h_scaled_size;
    658658      }
    659       output_ptr += compptr->DCT_scaled_size;
     659      output_ptr += compptr->DCT_v_scaled_size;
    660660    }
    661661  }
Note: See TracChangeset for help on using the changeset viewer.