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 15 matching lines...) Expand all Loading... |
26 canvas->getClipBounds(&bounds); | 26 canvas->getClipBounds(&bounds); |
27 | 27 |
28 canvas->drawColor(SK_ColorWHITE); | 28 canvas->drawColor(SK_ColorWHITE); |
29 canvas->drawText(text, strlen(text), | 29 canvas->drawText(text, strlen(text), |
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 SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(w, h)); | 36 SkSurfaceProps props(0, kUnknown_SkPixelGeometry); |
| 37 SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(w, h, &props))
; |
37 doDraw(surface->getCanvas(), paint, text); | 38 doDraw(surface->getCanvas(), paint, text); |
38 | 39 |
39 SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); | 40 SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); |
40 SkAutoDataUnref data(image->encode()); | 41 SkAutoDataUnref data(image->encode()); |
41 if (NULL == data.get()) { | 42 if (NULL == data.get()) { |
42 return false; | 43 return false; |
43 } | 44 } |
44 SkFILEWStream stream(path); | 45 SkFILEWStream stream(path); |
45 return stream.write(data->data(), data->size()); | 46 return stream.write(data->data(), data->size()); |
46 } | 47 } |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 } | 102 } |
102 } | 103 } |
103 return 0; | 104 return 0; |
104 } | 105 } |
105 | 106 |
106 #if !defined SK_BUILD_FOR_IOS | 107 #if !defined SK_BUILD_FOR_IOS |
107 int main(int argc, char * const argv[]) { | 108 int main(int argc, char * const argv[]) { |
108 return tool_main(argc, (char**) argv); | 109 return tool_main(argc, (char**) argv); |
109 } | 110 } |
110 #endif | 111 #endif |
OLD | NEW |