← Back to branch summary

~ubuntu-branches/debian/sid/swt-gtk/sid

« back to all changes in this revision

Viewing changes to org/eclipse/swt/internal/image/JPEGDecoder.java

  • Committer: Bazaar Package Importer
  • Author(s): Adrian Perez
  • Date: 2009-12-07 10:22:24 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091207102224-70w2tax575mcks1w
Tags: 3.5.1-1
http://bugs.debian.org/558663
* New upstream release. Closes: #558663.
* debian/control: 
  - Add Vcs-* fields for Git repository.
  - Allow DM-Uploads.
  - Remove "Conflicts", package should live with eclipse.
* debian/rules: Fix default-java path around AWT_LIB_PATH.
* debian/copyright: Minor update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org/eclipse/swt/internal/image/JPEGDecoder.java
1
1
/*******************************************************************************
2
 
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
3
 * All rights reserved. This program and the accompanying materials
4
4
 * are made available under the terms of the Eclipse Public License v1.0
5
5
 * which accompanies this distribution, and is available at
2456
2456
                        cinfo.out_color_components = 1;
2457
2457
                        break;
2458
2458
                case JCS_RGB:
2459
 
                        if (RGB_PIXELSIZE != 3) {
2460
 
                                cinfo.out_color_components = RGB_PIXELSIZE;
2461
 
                                break;
2462
 
                        }
2463
 
                        //FALLTHROUGH
2464
2459
                case JCS_YCbCr:
2465
2460
                        cinfo.out_color_components = 3;
2466
2461
                        break;
2618
2613
                                build_ycc_rgb_table(cinfo);
2619
2614
                        } else if (cinfo.jpeg_color_space == JCS_GRAYSCALE) {
2620
2615
                                cconvert.color_convert = GRAY_RGB_CONVERT;
2621
 
                        } else if (cinfo.jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
 
2616
                        } else if (cinfo.jpeg_color_space == JCS_RGB) {
2622
2617
                                cconvert.color_convert = NULL_CONVERT;
2623
2618
                        } else
2624
2619
                                error();