← Back to branch summary

~ubuntu-branches/ubuntu/precise/libx11/precise-updates

« back to all changes in this revision

Viewing changes to src/ImUtil.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-08 19:04:53 UTC
  • mfrom: (1.1.13 upstream) (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110408190453-xvgvdjqp06ta0csm
Tags: 2:1.4.2-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Latin locale.
  - Add Klingon locale.
  - Add 102_double_arrows_Compose.patch: compose keys for double arrows
    (LP: 680143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ImUtil.c
372
372
        if (image_bytes_per_line == 0) {
373
373
            image->bytes_per_line = min_bytes_per_line;
374
374
        } else if (image_bytes_per_line < min_bytes_per_line) {
 
375
            Xfree(image);
375
376
            return NULL;
376
377
        } else {
377
378
            image->bytes_per_line = image_bytes_per_line;