| Index: src/image/SkImagePriv.h
|
| diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h
|
| index e9d1d838991adfa08b1e565d614bec932645ce89..db3a089a355f69287563ce59ad0fdd2a54c5280e 100644
|
| --- a/src/image/SkImagePriv.h
|
| +++ b/src/image/SkImagePriv.h
|
| @@ -11,8 +11,8 @@
|
| #include "SkImage.h"
|
|
|
| // Call this if you explicitly want to use/share this pixelRef in the image
|
| -extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
|
| - size_t rowBytes);
|
| +extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*, size_t rowBytes,
|
| + const SkSurfaceProps*);
|
|
|
| /**
|
| * Examines the bitmap to decide if it can share the existing pixelRef, or
|
| @@ -24,7 +24,7 @@ extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
|
| * SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
|
| * NULL.
|
| */
|
| -extern SkImage* SkNewImageFromBitmap(const SkBitmap&, bool canSharePixelRef);
|
| +extern SkImage* SkNewImageFromBitmap(const SkBitmap&, bool canSharePixelRef, const SkSurfaceProps*);
|
|
|
| static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
|
| return SkAlign4(info.minRowBytes());
|
| @@ -45,4 +45,6 @@ extern GrTexture* SkTextureImageGetTexture(SkImage* textureImage);
|
| // surface needs to perform a copy-on-write
|
| extern void SkTextureImageSetTexture(SkImage* image, GrTexture* texture);
|
|
|
| +extern SkImage* SkNewImageFromBitmapTexture(const SkBitmap&, int sampleCount);
|
| +
|
| #endif
|
|
|