diff options
author | reed <reed@chromium.org> | 2014-07-12 13:16:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-07-12 13:16:10 -0700 |
commit | 651eaeadeb0b1407f5fe192aeda90db1680fa2b8 (patch) | |
tree | 2c1a2fbcb6f416e6f8899165c1373a0034daf2c9 /include/core/SkBitmap.h | |
parent | debba5c3d091159149f8a88ab5dcd44dd72e0dc7 (diff) |
Revert of Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels (https://codereview.chromium.org/388803007/)
Reason for revert:
still failing (randomly?) bench sometimes. need stack dump to diagnose.
Original issue's description:
> Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels
> usning it.
>
> Revert "Revert of add readPixels() to SkBitmap (https://codereview.chromium.org/377303002/)"
>
> This reverts commit d08cb905a7cc80d8fb868bbd14fffe1cd68adcce.
>
> TBR=scroggo@google.com
>
> Committed: https://skia.googlesource.com/skia/+/debba5c3d091159149f8a88ab5dcd44dd72e0dc7
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/382543005
Diffstat (limited to 'include/core/SkBitmap.h')
-rw-r--r-- | include/core/SkBitmap.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 541db79bb3..51e9a9243a 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -591,28 +591,6 @@ public: } /** - * Copy the bitmap's pixels into the specified buffer (pixels + rowBytes), - * converting them into the requested format (SkImageInfo). The src pixels are read - * starting at the specified (srcX,srcY) offset, relative to the top-left corner. - * - * The specified ImageInfo and (srcX,srcY) offset specifies a source rectangle - * - * srcR.setXYWH(srcX, srcY, dstInfo.width(), dstInfo.height()); - * - * srcR is intersected with the bounds of the bitmap. If this intersection is not empty, - * then we have two sets of pixels (of equal size). Replace the dst pixels with the - * corresponding src pixels, performing any colortype/alphatype transformations needed - * (in the case where the src and dst have different colortypes or alphatypes). - * - * This call can fail, returning false, for several reasons: - * - If srcR does not intersect the bitmap bounds. - * - If the requested colortype/alphatype cannot be converted from the src's types. - * - If the src pixels are not available. - */ - bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes, - int srcX, int srcY) const; - - /** * Returns true if this bitmap's pixels can be converted into the requested * colorType, such that copyTo() could succeed. */ |