Changeset 846 for trunk/src/3rdparty/libjpeg/jcprepct.c

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:

• . (modified) (1 prop)
• src/3rdparty/libjpeg/jcprepct.c (modified) (3 diffs)

trunk/src/3rdparty/libjpeg/jcprepct.c

@@ -174 +174 @@
       for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
            ci++, compptr++) {
+        numrows = (compptr->v_samp_factor * compptr->DCT_v_scaled_size) /
+                  cinfo->min_DCT_v_scaled_size;
         expand_bottom_edge(output_buf[ci],
-                           compptr->width_in_blocks * DCTSIZE,
-                           (int) (*out_row_group_ctr * compptr->v_samp_factor),
-                           (int) (out_row_groups_avail * compptr->v_samp_factor));
+                           compptr->width_in_blocks * compptr->DCT_h_scaled_size,
+                           (int) (*out_row_group_ctr * numrows),
+                           (int) (out_row_groups_avail * numrows));
       }
       *out_row_group_ctr = out_row_groups_avail;
@@ -289 +291 @@
     true_buffer = (*cinfo->mem->alloc_sarray)
       ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
+       (JDIMENSION) (((long) compptr->width_in_blocks *
+                      cinfo->min_DCT_h_scaled_size *
                       cinfo->max_h_samp_factor) / compptr->h_samp_factor),
        (JDIMENSION) (3 * rgroup_height));
@@ -347 +350 @@
       prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)
         ((j_common_ptr) cinfo, JPOOL_IMAGE,
-         (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
+         (JDIMENSION) (((long) compptr->width_in_blocks *
+                        cinfo->min_DCT_h_scaled_size *
                         cinfo->max_h_samp_factor) / compptr->h_samp_factor),
          (JDIMENSION) cinfo->max_v_samp_factor);