diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-11 12:44:43 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 18:55:34 +0000 |
| commit | 95e3c058ef633782f7549e9e1c2727d60dbc8ee5 (patch) | |
| tree | 4db526398bc87c48db4565a2046b9321b7e2ee10 /src/ports/SkImageEncoder_WIC.cpp | |
| parent | 000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8 (diff) | |
SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h
* SkAutoFree moved to SkTemplates.h (now implmented with unique_ptr).
* SkAutoMalloc and SkAutoSMalloc moved to SkAutoMalloc.h
* "SkAutoFree X(sk_malloc_throw(N));" --> "SkAutoMalloc X(N);"
Revert "Revert 'SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h'"
This reverts commit c456b73fef9589bbdc5eb83eaa83e53c357bb3da.
Change-Id: Ie2c1a17c20134b8ceab85a68b3ae3e61c24fbaab
Reviewed-on: https://skia-review.googlesource.com/6886
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/ports/SkImageEncoder_WIC.cpp')
| -rw-r--r-- | src/ports/SkImageEncoder_WIC.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp index 52f4599433..6bc8b5473e 100644 --- a/src/ports/SkImageEncoder_WIC.cpp +++ b/src/ports/SkImageEncoder_WIC.cpp @@ -28,14 +28,16 @@ #undef INT64_MAX #undef UINT64_MAX -#include <wincodec.h> #include "SkAutoCoInitialize.h" +#include "SkAutoMalloc.h" #include "SkBitmap.h" #include "SkImageEncoderPriv.h" #include "SkIStream.h" +#include "SkImageEncoder.h" #include "SkStream.h" #include "SkTScopedComPtr.h" #include "SkUnPreMultiply.h" +#include <wincodec.h> //All Windows SDKs back to XPSP2 export the CLSID_WICImagingFactory symbol. //In the Windows8 SDK the CLSID_WICImagingFactory symbol is still exported |