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