Fix a bunch of -Wunused-but-set-variable warnings.

core/src/fxcodec/codec/fx_codec_jpx_opj.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <limits>
 
 #include "../../../include/fxcodec/fx_codec.h"
@@ skipping 333 matching lines @@
               && (img->comps[1].dy == 1)
               && (img->comps[2].dy == 1)) {
         sycc444_to_rgb(img);
     } else {
         return;
     }
     img->color_space = OPJ_CLRSPC_SRGB;
 }
 void color_apply_icc_profile(opj_image_t *image)
 {
-    cmsHPROFILE in_prof, out_prof;
-    cmsHTRANSFORM transform;
-    cmsColorSpaceSignature in_space, out_space;
-    cmsUInt32Number intent, in_type, out_type, nr_samples;
+    cmsHPROFILE out_prof;
+    cmsUInt32Number in_type, out_type;

[Tom Sepez, 2015/05/08 16:03:00]

nit: one per line.

[Lei Zhang, 2015/05/08 18:02:05]

Done. I took care of the ints below as well.

     int *r, *g, *b;
     int prec, i, max, max_w, max_h;
-    OPJ_COLOR_SPACE oldspace;
-    in_prof =
+    cmsHPROFILE in_prof =
         cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
     if(in_prof == NULL) {
         return;
     }
-    in_space = cmsGetPCS(in_prof);
-    out_space = cmsGetColorSpace(in_prof);
-    intent = cmsGetHeaderRenderingIntent(in_prof);
+    cmsColorSpaceSignature out_space = cmsGetColorSpace(in_prof);
+    cmsUInt32Number intent = cmsGetHeaderRenderingIntent(in_prof);
     max_w = (int)image->comps[0].w;
     max_h = (int)image->comps[0].h;
     prec = (int)image->comps[0].prec;
-    oldspace = image->color_space;
+    OPJ_COLOR_SPACE oldspace = image->color_space;
     if(out_space == cmsSigRgbData) {
         if( prec <= 8 ) {
             in_type = TYPE_RGB_8;
             out_type = TYPE_RGB_8;
         } else {
             in_type = TYPE_RGB_16;
             out_type = TYPE_RGB_16;
         }
         out_prof = cmsCreate_sRGBProfile();
         image->color_space = OPJ_CLRSPC_SRGB;
     } else if(out_space == cmsSigGrayData) {
         if( prec <= 8 ) {
             in_type = TYPE_GRAY_8;
             out_type = TYPE_RGB_8;
         } else {
             in_type = TYPE_GRAY_16;
             out_type = TYPE_RGB_16;
         }
         out_prof = cmsCreate_sRGBProfile();
         image->color_space = OPJ_CLRSPC_SRGB;
     } else if(out_space == cmsSigYCbCrData) {
         in_type = TYPE_YCbCr_16;
         out_type = TYPE_RGB_16;
         out_prof = cmsCreate_sRGBProfile();
         image->color_space = OPJ_CLRSPC_SRGB;
     } else {
         return;
     }
-    transform = cmsCreateTransform(in_prof, in_type,
-                                   out_prof, out_type, intent, 0);
+    cmsHTRANSFORM transform =
+        cmsCreateTransform(in_prof, in_type, out_prof, out_type, intent, 0);
     cmsCloseProfile(in_prof);
     cmsCloseProfile(out_prof);
     if(transform == NULL) {
         image->color_space = oldspace;
         return;
     }
     if(image->numcomps > 2) {
         if( prec <= 8 ) {
             unsigned char *inbuf, *outbuf, *in, *out;
             max = max_w * max_h;
-            nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char);
+            cmsUInt32Number nr_samples = max * 3 * sizeof(unsigned char);
             in = inbuf = FX_Alloc(unsigned char, nr_samples);
             out = outbuf = FX_Alloc(unsigned char, nr_samples);
             r = image->comps[0].data;
             g = image->comps[1].data;
             b = image->comps[2].data;
             for(i = 0; i < max; ++i) {
                 *in++ = (unsigned char) * r++;
                 *in++ = (unsigned char) * g++;
                 *in++ = (unsigned char) * b++;
             }
             cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
             r = image->comps[0].data;
             g = image->comps[1].data;
             b = image->comps[2].data;
             for(i = 0; i < max; ++i) {
                 *r++ = (int) * out++;
                 *g++ = (int) * out++;
                 *b++ = (int) * out++;
             }
             FX_Free(inbuf);
             FX_Free(outbuf);
         } else {
             unsigned short *inbuf, *outbuf, *in, *out;
             max = max_w * max_h;
-            nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
+            cmsUInt32Number nr_samples = max * 3 * sizeof(unsigned short);
             in = inbuf = FX_Alloc(unsigned short, nr_samples);
             out = outbuf = FX_Alloc(unsigned short, nr_samples);
             r = image->comps[0].data;
             g = image->comps[1].data;
             b = image->comps[2].data;
             for(i = 0; i < max; ++i) {
                 *in++ = (unsigned short) * r++;
                 *in++ = (unsigned short) * g++;
                 *in++ = (unsigned short) * b++;
             }
             cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
             r = image->comps[0].data;
             g = image->comps[1].data;
             b = image->comps[2].data;
             for(i = 0; i < max; ++i) {
                 *r++ = (int) * out++;
                 *g++ = (int) * out++;
                 *b++ = (int) * out++;
             }
             FX_Free(inbuf);
             FX_Free(outbuf);
         }
     } else {
         unsigned char *in, *inbuf, *out, *outbuf;
         max = max_w * max_h;
-        nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char);
+        cmsUInt32Number nr_samples =
+            (cmsUInt32Number)max * 3 * sizeof(unsigned char);
         in = inbuf = FX_Alloc(unsigned char, nr_samples);
         out = outbuf = FX_Alloc(unsigned char, nr_samples);
         image->comps = (opj_image_comp_t*)
                        realloc(image->comps, (image->numcomps + 2) * sizeof(opj_image_comp_t));
         if(image->numcomps == 2) {
             image->comps[3] = image->comps[1];
         }
         image->comps[1] = image->comps[0];
         image->comps[2] = image->comps[0];
         image->comps[1].data = FX_Alloc(int, (size_t)max);
