aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage_Raster.cpp
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-01-19 11:32:06 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-19 17:08:13 +0000
commit59a1df225d1229f7aedd58cab4337892e390574e (patch)
treefc290bd338cd60a16d8b3adfbf71bdb521bfb5b2 /src/image/SkImage_Raster.cpp
parent440f8382b009c9af12da567119566113a89ec935 (diff)
Delete SkColorSpaceXformImageGenerator and SkImagePriv::SkMakeImageInColorSpace
These don't seem to be used by anyone anymore so lets kill them. Bug: skia: Change-Id: I7908a9c9357e9e3b3166af9a14899dab522c3f11 Reviewed-on: https://skia-review.googlesource.com/97144 Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
-rw-r--r--src/image/SkImage_Raster.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index e803ce44e4..1e3d6fea16 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -10,7 +10,6 @@
#include "SkBitmapProcShader.h"
#include "SkCanvas.h"
#include "SkColorSpaceXform_Base.h"
-#include "SkColorSpaceXformImageGenerator.h"
#include "SkColorSpaceXformPriv.h"
#include "SkColorTable.h"
#include "SkConvertPixels.h"
@@ -324,35 +323,6 @@ sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap& bm, SkCopyPixelsMode
return SkMakeImageFromRasterBitmapPriv(bm, cpm, kNeedNewImageUniqueID);
}
-sk_sp<SkImage> SkMakeImageInColorSpace(const SkBitmap& bm, sk_sp<SkColorSpace> dstCS, uint32_t id,
- SkCopyPixelsMode cpm) {
- if (!SkImageInfoIsValidAllowNumericalCS(bm.info()) || !bm.getPixels() ||
- bm.rowBytes() < bm.info().minRowBytes() || !dstCS) {
- return nullptr;
- }
-
- sk_sp<SkColorSpace> srcCS = bm.info().refColorSpace();
- if (!srcCS) {
- // Treat nullptr as sRGB.
- srcCS = SkColorSpace::MakeSRGB();
- }
-
- sk_sp<SkImage> image = nullptr;
-
- // For the Android use case, this is very likely to be true.
- if (SkColorSpace::Equals(srcCS.get(), dstCS.get())) {
- SkASSERT(kNeedNewImageUniqueID == id || bm.getGenerationID() == id);
- image = SkMakeImageFromRasterBitmapPriv(bm, cpm, id);
- } else {
- image = SkImage::MakeFromGenerator(SkColorSpaceXformImageGenerator::Make(bm, dstCS, cpm,
- id));
- }
-
- // If the caller suplied an id, we must propagate that to the image we return
- SkASSERT(kNeedNewImageUniqueID == id || image->uniqueID() == id);
- return image;
-}
-
const SkPixelRef* SkBitmapImageGetPixelRef(const SkImage* image) {
return ((const SkImage_Raster*)image)->getPixelRef();
}