← Back to branch summary

~ubuntu-branches/ubuntu/saucy/stalonetray/saucy

« back to all changes in this revision

Viewing changes to src/image.c

  • Committer: Bazaar Package Importer
  • Author(s): Varun Hiremath
  • Date: 2009-10-10 02:05:20 UTC
  • mfrom: (1.1.7 upstream) (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091010020520-adj6s9i1ujpvzapo
Tags: 0.8.0~beta1-1
* New upstream release
* bump Standards-Version to 3.8.3
* Remove Torsten from Uploaders as requested

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/image.c
38
38
        case 15:
39
39
                return image_tint_15((CARD16 *) image->data, image->width * image->height, color->pixel, alpha);
40
40
        default:
41
 
                DIE(("Internal error: image_tint() called with unsupported depth %d\n", image->bits_per_pixel));
 
41
                DIE_IE(("image_tint() called with unsupported depth %d\n", image->bits_per_pixel));
42
42
                return FAILURE;
43
43
        }
44
44
}
55
55
        case 15:
56
56
                return image_compose_15((CARD16 *) image->data, (CARD16 *) bg->data, mask, (image->width * image->height));
57
57
        default:
58
 
                DIE(("Internal error: image_tint() called with unsupported depth %d\n", image->bits_per_pixel));
 
58
                DIE_IE(("image_compose() called with unsupported depth %d\n", image->bits_per_pixel));
59
59
                return FAILURE;
60
60
        }
61
61
}
68
68
        bord = (1 << ord) - 1;
69
69
 
70
70
        m = malloc(w * h);
71
 
        if (m == NULL) DIE(("Out of memory.\n"));
 
71
        if (m == NULL) return NULL;
72
72
        memset(m, 255, w * h);
73
73
 
74
74
        /* Shade top and bootom of the rectangle */