← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to app/config/gimpbaseconfig.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-06 13:30:41 UTC
  • mto: This revision was merged to the branch mainline in revision 35.
  • Revision ID: james.westby@ubuntu.com-20081006133041-3panbkcanaymfsmp
Tags: upstream-2.6.0
Import upstream version 2.6.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/config/gimpbaseconfig.c
32
32
 
33
33
#include "config-types.h"
34
34
 
 
35
#include "base/base-types.h" /* eek */
 
36
#include "base/base-utils.h"
35
37
#include "base/pixel-processor.h"
36
38
 
37
39
#include "gimprc-blurbs.h"
39
41
 
40
42
#include "gimp-intl.h"
41
43
 
42
 
#define NUM_PROCESSORS_DEFAULT 1
43
 
 
44
44
 
45
45
enum
46
46
{
94
94
                                 GIMP_PARAM_STATIC_STRINGS |
95
95
                                 GIMP_CONFIG_PARAM_RESTART);
96
96
 
97
 
#if defined(HAVE_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
98
 
  num_processors = sysconf (_SC_NPROCESSORS_ONLN);
99
 
#else
100
 
  num_processors = NUM_PROCESSORS_DEFAULT;
101
 
#endif
 
97
  num_processors = get_number_of_processors ();
102
98
 
103
99
#ifdef GIMP_UNSTABLE
104
100
  num_processors = num_processors * 2;
110
106
                                 GIMP_PARAM_STATIC_STRINGS);
111
107
  GIMP_CONFIG_INSTALL_PROP_MEMSIZE (object_class, PROP_TILE_CACHE_SIZE,
112
108
                                    "tile-cache-size", TILE_CACHE_SIZE_BLURB,
113
 
                                    0, MIN (G_MAXULONG, GIMP_MAX_MEMSIZE),
 
109
                                    0, MIN (G_MAXSIZE, GIMP_MAX_MEMSIZE),
114
110
                                    1 << 30, /* 1GB */
115
111
                                    GIMP_PARAM_STATIC_STRINGS |
116
112
                                    GIMP_CONFIG_PARAM_CONFIRM);