~ubuntu-branches/debian/squeeze/openttd/squeeze

« back to all changes in this revision

Viewing changes to src/blitter/factory.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Matthijs Kooijman
  • Date: 2008-08-08 11:07:05 UTC
  • mfrom: (1.1.4 upstream) (2.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080808110705-zq0eo95c4pexg70i
* New upstream release.
  - Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $Id: factory.hpp 11839 2008-01-13 21:41:24Z rubidium $ */
 
1
/* $Id: factory.hpp 13688 2008-07-09 19:20:50Z rubidium $ */
2
2
 
3
3
#ifndef BLITTER_FACTORY_HPP
4
4
#define BLITTER_FACTORY_HPP
65
65
        {
66
66
                const char *default_blitter = "8bpp-optimized";
67
67
 
 
68
#if defined(__APPLE__)
 
69
                /* MacOS X 10.5 removed 8bpp fullscreen support.
 
70
                 * Because of this we will pick 32bpp by default */
 
71
                if (MacOSVersionIsAtLeast(10, 5, 0)) {
 
72
                        default_blitter = "32bpp-anim";
 
73
                }
 
74
#endif /* defined(__APPLE__) */
68
75
                if (GetBlitters().size() == 0) return NULL;
69
76
                const char *bname = (StrEmpty(name)) ? default_blitter : name;
70
77