← Back to branch summary

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

« back to all changes in this revision

Viewing changes to magick/image-view.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/image-view.c
737
737
  image_view->extent.height=image->rows;
738
738
  image_view->extent.x=0;
739
739
  image_view->extent.y=0;
740
 
  image_view->number_threads=GetOpenMPMaximumThreads();
 
740
  image_view->number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
741
741
  image_view->debug=IsEventLogging();
742
742
  image_view->signature=MagickSignature;
743
743
  return(image_view);
791
791
  image_view->extent.height=height;
792
792
  image_view->extent.x=x;
793
793
  image_view->extent.y=y;
794
 
  image_view->number_threads=GetOpenMPMaximumThreads();
 
794
  image_view->number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
795
795
  image_view->debug=IsEventLogging();
796
796
  image_view->signature=MagickSignature;
797
797
  return(image_view);
992
992
  assert(image_view->signature == MagickSignature);
993
993
  image_view->number_threads=number_threads;
994
994
  if (number_threads > (size_t) GetMagickResourceLimit(ThreadResource))
995
 
    image_view->number_threads=GetOpenMPMaximumThreads();
 
995
    image_view->number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
996
996
}
997
997
 
998
998
/*