diff options
author | Mike Reed <reed@google.com> | 2017-10-17 14:29:36 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-17 14:29:43 +0000 |
commit | dd340146f1fe7414702d6fea251da989d425691e (patch) | |
tree | ef78f1bae61b2108d9c053f396cf5e767d0e127d /src/core/SkPixmapPriv.h | |
parent | 5be3a8e061c951dabd94ce7100ca551a16dbe012 (diff) |
Revert "Revert "Revert "apply codec origin in generator"""
This reverts commit 82269abfec798621c8dbbc6bd48996c0b2686f41.
Reason for revert: ios build needs include path for SkCodec.h
Original change's description:
> Revert "Revert "apply codec origin in generator""
>
> This reverts commit 363dd988a55c2ed3fa92e2368c1c889101425734.
>
> Reason for revert: pdfium fix landed
>
> Original change's description:
> > Revert "apply codec origin in generator"
> >
> > This reverts commit fa15877f487333bec876e7315cf584c0d598d098.
> >
> > Reason for revert: Appears to break PDFium.
> >
> > Original change's description:
> > > apply codec origin in generator
> > >
> > > Bug: skia:
> > > Change-Id: I383dacb49b1e3c88467ccdbf3288764bb1bbf01a
> > > Reviewed-on: https://skia-review.googlesource.com/58600
> > > Reviewed-by: Leon Scroggins <scroggo@google.com>
> > > Commit-Queue: Mike Reed <reed@google.com>
> >
> > TBR=scroggo@google.com,reed@google.com
> >
> > Change-Id: Id97137d6ec39ca638c941928bae6510814b1c499
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/60041
> > Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> > Commit-Queue: Ben Wagner <benjaminwagner@google.com>
>
> TBR=benjaminwagner@google.com,scroggo@google.com,reed@google.com
>
> Change-Id: I1b54a6e6e6cbda07f346ffbbc4977f9db705abcd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/60320
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=benjaminwagner@google.com,scroggo@google.com,reed@google.com
Change-Id: I4c2d310521d1a678b407d30b9fe3c261c49d67bc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/60560
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkPixmapPriv.h')
-rw-r--r-- | src/core/SkPixmapPriv.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/core/SkPixmapPriv.h b/src/core/SkPixmapPriv.h deleted file mode 100644 index dfc9ce2dd0..0000000000 --- a/src/core/SkPixmapPriv.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkPixmapPriv_DEFINED -#define SkPixmapPriv_DEFINED - -#include "SkPixmap.h" -#include "SkCodec.h" - -class SkPixmapPriv { -public: - // These flag are applied in this order (swap is applied last) - enum OrientFlags { - kMirrorX = 1 << 0, - kMirrorY = 1 << 1, - kSwapXY = 1 << 2, - }; - - static OrientFlags OriginToOrient(SkCodec::Origin); - - /** - * Copy the pixels in this pixmap into dst, applying the orientation transformations specified - * by the flags. If the inputs are invalid, this returns false and no copy is made. - */ - static bool Orient(const SkPixmap& dst, const SkPixmap& src, OrientFlags); -}; - -#endif - |