diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 12:00:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 12:00:30 +0000 |
| commit | 1121170477302e25ef2a020cf2092aa6b399b3ef (patch) | |
| tree | 8202440265569ad57c1aa3238f643be66b25506d /include/core/SkCanvas.h | |
| parent | 9b62aa156bcf1db6f11af9302bf8bb8ef2567142 (diff) | |
implement readPixels and writePixels natively, w/o using the (deprecated)
SkCanvas::Config8888 enum.
Revert "Revert "hide Config8888 entirely". Broke a bunch of builds."
This reverts commit 763277ba157fef0f651004bb98a189e9f1ac730b.
Needs chrome to remove the READPIXELS guard from skia's .gyp
Review URL: https://codereview.chromium.org/199733016
git-svn-id: http://skia.googlecode.com/svn/trunk@13931 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkCanvas.h')
| -rw-r--r-- | include/core/SkCanvas.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index f5d4fe63cf..0d8fd463fe 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -20,6 +20,12 @@ //#define SK_SUPPORT_LEGACY_READPIXELSCONFIG +#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG + #ifndef SK_SUPPORT_LEGACY_CONFIG8888 + #define SK_SUPPORT_LEGACY_CONFIG8888 + #endif +#endif + // if not defined, we always assume ClipToLayer for saveLayer() //#define SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG @@ -231,6 +237,7 @@ public: */ const void* peekPixels(SkImageInfo* info, size_t* rowBytes); +#ifdef SK_SUPPORT_LEGACY_CONFIG8888 /** * This enum can be used with read/writePixels to perform a pixel ops to or * from an 8888 config other than Skia's native config (SkPMColor). There @@ -265,6 +272,7 @@ public: kRGBA_Premul_Config8888, kRGBA_Unpremul_Config8888 }; +#endif #ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG /** |