| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkTypes_DEFINED | 10 #ifndef SkTypes_DEFINED |
| 11 #define SkTypes_DEFINED | 11 #define SkTypes_DEFINED |
| 12 | 12 |
| 13 #include "SkPreConfig.h" | 13 #include "SkPreConfig.h" |
| 14 #include "SkUserConfig.h" | 14 #include "SkUserConfig.h" |
| 15 #include "SkPostConfig.h" | 15 #include "SkPostConfig.h" |
| 16 | 16 #include <stdint.h> |
| 17 #ifndef SK_IGNORE_STDINT_DOT_H | |
| 18 #include <stdint.h> | |
| 19 #endif | |
| 20 | |
| 21 #include <stdio.h> | |
| 22 | 17 |
| 23 /** \file SkTypes.h | 18 /** \file SkTypes.h |
| 24 */ | 19 */ |
| 25 | 20 |
| 26 /** See SkGraphics::GetVersion() to retrieve these at runtime | 21 /** See SkGraphics::GetVersion() to retrieve these at runtime |
| 27 */ | 22 */ |
| 28 #define SKIA_VERSION_MAJOR 1 | 23 #define SKIA_VERSION_MAJOR 1 |
| 29 #define SKIA_VERSION_MINOR 0 | 24 #define SKIA_VERSION_MINOR 0 |
| 30 #define SKIA_VERSION_PATCH 0 | 25 #define SKIA_VERSION_PATCH 0 |
| 31 | 26 |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 | 601 |
| 607 private: | 602 private: |
| 608 void* fPtr; | 603 void* fPtr; |
| 609 size_t fSize; // can be larger than the requested size (see kReuse) | 604 size_t fSize; // can be larger than the requested size (see kReuse) |
| 610 uint32_t fStorage[(kSize + 3) >> 2]; | 605 uint32_t fStorage[(kSize + 3) >> 2]; |
| 611 }; | 606 }; |
| 612 | 607 |
| 613 #endif /* C++ */ | 608 #endif /* C++ */ |
| 614 | 609 |
| 615 #endif | 610 #endif |
| OLD | NEW |