commit b5d7b60fe3c0befb07ba739b0168bfc17851667f
author Stephan Bergmann <sbergman@redhat.com> Fri Apr 08 21:52:21 2016 +0200
committer Stephan Bergmann <sbergman@redhat.com> Mon Apr 11 14:32:28 2016 +0200
tree 5ce90bfc749898033a3b24ec3369face4d9dba27
parent 0548af776fc617acfe95076df0edc1b41ce536b1

Avoid reserved identifiers

Change-Id: I3c3ca71a2e0098ec8df49c6bf4c2045218c91ee9

vcl/source/filter/jpeg/jpegcomp.h

diff --git a/vcl/source/filter/jpeg/jpegcomp.h b/vcl/source/filter/jpeg/jpegcomp.h
index dcad5a9..9b3e367 100644
--- a/vcl/source/filter/jpeg/jpegcomp.h
+++ b/vcl/source/filter/jpeg/jpegcomp.h
@@ -10,9 +10,9 @@
 */

#if JPEG_LIB_VERSION >= 70
#define _min_DCT_h_scaled_size min_DCT_h_scaled_size
#define _min_DCT_v_scaled_size min_DCT_v_scaled_size
#define min_DCT_h_scaled_size_ min_DCT_h_scaled_size
#define min_DCT_v_scaled_size_ min_DCT_v_scaled_size
#else
#define _min_DCT_h_scaled_size min_DCT_scaled_size
#define _min_DCT_v_scaled_size min_DCT_scaled_size
#define min_DCT_h_scaled_size_ min_DCT_scaled_size
#define min_DCT_v_scaled_size_ min_DCT_scaled_size
#endif

vcl/source/filter/jpeg/transupp.c

diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 323aa30..a784ffb2 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -859,15 +859,15 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
    if (info->num_components == 1) {
      if (!jtransform_perfect_transform(srcinfo->output_width,
      srcinfo->output_height,
      srcinfo->_min_DCT_h_scaled_size,
      srcinfo->_min_DCT_v_scaled_size,
      srcinfo->min_DCT_h_scaled_size_,
      srcinfo->min_DCT_v_scaled_size_,
      info->transform))
    return FALSE;
    } else {
      if (!jtransform_perfect_transform(srcinfo->output_width,
      srcinfo->output_height,
      srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size,
      srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size,
      srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size_,
      srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size_,
      info->transform))
    return FALSE;
    }
@@ -886,26 +886,26 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
    info->output_width = srcinfo->output_height;
    info->output_height = srcinfo->output_width;
    if (info->num_components == 1) {
      info->iMCU_sample_width = srcinfo->_min_DCT_v_scaled_size;
      info->iMCU_sample_height = srcinfo->_min_DCT_h_scaled_size;
      info->iMCU_sample_width = srcinfo->min_DCT_v_scaled_size_;
      info->iMCU_sample_height = srcinfo->min_DCT_h_scaled_size_;
    } else {
      info->iMCU_sample_width =
    srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size;
    srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size_;
      info->iMCU_sample_height =
    srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size;
    srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size_;
    }
    break;
  default:
    info->output_width = srcinfo->output_width;
    info->output_height = srcinfo->output_height;
    if (info->num_components == 1) {
      info->iMCU_sample_width = srcinfo->_min_DCT_h_scaled_size;
      info->iMCU_sample_height = srcinfo->_min_DCT_v_scaled_size;
      info->iMCU_sample_width = srcinfo->min_DCT_h_scaled_size_;
      info->iMCU_sample_height = srcinfo->min_DCT_v_scaled_size_;
    } else {
      info->iMCU_sample_width =
    srcinfo->max_h_samp_factor * srcinfo->_min_DCT_h_scaled_size;
    srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size_;
      info->iMCU_sample_height =
    srcinfo->max_v_samp_factor * srcinfo->_min_DCT_v_scaled_size;
    srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size_;
    }
    break;
  }