diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-16 13:53:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-16 13:53:35 -0700 |
| commit | 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch) | |
| tree | d1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/codec/SkBmpCodec.cpp | |
| parent | 830dfd87a7707f687e13da5be645e75c746a2cf5 (diff) | |
detach -> release
The C++ standard library uses the name "release" for the operation we call "detach".
Rewriting each "detach(" to "release(" brings us a step closer to using standard library types directly (e.g. std::unique_ptr instead of SkAutoTDelete).
This was a fairly blind transformation. There may have been unintentional conversions in here, but it's probably for the best to have everything uniformly say "release".
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1809733002
Review URL: https://codereview.chromium.org/1809733002
Diffstat (limited to 'src/codec/SkBmpCodec.cpp')
| -rw-r--r-- | src/codec/SkBmpCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkBmpCodec.cpp b/src/codec/SkBmpCodec.cpp index 5616a650a6..32f1d15277 100644 --- a/src/codec/SkBmpCodec.cpp +++ b/src/codec/SkBmpCodec.cpp @@ -509,7 +509,7 @@ bool SkBmpCodec::ReadHeader(SkStream* stream, bool inIco, SkCodec** codecOut) { return false; } - *codecOut = new SkBmpMaskCodec(imageInfo, stream, bitsPerPixel, masks.detach(), + *codecOut = new SkBmpMaskCodec(imageInfo, stream, bitsPerPixel, masks.release(), rowOrder); return true; case kRLE_BmpInputFormat: @@ -541,7 +541,7 @@ SkCodec* SkBmpCodec::NewFromStream(SkStream* stream, bool inIco) { // codec has taken ownership of stream, so we do not need to // delete it. SkASSERT(codec); - streamDeleter.detach(); + streamDeleter.release(); return codec; } return nullptr; |