| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkTypes_DEFINED | 8 #ifndef SkTypes_DEFINED |
| 9 #define SkTypes_DEFINED | 9 #define SkTypes_DEFINED |
| 10 | 10 |
| 11 #include "SkPreConfig.h" | 11 #include "SkPreConfig.h" |
| 12 #include "SkUserConfig.h" | 12 #include "SkUserConfig.h" |
| 13 #include "SkPostConfig.h" | 13 #include "SkPostConfig.h" |
| 14 #include <stdint.h> | 14 #include <stdint.h> |
| 15 | 15 |
| 16 //#define SK_SUPPORT_LEGACY_SK64 | |
| 17 | |
| 18 /** \file SkTypes.h | 16 /** \file SkTypes.h |
| 19 */ | 17 */ |
| 20 | 18 |
| 21 /** See SkGraphics::GetVersion() to retrieve these at runtime | 19 /** See SkGraphics::GetVersion() to retrieve these at runtime |
| 22 */ | 20 */ |
| 23 #define SKIA_VERSION_MAJOR 1 | 21 #define SKIA_VERSION_MAJOR 1 |
| 24 #define SKIA_VERSION_MINOR 0 | 22 #define SKIA_VERSION_MINOR 0 |
| 25 #define SKIA_VERSION_PATCH 0 | 23 #define SKIA_VERSION_PATCH 0 |
| 26 | 24 |
| 27 /* | 25 /* |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 private: | 628 private: |
| 631 void* fPtr; | 629 void* fPtr; |
| 632 size_t fSize; // can be larger than the requested size (see kReuse) | 630 size_t fSize; // can be larger than the requested size (see kReuse) |
| 633 uint32_t fStorage[(kSize + 3) >> 2]; | 631 uint32_t fStorage[(kSize + 3) >> 2]; |
| 634 }; | 632 }; |
| 635 // Can't guard the constructor because it's a template class. | 633 // Can't guard the constructor because it's a template class. |
| 636 | 634 |
| 637 #endif /* C++ */ | 635 #endif /* C++ */ |
| 638 | 636 |
| 639 #endif | 637 #endif |
| OLD | NEW |