← Back to branch summary

~ubuntu-branches/ubuntu/karmic/classpath/karmic

« back to all changes in this revision

Viewing changes to gnu/javax/imageio/jpeg/JPEGDecoder.java

  • Committer: Bazaar Package Importer
  • Author(s): Manny Vindiola, Manny Vindiola, James Westby
  • Date: 2008-12-18 21:24:48 UTC
  • mfrom: (1.1.6 upstream) (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081218212448-ax2jaxx9r5175dkl
Tags: 2:0.97.2-1.1ubuntu1
https://launchpad.net/bugs/309549
https://launchpad.net/bugs/237668
https://launchpad.net/bugs/272772
[ Manny Vindiola ]
* Merge from debian unstable (LP: #309549)(LP: #237668), remaining changes:
  * debian/control:
    - Recommend firefox instead of mozilla-firefox.
  * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored
    - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch
    - update debian/patches/00list
  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
     (meta-package) must alternatively Depend/Recommend/Suggest abrowser
* Fix FTBFS due to missing mozilla-plugin build dependency 
  - changed to build-depends on libxul-dev instead of iceape-dev

[ James Westby ]
* Add libsamplerate0-dev to Build-Depends to fix build error by not being
  able to find the .a file from it. This is a dependency of jack, but not
  specified in it's depends. This is probably due to bug 258491, and so if
  that is fixed try building without the extra Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnu/javax/imageio/jpeg/JPEGDecoder.java
387
387
                    // read in how much they need
388
388
                    for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
389
389
                      {
390
 
                        JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
 
390
                        JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
391
391
                        comp.readComponentMCU(jpegStream);
392
392
                      }
393
393
                    mcuIndex++;
416
416
                      {
417
417
                        for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
418
418
                          {
419
 
                            JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
 
419
                            JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
420
420
                            if (compIndex > 1)
421
421
                              comp.padMCU(mcuTotalIndex, resetInterval - mcuIndex);
422
422
                            comp.resetInterval();
481
481
                // Unencode the data.
482
482
                for (int i = 0; i < frame.getComponentCount(); i++)
483
483
                  {
484
 
                    JPEGComponent comp =
485
 
                      (JPEGComponent) frame.components.get(i);
 
484
                    JPEGComponent comp = frame.components.get(i);
486
485
                    comp.setQuantizationTable(qTables[comp.quant_id].getTable());
487
486
                    comp.quantitizeData();
488
487
                    comp.idctData(myDCT);
490
489
                // Scale the image and write the data to the raster.
491
490
                for (int i = 0; i < frame.getComponentCount(); i++)
492
491
                  {
493
 
                    JPEGComponent comp = (JPEGComponent) frame.components.get(i);
 
492
                    JPEGComponent comp = frame.components.get(i);
494
493
                    comp.scaleByFactors();
495
494
                    comp.writeData(raster, i);
496
495
                    // Ensure garbage collection.