← Back to branch summary

~ubuntu-branches/ubuntu/saucy/imagemagick/saucy-proposed

« back to all changes in this revision

Viewing changes to magick/profile.c

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2013-01-22 21:38:05 UTC
  • mfrom: (6.2.27 sid)
  • Revision ID: package-import@ubuntu.com-20130122213805-uoar6wqz8fc0dvvl
Tags: 8:6.7.7.10-5ubuntu1
https://launchpad.net/bugs/1079209
* Merge from Debian unstable. (LP: #1079209) Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.
  - Build-Depend on libtiff5-dev instead of libtiff-dev
  - Depend on fftw3-dev as it's in main, not fftw-dev.
  - Don't build depend on graphicsmagick-imagemagick-compat (universe)
  - Don't use graphicmagick's convert executable just to convert our
    svg into a menu xpm.  Instead, run the convert we build.
* Mark Vcs-* as XS-Debian-Vcs-*
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
magick/profile.c
367
367
  size_t
368
368
    number_threads;
369
369
 
370
 
  number_threads=GetOpenMPMaximumThreads();
 
370
  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
371
371
  pixels=(unsigned short **) AcquireQuantumMemory(number_threads,
372
372
    sizeof(*pixels));
373
373
  if (pixels == (unsigned short **) NULL)
410
410
  size_t
411
411
    number_threads;
412
412
 
413
 
  number_threads=GetOpenMPMaximumThreads();
 
413
  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
414
414
  transform=(cmsHTRANSFORM *) AcquireQuantumMemory(number_threads,
415
415
    sizeof(*transform));
416
416
  if (transform == (cmsHTRANSFORM *) NULL)