diff options
| author | Mike Reed <reed@google.com> | 2009-07-17 11:05:09 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2009-07-17 11:29:04 -0400 |
| commit | b1fd0813e0219e9f536ee5f43e988d10f4e147e6 (patch) | |
| tree | c994e9a92620132587834233232d42d2551b23f1 /include | |
| parent | 60441ca59855d5289dd533aea1a40eb898b8a745 (diff) | |
| download | external_skia-b1fd0813e0219e9f536ee5f43e988d10f4e147e6.zip external_skia-b1fd0813e0219e9f536ee5f43e988d10f4e147e6.tar.gz external_skia-b1fd0813e0219e9f536ee5f43e988d10f4e147e6.tar.bz2 | |
remove build conditional for mipmaps
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkBitmap.h | 2 | ||||
| -rw-r--r-- | include/core/SkPostConfig.h | 3 | ||||
| -rw-r--r-- | include/core/SkUserConfig.h | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index ecf7b2f..3c04a31 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -450,10 +450,8 @@ public: }; private: -#ifdef SK_SUPPORT_MIPMAP struct MipMap; mutable MipMap* fMipMap; -#endif mutable SkPixelRef* fPixelRef; mutable size_t fPixelRefOffset; diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index 482a8bc..cb6473c 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -175,9 +175,6 @@ #endif #endif -// experimental for now -#define SK_SUPPORT_MIPMAP - ////////////////////////////////////////////////////////////////////////////////////////////// #ifndef SK_BUILD_FOR_WINCE #include <string.h> diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h index f5a8903..e5528cc 100644 --- a/include/core/SkUserConfig.h +++ b/include/core/SkUserConfig.h @@ -47,7 +47,11 @@ // // ANDROID Specific changes - NO NOT CHECK BACK INTO code.google.com/p/skia // -#include <utils/misc.h> + +// do this build check for other tools that still read this header +#ifdef ANDROID + #include <utils/misc.h> +#endif #ifdef SK_BUILD_FOR_MAC #undef SK_BUILD_FOR_MAC |