| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 #ifndef SkImage_DEFINED | 8 #ifndef SkImage_DEFINED |
| 9 #define SkImage_DEFINED | 9 #define SkImage_DEFINED |
| 10 | 10 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 void draw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const; | 116 void draw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const; |
| 117 | 117 |
| 118 /** | 118 /** |
| 119 * Draw the image, cropped to the src rect, to the dst rect of a canvas. | 119 * Draw the image, cropped to the src rect, to the dst rect of a canvas. |
| 120 * If src is larger than the bounds of the image, the rest of the image is | 120 * If src is larger than the bounds of the image, the rest of the image is |
| 121 * filled with transparent black pixels. | 121 * filled with transparent black pixels. |
| 122 * | 122 * |
| 123 * See SkCanvas::drawBitmapRectToRect for similar behavior. | 123 * See SkCanvas::drawBitmapRectToRect for similar behavior. |
| 124 */ | 124 */ |
| 125 void draw(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) c
onst; | 125 void drawRect(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint
*) const; |
| 126 | 126 |
| 127 /** | 127 /** |
| 128 * Return a copy of the image's pixels, limiting them to the subset | 128 * Return a copy of the image's pixels, limiting them to the subset |
| 129 * rectangle's intersection wit the image bounds. If subset is NULL, then | 129 * rectangle's intersection wit the image bounds. If subset is NULL, then |
| 130 * the entire image will be considered. | 130 * the entire image will be considered. |
| 131 * | 131 * |
| 132 * If the bitmap's pixels have already been allocated, then readPixels() | 132 * If the bitmap's pixels have already been allocated, then readPixels() |
| 133 * will succeed only if it can support converting the image's pixels into | 133 * will succeed only if it can support converting the image's pixels into |
| 134 * the bitmap's ColorType/AlphaType. Any pixels in the bitmap that do not | 134 * the bitmap's ColorType/AlphaType. Any pixels in the bitmap that do not |
| 135 * intersect with the image's bounds and the subset (if not null) will be | 135 * intersect with the image's bounds and the subset (if not null) will be |
| 136 * left untouched. | 136 * left untouched. |
| 137 * | 137 * |
| 138 * If the bitmap is initially empty/unallocated, then it will be allocated | 138 * If the bitmap is initially empty/unallocated, then it will be allocated |
| 139 * using the default allocator, and the ColorType/AlphaType will be chosen | 139 * using the default allocator, and the ColorType/AlphaType will be chosen |
| 140 * to most closely fit the image's configuration. | 140 * to most closely fit the image's configuration. |
| 141 * | 141 * |
| 142 * On failure, false will be returned, and bitmap will unmodified. | 142 * On failure, false will be returned, and bitmap will unmodified. |
| 143 */ | 143 */ |
| 144 // On ice for now: | 144 // On ice for now: |
| 145 // - should it respect the particular colortype/alphatype of the src | 145 // - should it respect the particular colortype/alphatype of the src |
| 146 // - should it have separate entrypoints for preallocated and not bitmaps? | 146 // - should it have separate entrypoints for preallocated and not bitmaps? |
| 147 // - isn't it enough to allow the caller to draw() the image into a canvas? | 147 // - isn't it enough to allow the caller to draw() the image into a canvas? |
| 148 bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const; | 148 bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const; |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 #endif | 151 #endif |
| OLD | NEW |