| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" |
| 9 #include "SkCommandLineFlags.h" | 9 #include "SkCommandLineFlags.h" |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 bounds.centerX(), bounds.centerY(), | 30 bounds.centerX(), bounds.centerY(), |
| 31 paint); | 31 paint); |
| 32 } | 32 } |
| 33 | 33 |
| 34 static bool do_surface(int w, int h, const char path[], const char text[], | 34 static bool do_surface(int w, int h, const char path[], const char text[], |
| 35 const SkPaint& paint) { | 35 const SkPaint& paint) { |
| 36 SkSurfaceProps props(0, kUnknown_SkPixelGeometry); | 36 SkSurfaceProps props(0, kUnknown_SkPixelGeometry); |
| 37 SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(w, h, &props))
; | 37 SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(w, h, &props))
; |
| 38 doDraw(surface->getCanvas(), paint, text); | 38 doDraw(surface->getCanvas(), paint, text); |
| 39 | 39 |
| 40 SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); | 40 sk_sp<SkImage> image(surface->makeImageSnapshot()); |
| 41 SkAutoDataUnref data(image->encode()); | 41 SkAutoDataUnref data(image->encode()); |
| 42 if (nullptr == data.get()) { | 42 if (nullptr == data.get()) { |
| 43 return false; | 43 return false; |
| 44 } | 44 } |
| 45 SkFILEWStream stream(path); | 45 SkFILEWStream stream(path); |
| 46 return stream.write(data->data(), data->size()); | 46 return stream.write(data->data(), data->size()); |
| 47 } | 47 } |
| 48 | 48 |
| 49 static bool do_document(int w, int h, const char path[], const char text[], | 49 static bool do_document(int w, int h, const char path[], const char text[], |
| 50 const SkPaint& paint) { | 50 const SkPaint& paint) { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 } | 103 } |
| 104 return 0; | 104 return 0; |
| 105 } | 105 } |
| 106 | 106 |
| 107 #if !defined SK_BUILD_FOR_IOS | 107 #if !defined SK_BUILD_FOR_IOS |
| 108 int main(int argc, char * const argv[]) { | 108 int main(int argc, char * const argv[]) { |
| 109 return tool_main(argc, (char**) argv); | 109 return tool_main(argc, (char**) argv); |
| 110 } | 110 } |
| 111 #endif | 111 #endif |
| OLD | NEW |