diff options
Diffstat (limited to 'include/core/SkImage.h')
| -rw-r--r-- | include/core/SkImage.h | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 290996e0a9..53ae04ecb2 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -193,21 +193,6 @@ public: */ bool peekPixels(SkPixmap* pixmap) const; -#ifdef SK_SUPPORT_LEGACY_PEEKPIXELS_PARMS - /** - * If the image has direct access to its pixels (i.e. they are in local - * RAM) return the (const) address of those pixels, and if not null, return - * the ImageInfo and rowBytes. The returned address is only valid while - * the image object is in scope. - * - * On failure, returns NULL and the info and rowBytes parameters are - * ignored. - * - * DEPRECATED -- use the SkPixmap variant instead - */ - const void* peekPixels(SkImageInfo* info, size_t* rowBytes) const; -#endif - /** * Some images have to perform preliminary work in preparation for drawing. This can be * decoding, uploading to a GPU, or other tasks. These happen automatically when an image @@ -434,40 +419,6 @@ public: */ bool isLazyGenerated() const; - -#ifdef SK_SUPPORT_LEGACY_IMAGEFACTORY - static SkImage* NewRasterCopy(const Info&, const void* pixels, size_t rowBytes, - SkColorTable* ctable = nullptr); - static SkImage* NewRasterData(const Info&, SkData* pixels, size_t rowBytes); - static SkImage* NewFromRaster(const Info&, const void* pixels, size_t rowBytes, - RasterReleaseProc, ReleaseContext); - static SkImage* NewFromBitmap(const SkBitmap&); - static SkImage* NewFromGenerator(SkImageGenerator*, const SkIRect* subset = nullptr); - static SkImage* NewFromEncoded(SkData* encoded, const SkIRect* subset = nullptr); - static SkImage* NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& desc) { - return NewFromTexture(ctx, desc, kPremul_SkAlphaType, nullptr, nullptr); - } - - static SkImage* NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& de, SkAlphaType at) { - return NewFromTexture(ctx, de, at, nullptr, nullptr); - } - static SkImage* NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType, - TextureReleaseProc, ReleaseContext); - static SkImage* NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, - SkAlphaType = kPremul_SkAlphaType); - static SkImage* NewFromYUVTexturesCopy(GrContext*, SkYUVColorSpace, - const GrBackendObject yuvTextureHandles[3], - const SkISize yuvSizes[3], - GrSurfaceOrigin); - static SkImage* NewFromPicture(const SkPicture*, const SkISize& dimensions, - const SkMatrix*, const SkPaint*); - static SkImage* NewTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted); - static SkImage* NewFromDeferredTextureImageData(GrContext*, const void*, SkBudgeted); - - SkImage* newSubset(const SkIRect& subset) const { return this->makeSubset(subset).release(); } - SkImage* newTextureImage(GrContext* ctx) const { return this->makeTextureImage(ctx).release(); } -#endif - protected: SkImage(int width, int height, uint32_t uniqueID); |