aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage_Raster.cpp
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-05-15 16:06:12 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-15 22:04:23 +0000
commitcc45cc7c17a8317fba6adaf4a8ea5ebf047afd21 (patch)
treec1dd007b286d722cf837c9d17d5f6a45e79bddd3 /src/image/SkImage_Raster.cpp
parent6a0e54e47931a1d963fc1bbeed203752ae3afde4 (diff)
remove typedef Info
typedef SkImageInfo Info saves a little typing at the cost of obfuscating the parameter type. It's only used in a couple of places so remove it. The documentation catalog has gotten a bit stale, so update that as well. Docs-Preview: https://skia.org/?cl=128400 Bug: skia:6898 Change-Id: I621743a2b2d9a78d5f62742501eebf5f4327efa0 Reviewed-on: https://skia-review.googlesource.com/128400 Commit-Queue: Cary Clark <caryclark@skia.org> Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: Cary Clark <caryclark@skia.org> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
-rw-r--r--src/image/SkImage_Raster.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index cd9ada6bb5..f392a83b35 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -36,7 +36,7 @@ static bool is_not_subset(const SkBitmap& bm) {
class SkImage_Raster : public SkImage_Base {
public:
- static bool ValidArgs(const Info& info, size_t rowBytes, size_t* minSize) {
+ static bool ValidArgs(const SkImageInfo& info, size_t rowBytes, size_t* minSize) {
const int maxDimension = SK_MaxS32 >> 2;
if (info.width() <= 0 || info.height() <= 0) {
@@ -140,7 +140,8 @@ static void release_data(void* addr, void* context) {
data->unref();
}
-SkImage_Raster::SkImage_Raster(const Info& info, sk_sp<SkData> data, size_t rowBytes, uint32_t id)
+SkImage_Raster::SkImage_Raster(const SkImageInfo& info, sk_sp<SkData> data, size_t rowBytes,
+ uint32_t id)
: INHERITED(info.width(), info.height(), id)
{
void* addr = const_cast<void*>(data->data());