@@ skipping 26 matching lines @@
     numcomps = image->numcomps;
     if(numcomps < 3) {
         return;
     }
     row = (int*)image->icc_profile_buf;
     enumcs = row[0];
     if(enumcs == 14) {
         int *L, *a, *b, *red, *green, *blue, *src0, *src1, *src2;
         double rl, ol, ra, oa, rb, ob, prec0, prec1, prec2;
         double minL, maxL, mina, maxa, minb, maxb;
-        unsigned int default_type, il;
-        unsigned int i, max, illu;
+        unsigned int default_type;
+        unsigned int i, max;
         cmsHPROFILE in, out;
         cmsHTRANSFORM transform;
         cmsUInt16Number RGB[3];
         cmsCIELab Lab;
-        illu = 0;
-        il = 0;
         in = cmsCreateLab4Profile(NULL);
         out = cmsCreate_sRGBProfile();
         transform =
             cmsCreateTransform(in, TYPE_Lab_DBL, out, TYPE_RGB_16,
                                INTENT_PERCEPTUAL, 0);
         cmsCloseProfile(in);
         cmsCloseProfile(out);
         if(transform == NULL) {
             return;
         }
@@ skipping 170 matching lines @@
     return TRUE;
 }
 void CJPX_Decoder::GetInfo(FX_DWORD& width, FX_DWORD& height, FX_DWORD& codestream_nComps, FX_DWORD& output_nComps)
 {
     width = (FX_DWORD)image->x1;
     height = (FX_DWORD)image->y1;
     output_nComps = codestream_nComps = (FX_DWORD)image->numcomps;
 }
 FX_BOOL CJPX_Decoder::Decode(FX_LPBYTE dest_buf, int pitch, FX_BOOL bTranslateColor, FX_LPBYTE offsets)
 {
-    FX_BYTE** channel_bufs;
-    int* adjust_comps;
     int i, wid, hei, row, col, channel, src;
-    FX_BOOL flag;
     FX_LPBYTE pChannel, pScanline, pPixel;
 
     if(image->comps[0].w != image->x1 || image->comps[0].h != image->y1) {
         return FALSE;
     }
     if(pitch < (int)(image->comps[0].w * 8 * image->numcomps + 31) >> 5 << 2) {
         return FALSE;
     }
     FXSYS_memset8(dest_buf, 0xff, image->y1 * pitch);
-    channel_bufs = FX_Alloc(FX_BYTE*, image->numcomps);
+    FX_BYTE** channel_bufs = FX_Alloc(FX_BYTE*, image->numcomps);
     if (channel_bufs == NULL) {
         return FALSE;
     }
-    adjust_comps = FX_Alloc(int, image->numcomps);
+    FX_BOOL result = FALSE;
+    int* adjust_comps = FX_Alloc(int, image->numcomps);
     if (adjust_comps == NULL) {
-        FX_Free(channel_bufs);
-        return FALSE;
+        goto done;
     }
-    flag = TRUE;
     for (i = 0; i < (int)image->numcomps; i ++) {
         channel_bufs[i] = dest_buf + offsets[i];
         adjust_comps[i] = image->comps[i].prec - 8;
         if(i > 0) {
             if(image->comps[i].dx != image->comps[i - 1].dx
                     || image->comps[i].dy != image->comps[i - 1].dy
                     || image->comps[i].prec != image->comps[i - 1].prec) {
-                flag = FALSE;
-                goto failed;
+                goto done;
             }
         }
     }
     wid = image->comps[0].w;
     hei = image->comps[0].h;
     for (channel = 0; channel < (int)image->numcomps; channel++) {
         pChannel = channel_bufs[channel];
         if(adjust_comps[channel] < 0) {
             for(row = 0; row < hei; row++) {
                 pScanline = pChannel + row * pitch;
@@ skipping 26 matching lines @@
                             tmpPixel = 255;
                         } else if (tmpPixel < 0) {
                             tmpPixel = 0;
                         }
                         *pPixel = (FX_BYTE)tmpPixel;
                     }
                 }
             }
         }
     }
+    result = TRUE;
 
+done:
     FX_Free(channel_bufs);
     FX_Free(adjust_comps);
-    return TRUE;
-failed:
-    FX_Free(channel_bufs);
-    FX_Free(adjust_comps);
-    return FALSE;
+    return result;
 }
 void initialize_transition_table();
 void initialize_significance_luts();
 void initialize_sign_lut();
 CCodec_JpxModule::CCodec_JpxModule()
 {
 }
 void* CCodec_JpxModule::CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size , FX_BOOL useColorSpace)
 {
     CJPX_Decoder* pDecoder = new CJPX_Decoder;
@@ skipping 13 matching lines @@
 FX_BOOL CCodec_JpxModule::Decode(void* ctx, FX_LPBYTE dest_data, int pitch, FX_BOOL bTranslateColor, FX_LPBYTE offsets)
 {
     CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
     return pDecoder->Decode(dest_data, pitch, bTranslateColor, offsets);
 }
 void CCodec_JpxModule::DestroyDecoder(void* ctx)
 {
     CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
     delete pDecoder;
 }