aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/debugger/SkDrawCommand.cpp3
-rw-r--r--tools/fiddle/fiddle_main.cpp4
-rw-r--r--tools/get_images_from_skps.cpp2
-rw-r--r--tools/skdiff_main.cpp6
-rw-r--r--tools/skdiff_utils.cpp2
-rw-r--r--tools/skdiff_utils.h2
-rw-r--r--tools/skiaserve/Request.cpp10
-rw-r--r--tools/skiaserve/urlhandlers/BreakHandler.cpp3
-rw-r--r--tools/viewer/ImageSlide.cpp2
-rw-r--r--tools/visualize_color_gamut.cpp2
10 files changed, 17 insertions, 19 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index d77a554fa4..6ca3fe074e 100644
--- a/tools/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
@@ -707,11 +707,10 @@ bool SkDrawCommand::flatten(const SkImage& image, Json::Value* target,
SkDynamicMemoryWStream out;
SkDrawCommand::WritePNG((const png_bytep) encodedBitmap->bytes(), image.width(), image.height(),
out, false);
- SkData* encoded = out.copyToData();
+ sk_sp<SkData> encoded = out.detachAsData();
Json::Value jsonData;
encode_data(encoded->data(), encoded->size(), "image/png", urlDataManager, &jsonData);
(*target)[SKDEBUGCANVAS_ATTRIBUTE_DATA] = jsonData;
- encoded->unref();
return true;
}
diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp
index 0fa6158666..f83026f814 100644
--- a/tools/fiddle/fiddle_main.cpp
+++ b/tools/fiddle/fiddle_main.cpp
@@ -140,7 +140,7 @@ int main() {
srand(0);
draw(document->beginPage(options.size.width(), options.size.height()));
document->close();
- pdfData.reset(pdfStream.copyToData());
+ pdfData = pdfStream.detachAsData();
}
}
if (options.skp) {
@@ -152,7 +152,7 @@ int main() {
auto picture = recorder.finishRecordingAsPicture();
SkDynamicMemoryWStream skpStream;
picture->serialize(&skpStream);
- skpData.reset(skpStream.copyToData());
+ skpData = skpStream.detachAsData();
}
printf("{\n");
diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp
index f9ba34b0f2..1ec70b3531 100644
--- a/tools/get_images_from_skps.cpp
+++ b/tools/get_images_from_skps.cpp
@@ -54,7 +54,7 @@ struct Sniffer : public SkPixelSerializer {
gSeen.add(digest);
sk_sp<SkData> data(SkData::MakeWithoutCopy(ptr, len));
- SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data.get()));
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data));
if (!codec) {
// FIXME: This code is currently unreachable because we create an empty generator when
// we fail to create a codec.
diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index 0c60677c58..ef58b1bfc5 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@@ -345,7 +345,7 @@ static void get_bounds(DiffResource& resource, const char* name) {
if (resource.fBitmap.empty() && !DiffResource::isStatusFailed(resource.fStatus)) {
sk_sp<SkData> fileBits(read_file(resource.fFullPath.c_str()));
if (fileBits) {
- get_bitmap(fileBits.get(), resource, true);
+ get_bitmap(fileBits, resource, true);
} else {
SkDebugf("WARNING: couldn't read %s file <%s>\n", name, resource.fFullPath.c_str());
resource.fStatus = DiffResource::kCouldNotRead_Status;
@@ -496,8 +496,8 @@ static void create_diff_images (DiffMetricProc dmp,
VERBOSE_STATUS("MATCH", ANSI_COLOR_GREEN, baseFiles[i]);
} else {
AutoReleasePixels arp(drp);
- get_bitmap(baseFileBits.get(), drp->fBase, false);
- get_bitmap(comparisonFileBits.get(), drp->fComparison, false);
+ get_bitmap(baseFileBits, drp->fBase, false);
+ get_bitmap(comparisonFileBits, drp->fComparison, false);
VERBOSE_STATUS("DIFFERENT", ANSI_COLOR_RED, baseFiles[i]);
if (DiffResource::kDecoded_Status == drp->fBase.fStatus &&
DiffResource::kDecoded_Status == drp->fComparison.fStatus) {
diff --git a/tools/skdiff_utils.cpp b/tools/skdiff_utils.cpp
index 3a37733682..609d75d265 100644
--- a/tools/skdiff_utils.cpp
+++ b/tools/skdiff_utils.cpp
@@ -33,7 +33,7 @@ sk_sp<SkData> read_file(const char* file_path) {
return data;
}
-bool get_bitmap(SkData* fileBits, DiffResource& resource, bool sizeOnly) {
+bool get_bitmap(sk_sp<SkData> fileBits, DiffResource& resource, bool sizeOnly) {
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fileBits));
if (!codec) {
SkDebugf("ERROR: could not create codec for <%s>\n", resource.fFullPath.c_str());
diff --git a/tools/skdiff_utils.h b/tools/skdiff_utils.h
index c535ae26b5..c799325e36 100644
--- a/tools/skdiff_utils.h
+++ b/tools/skdiff_utils.h
@@ -25,7 +25,7 @@ bool are_buffers_equal(SkData* skdata1, SkData* skdata2);
sk_sp<SkData> read_file(const char* file_path);
/** Decodes the fileBits into the resource.fBitmap. Returns false on failure. */
-bool get_bitmap(SkData* fileBits, DiffResource& resource, bool sizeOnly);
+bool get_bitmap(sk_sp<SkData> fileBits, DiffResource& resource, bool sizeOnly);
/** Writes the bitmap as a PNG to the path specified. */
bool write_bitmap(const SkString& path, const SkBitmap& bitmap);
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 22fa211abc..ea2d17afb9 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -65,7 +65,7 @@ sk_sp<SkData> Request::writeCanvasToPng(SkCanvas* canvas) {
SkDynamicMemoryWStream buffer;
SkDrawCommand::WritePNG((const png_bytep) encodedBitmap->bytes(), bmp->width(), bmp->height(),
buffer, true);
- return sk_sp<SkData>(buffer.copyToData());
+ return buffer.detachAsData();
}
SkCanvas* Request::getCanvas() {
@@ -117,7 +117,7 @@ sk_sp<SkData> Request::writeOutSkp() {
SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
picture->serialize(&outStream, serializer);
- return sk_sp<SkData>(outStream.copyToData());
+ return outStream.detachAsData();
}
GrContext* Request::getContext() {
@@ -257,7 +257,7 @@ sk_sp<SkData> Request::getJsonOps(int n) {
SkDynamicMemoryWStream stream;
stream.writeText(Json::FastWriter().write(root).c_str());
- return sk_sp<SkData>(stream.copyToData());
+ return stream.detachAsData();
}
sk_sp<SkData> Request::getJsonBatchList(int n) {
@@ -269,7 +269,7 @@ sk_sp<SkData> Request::getJsonBatchList(int n) {
SkDynamicMemoryWStream stream;
stream.writeText(Json::FastWriter().write(result).c_str());
- return sk_sp<SkData>(stream.copyToData());
+ return stream.detachAsData();
}
sk_sp<SkData> Request::getJsonInfo(int n) {
@@ -301,7 +301,7 @@ SkColor Request::getPixel(int x, int y) {
// Convert to format suitable for inspection
sk_sp<SkData> encodedBitmap = sk_tools::encode_bitmap_for_png(*bitmap);
- SkASSERT(encodedBitmap.get());
+ SkASSERT(encodedBitmap);
const uint8_t* start = encodedBitmap->bytes() + ((y * bitmap->width() + x) * 4);
SkColor result = SkColorSetARGB(start[3], start[0], start[1], start[2]);
diff --git a/tools/skiaserve/urlhandlers/BreakHandler.cpp b/tools/skiaserve/urlhandlers/BreakHandler.cpp
index 7766adb021..f4f741fe34 100644
--- a/tools/skiaserve/urlhandlers/BreakHandler.cpp
+++ b/tools/skiaserve/urlhandlers/BreakHandler.cpp
@@ -80,6 +80,5 @@ int BreakHandler::handle(Request* request, MHD_Connection* connection,
canvas->restoreToCount(saveCount);
SkDynamicMemoryWStream stream;
stream.writeText(Json::FastWriter().write(response).c_str());
- sk_sp<SkData> data(stream.copyToData());
- return SendData(connection, data.get(), "application/json");
+ return SendData(connection, stream.detachAsData().get(), "application/json");
}
diff --git a/tools/viewer/ImageSlide.cpp b/tools/viewer/ImageSlide.cpp
index 7dcee5d5ac..78fb17b4b0 100644
--- a/tools/viewer/ImageSlide.cpp
+++ b/tools/viewer/ImageSlide.cpp
@@ -37,7 +37,7 @@ void ImageSlide::draw(SkCanvas* canvas) {
void ImageSlide::load(SkScalar, SkScalar) {
sk_sp<SkData> encoded = SkData::MakeFromFileName(fPath.c_str());
- SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded.get()));
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
if (!codec) {
return;
}
diff --git a/tools/visualize_color_gamut.cpp b/tools/visualize_color_gamut.cpp
index cc15601b7d..1bacf5f179 100644
--- a/tools/visualize_color_gamut.cpp
+++ b/tools/visualize_color_gamut.cpp
@@ -124,7 +124,7 @@ int main(int argc, char** argv) {
SkDebugf("Cannot find input image.\n");
return -1;
}
- SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data.get()));
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data));
if (!codec) {
SkDebugf("Invalid input image.\n");
return -1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 08:32:38 +0000