← Back to branch summary

~ubuntu-branches/ubuntu/raring/libjpeg-turbo/raring-updates

« back to all changes in this revision

Viewing changes to jdcolor.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-12-20 23:12:52 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20111220231252-74naxp27nuzxpn8o
Tags: 1.1.90+svn733-0ubuntu2
* Sync with upstream to svn733.

* Rename libjpeg-test to libjpeg-turbo-test.
* Rename libjpeg-turbo-dbg to libjpeg-turbo8-dbg.
* Rename libjpeg8-dev to libjpeg-turbo8-dev.
* Move the docs into the -dev package, install the upstream changelog
  in the -dev only.
* Split out libturbojpeg.so into it's own package, don't let
  libjpeg-turbo8-dev depend on it.
* Fix libjpeg-turbo8-dbg package description.
* Install jconfig.h into multiarch include path.
* Remove HAVE_STD{LIB,DEF}_H from jconfig.h since they are not used and
  conflict with autoconf.
* libjpeg-turbo8:
  - Add a symbols file, with a different version for symbols only found
    in the libjpeg-turbo implementation.
  - Remove the shlibs file.
  - Breaks/Replaces libjpeg8 (<< 8c-2ubuntu5).
* Copy the exifautotran and jpegexiforient tools from the libjpeg8
  sources, install into libjpeg-turbo-progs.
* Don't install tjbench in libjpeg-turbo-progs to avoid dependency
  on libturbojpeg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jdcolor.c
224
224
                                  num_rows);
225
225
      break;
226
226
    case JCS_EXT_RGBX:
 
227
    case JCS_EXT_RGBA:
227
228
      ycc_extrgbx_convert_internal(cinfo, input_buf, input_row, output_buf,
228
229
                                   num_rows);
229
230
      break;
232
233
                                  num_rows);
233
234
      break;
234
235
    case JCS_EXT_BGRX:
 
236
    case JCS_EXT_BGRA:
235
237
      ycc_extbgrx_convert_internal(cinfo, input_buf, input_row, output_buf,
236
238
                                   num_rows);
237
239
      break;
238
240
    case JCS_EXT_XBGR:
 
241
    case JCS_EXT_ABGR:
239
242
      ycc_extxbgr_convert_internal(cinfo, input_buf, input_row, output_buf,
240
243
                                   num_rows);
241
244
      break;
242
245
    case JCS_EXT_XRGB:
 
246
    case JCS_EXT_ARGB:
243
247
      ycc_extxrgb_convert_internal(cinfo, input_buf, input_row, output_buf,
244
248
                                   num_rows);
245
249
      break;
316
320
                                   num_rows);
317
321
      break;
318
322
    case JCS_EXT_RGBX:
 
323
    case JCS_EXT_RGBA:
319
324
      gray_extrgbx_convert_internal(cinfo, input_buf, input_row, output_buf,
320
325
                                    num_rows);
321
326
      break;
324
329
                                   num_rows);
325
330
      break;
326
331
    case JCS_EXT_BGRX:
 
332
    case JCS_EXT_BGRA:
327
333
      gray_extbgrx_convert_internal(cinfo, input_buf, input_row, output_buf,
328
334
                                    num_rows);
329
335
      break;
330
336
    case JCS_EXT_XBGR:
 
337
    case JCS_EXT_ABGR:
331
338
      gray_extxbgr_convert_internal(cinfo, input_buf, input_row, output_buf,
332
339
                                    num_rows);
333
340
      break;
334
341
    case JCS_EXT_XRGB:
 
342
    case JCS_EXT_ARGB:
335
343
      gray_extxrgb_convert_internal(cinfo, input_buf, input_row, output_buf,
336
344
                                    num_rows);
337
345
      break;
471
479
  case JCS_EXT_BGRX:
472
480
  case JCS_EXT_XBGR:
473
481
  case JCS_EXT_XRGB:
 
482
  case JCS_EXT_RGBA:
 
483
  case JCS_EXT_BGRA:
 
484
  case JCS_EXT_ABGR:
 
485
  case JCS_EXT_ARGB:
474
486
    cinfo->out_color_components = rgb_pixelsize[cinfo->out_color_space];
475
487
    if (cinfo->jpeg_color_space == JCS_YCbCr) {
476
488
      if (jsimd_can_ycc_rgb())