SkData::MakeFromFD to pass size to release proc.
authorBen Wagner <bungeman@google.com>
Fri, 17 Mar 2017 21:52:22 +0000 (17:52 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 20 Mar 2017 14:27:33 +0000 (14:27 +0000)
6b7f34e34cc0ce397ce5e4ddc0c244f372b4f840
"simplify release-proc for SkData, removing unneeded size param"
updated SkData::MakeFromFILE to pass the size of the mmap to the
release proc, but did not update SkData::MakeFromFD.

Change-Id: I093fff78f06818a946053df7158302664edfee0e
Reviewed-on: https://skia-review.googlesource.com/9876
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/core/SkData.cpp

index 57e6a67..84b60be 100644 (file)
@@ -143,8 +143,7 @@ sk_sp<SkData> SkData::MakeFromFD(int fd) {
     if (nullptr == addr) {
         return nullptr;
     }
-
-    return SkData::MakeWithProc(addr, size, sk_mmap_releaseproc, nullptr);
+    return SkData::MakeWithProc(addr, size, sk_mmap_releaseproc, reinterpret_cast<void*>(size));
 }
 
 // assumes context is a SkData