Fix a crash bug when height > width.

diff --git a/qscale.c b/qscale.c
index 336e8c2404e984322981c814d365b54c5fcf8d69..97f802ee3e5eecc58c9a551533ac4d74690aea62 100644 (file)
--- a/qscale.c
+++ b/qscale.c
@@ -420,21 +420,21 @@ int main(int argc, char **argv)
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[0].width_in_blocks * DCTSIZE * nh0 * sizeof(float)); 
                vscale(data_y, npix, dinfo.comp_info[0].width_in_blocks * DCTSIZE, h0, nh0, dinfo.comp_info[0].width_in_blocks * DCTSIZE);
-               data_ny = (unsigned char *)malloc(nw0 * stride0);
+               data_ny = (unsigned char *)malloc(nh0 * stride0);
                hscale(npix, data_ny, w0, nh0, nw0, dinfo.comp_info[0].width_in_blocks * DCTSIZE, stride0);
                free(npix);
        }
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[1].width_in_blocks * DCTSIZE * nh1 * sizeof(float)); 
                vscale(data_cr, npix, dinfo.comp_info[1].width_in_blocks * DCTSIZE, h1, nh1, dinfo.comp_info[1].width_in_blocks * DCTSIZE);
-               data_ncr = (unsigned char *)malloc(nw1 * stride1);
+               data_ncr = (unsigned char *)malloc(nh1 * stride1);
                hscale(npix, data_ncr, w1, nh1, nw1, dinfo.comp_info[1].width_in_blocks * DCTSIZE, stride1);
                free(npix);
        }
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[2].width_in_blocks * DCTSIZE * nh2 * sizeof(float)); 
                vscale(data_cb, npix, dinfo.comp_info[2].width_in_blocks * DCTSIZE, h2, nh2, dinfo.comp_info[2].width_in_blocks * DCTSIZE);
-               data_ncb = (unsigned char *)malloc(nw2 * stride2);
+               data_ncb = (unsigned char *)malloc(nh2 * stride2);
                hscale(npix, data_ncb, w2, nh2, nw2, dinfo.comp_info[2].width_in_blocks * DCTSIZE, stride2);
                free(npix);
        }
@@ -446,7 +446,7 @@ int main(int argc, char **argv)
        jpeg_stdio_dest(&cinfo, stdout);
        cinfo.input_components = 3;
        jpeg_set_defaults(&cinfo);
-       jpeg_set_quality(&cinfo, 85, FALSE);
+       jpeg_set_quality(&cinfo, jpeg_quality, FALSE);
        cinfo.image_width = nominal_w;
        cinfo.image_height = nominal_h;
        cinfo.raw_data_in = TRUE;