← Back to branch summary

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

« back to all changes in this revision

Viewing changes to java/awt/color/ICC_Profile.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:
java/awt/color/ICC_Profile.java
426
426
    System.arraycopy(headerData, 0, data, 0, ProfileHeader.HEADERSIZE);
427
427
 
428
428
    // read the rest
429
 
    if (in.read(data, ProfileHeader.HEADERSIZE,
430
 
                header.getSize() - ProfileHeader.HEADERSIZE) != header.getSize()
431
 
        - ProfileHeader.HEADERSIZE)
432
 
      throw new IOException("Incorrect profile size");
 
429
    int totalBytes = header.getSize() - ProfileHeader.HEADERSIZE;
 
430
    int bytesLeft = totalBytes;
 
431
    while (bytesLeft > 0)
 
432
      {
 
433
        int read = in.read(data,
 
434
                           ProfileHeader.HEADERSIZE + (totalBytes - bytesLeft),
 
435
                           bytesLeft);
 
436
        bytesLeft -= read;
 
437
      }
433
438
 
434
439
    return getInstance(data);
435
440
  }