From: hj kim <backto.kim@samsung.com>
Date: Thu, 3 Dec 2020 02:41:42 +0000 (+0900)
Subject: Merge branch 'upstream' into tizen
X-Git-Tag: accepted/tizen/6.5/base/20211028.060215~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a885195a123ad5451b760888da58b66ba9cdb476;p=platform%2Fupstream%2Flibjpeg-turbo.git

Merge branch 'upstream' into tizen

Change-Id: I9c1bfc9e38ebc707c8677184308fdead3daee7e1
---

a885195a123ad5451b760888da58b66ba9cdb476
diff --cc jdmerge.c
index 5cc42a5,3a456d6..d8a0081
--- a/jdmerge.c
+++ b/jdmerge.c
@@@ -254,12 -226,9 +226,12 @@@ merged_2v_upsample(j_decompress_ptr cin
                     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)
  /* 2:1 vertical sampling case: may need a spare row. */
  {
-   my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+   my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    JSAMPROW work_ptrs[2];
    JDIMENSION num_rows;          /* number of rows returned to caller */
 +#if _USE_PRODUCT_TV
 +  int skip = 0;
 +#endif
  
    if (upsample->spare_full) {
      /* If we have a spare row saved from a previous cycle, just return it. */