aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/codec/SkCodec.h5
-rw-r--r--include/core/SkBitmap.h4
-rw-r--r--include/core/SkImage.h5
-rw-r--r--include/core/SkPixmap.h2
-rw-r--r--include/encode/SkJpegEncoder.h2
-rw-r--r--include/encode/SkPngEncoder.h2
-rw-r--r--include/encode/SkWebpEncoder.h2
7 files changed, 11 insertions, 11 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index ae7286d576..c156efb052 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -252,7 +252,7 @@ public:
, fSubset(nullptr)
, fFrameIndex(0)
, fPriorFrame(kNone)
- , fPremulBehavior(SkTransferFunctionBehavior::kRespect)
+ , fPremulBehavior(SkTransferFunctionBehavior::kIgnore)
{}
ZeroInitialized fZeroInitialized;
@@ -803,8 +803,7 @@ protected:
virtual int onOutputScanline(int inputScanline) const;
- bool initializeColorXform(const SkImageInfo& dstInfo, SkEncodedInfo::Alpha,
- SkTransferFunctionBehavior premulBehavior);
+ bool initializeColorXform(const SkImageInfo& dstInfo, SkEncodedInfo::Alpha);
// Some classes never need a colorXform e.g.
// - ICO uses its embedded codec's colorXform
// - WBMP is just Black/White
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 758881aae3..bc29151a24 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -992,7 +992,7 @@ public:
bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
int srcX, int srcY) const {
return this->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY,
- SkTransferFunctionBehavior::kRespect);
+ SkTransferFunctionBehavior::kIgnore);
}
/** Copies a SkRect of pixels from SkBitmap to dst. Copy starts at (srcX, srcY), and
@@ -1074,7 +1074,7 @@ public:
@return true if src pixels are copied to SkBitmap
*/
bool writePixels(const SkPixmap& src, int dstX, int dstY) {
- return this->writePixels(src, dstX, dstY, SkTransferFunctionBehavior::kRespect);
+ return this->writePixels(src, dstX, dstY, SkTransferFunctionBehavior::kIgnore);
}
/** Copies a SkRect of pixels from src. Copy starts at (0, 0), and does not exceed
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 8957d11b61..f04dd45c78 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -877,8 +877,9 @@ public:
SkTransferFunctionBehavior::kIgnore
@return created SkImage in target SkColorSpace
*/
- sk_sp<SkImage> makeColorSpace(sk_sp<SkColorSpace> target,
- SkTransferFunctionBehavior premulBehavior) const;
+ sk_sp<SkImage> makeColorSpace(
+ sk_sp<SkColorSpace> target,
+ SkTransferFunctionBehavior premulBehavior = SkTransferFunctionBehavior::kIgnore) const;
private:
SkImage(int width, int height, uint32_t uniqueID);
diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h
index 5e417af2ed..d3e0097e70 100644
--- a/include/core/SkPixmap.h
+++ b/include/core/SkPixmap.h
@@ -616,7 +616,7 @@ public:
bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes, int srcX,
int srcY) const {
return this->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY,
- SkTransferFunctionBehavior::kRespect);
+ SkTransferFunctionBehavior::kIgnore);
}
/** Copies a SkRect of pixels to dst. Copy starts at (srcX, srcY), and does not
diff --git a/include/encode/SkJpegEncoder.h b/include/encode/SkJpegEncoder.h
index fd7c204161..ad3ccad21a 100644
--- a/include/encode/SkJpegEncoder.h
+++ b/include/encode/SkJpegEncoder.h
@@ -61,7 +61,7 @@ public:
* In the second case, the encoder supports linear or legacy blending.
*/
AlphaOption fAlphaOption = AlphaOption::kIgnore;
- SkTransferFunctionBehavior fBlendBehavior = SkTransferFunctionBehavior::kRespect;
+ SkTransferFunctionBehavior fBlendBehavior = SkTransferFunctionBehavior::kIgnore;
};
/**
diff --git a/include/encode/SkPngEncoder.h b/include/encode/SkPngEncoder.h
index 39e407e075..035da42fe7 100644
--- a/include/encode/SkPngEncoder.h
+++ b/include/encode/SkPngEncoder.h
@@ -58,7 +58,7 @@ public:
* The encoder can convert to linear before unpremultiplying or ignore the transfer
* function and unpremultiply the input as is.
*/
- SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
+ SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
/**
* Represents comments in the tEXt ancillary chunk of the png.
diff --git a/include/encode/SkWebpEncoder.h b/include/encode/SkWebpEncoder.h
index f671be379c..f7dca61278 100644
--- a/include/encode/SkWebpEncoder.h
+++ b/include/encode/SkWebpEncoder.h
@@ -40,7 +40,7 @@ namespace SkWebpEncoder {
* The encoder can convert to linear before unpremultiplying or ignore the transfer
* function and unpremultiply the input as is.
*/
- SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
+ SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
};
/**