diff options
| -rw-r--r-- | src/core/SkWriter32.cpp | 4 | ||||
| -rw-r--r-- | tests/Writer32Test.cpp | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp index 7285459c3d..1e8a10c87c 100644 --- a/src/core/SkWriter32.cpp +++ b/src/core/SkWriter32.cpp @@ -81,6 +81,6 @@ void SkWriter32::growToAtLeast(size_t size) { // Expand the array so all reserved space is "used", we maintain the // amount we have written manually outside the array fInternal.setCount(fCapacity); - SkASSERT(fInternal.count() == fCapacity); - SkASSERT(fInternal.reserved() == fCapacity); + SkASSERT(fInternal.count() == (int)fCapacity); + SkASSERT(fInternal.reserved() == (int)fCapacity); } diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp index 2f8b5c6edf..4d421c8060 100644 --- a/tests/Writer32Test.cpp +++ b/tests/Writer32Test.cpp @@ -203,17 +203,9 @@ DEF_TEST(Writer32_contiguous, reporter) { test1(reporter, &writer); REPORTER_ASSERT(reporter, writer.contiguousArray() != NULL); - // This write is too big for the 32 byte storage block we provide. - writer.reset(storage, 32); - test2(reporter, &writer); - // Some data is in storage, some in writer's internal storage. - REPORTER_ASSERT(reporter, writer.contiguousArray() == NULL); - - writer.reset(); - test2(reporter, &writer); - // There is no external storage. All the data is in internal storage, - // so we can always read it contiguously. - REPORTER_ASSERT(reporter, writer.contiguousArray() != NULL); + // Everything other aspect of contiguous/non-contiguous is an + // implementation detail, not part of the public contract for + // SkWriter32, and so not tested here. } DEF_TEST(Writer32_small, reporter) { |