diff options
| author |  Mike Reed <reed@google.com> | 2017-12-13 15:16:43 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-13 15:16:53 +0000 |
| commit | 2a3009931d7bb0f5ca31490c4cf19eef205e4e7a (patch) | |
| tree | 0e560343dccf1aef830d0eb24ac35e3790f54f9f /src/core/SkMathPriv.h | |
| parent | 76d917cef19aabfdc1247336f58237800bd71875 (diff) | |
Revert "impl SkSerial picture procs"
This reverts commit c8226728541fdd6434a7f1b97678246202b0edc5.
Reason for revert: broke old skps
Original change's description:
> impl SkSerial picture procs
>
> The picture serialization code is a bit of a mess, with duplicated functions for streams and buffers.
> Could not see how to fix that and land this at the same time, but I will try to circle back and
> simplify if possible afterwards.
>
> Bug: skia:
> Change-Id: I9053fdc476c60f483df013d021e248258181c199
> Reviewed-on: https://skia-review.googlesource.com/83943
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I68ae019a286691b65cc373cb29c941d6620fd34a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/84460
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkMathPriv.h')
| -rw-r--r-- | src/core/SkMathPriv.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkMathPriv.h b/src/core/SkMathPriv.h index 6c33e36747..ddb231507f 100644 --- a/src/core/SkMathPriv.h +++ b/src/core/SkMathPriv.h @@ -49,21 +49,6 @@ static inline unsigned SkClampUMax(unsigned value, unsigned max) { return value; } -// If a signed int holds min_int (e.g. 0x80000000) it is undefined what happens when -// we negate it (even though we *know* we're 2's complement and we'll get the same -// value back). So we create this helper function that casts to size_t (unsigned) first, -// to avoid the complaint. -static inline size_t sk_negate_to_size_t(int32_t value) { -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4146) // Thanks MSVC, we know what we're negating an unsigned -#endif - return -static_cast<size_t>(value); -#if defined(_MSC_VER) -#pragma warning(pop) -#endif -} - /////////////////////////////////////////////////////////////////////////////// /** Return a*b/255, truncating away any fractional bits. Only valid if both |