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/pdf/SkPDFFont.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/pdf/SkPDFFont.cpp')
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index 59bfc8f3f1..ac9843370f 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -267,7 +267,7 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen, uint8_t* const resultTrailer = &(buffer[SkToInt(*headerLen + outputOffset)]); memcpy(resultTrailer, src + *headerLen + hexDataLen, *trailerLen); - return SkData::NewFromMalloc(buffer.detach(), length); + return SkData::NewFromMalloc(buffer.release(), length); } return nullptr; } @@ -1077,7 +1077,7 @@ bool SkPDFCIDFont::addFontDescriptor(int16_t defaultWidth, SkASSERT(fontData); fontSize = fontData->getLength(); SkASSERT(fontSize > 0); - fontStream.reset(new SkPDFSharedStream(fontData.detach())); + fontStream.reset(new SkPDFSharedStream(fontData.release())); fontStream->dict()->insertInt("Length1", fontSize); descriptor->insertObjRef("FontFile2", std::move(fontStream)); break; |