Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: src/image/SkImage_Raster.cpp

Issue 15002004: add encodeData() to SkImageEncoder, and add encoding to SkImage (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/image/SkImage_Gpu.cpp ('k') | src/images/SkImageEncoder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "SkImage_Base.h" 8 #include "SkImage_Base.h"
9 #include "SkImagePriv.h" 9 #include "SkImagePriv.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 return true; 49 return true;
50 } 50 }
51 51
52 static SkImage* NewEmpty(); 52 static SkImage* NewEmpty();
53 53
54 SkImage_Raster(const SkImage::Info&, SkData*, size_t rb); 54 SkImage_Raster(const SkImage::Info&, SkData*, size_t rb);
55 virtual ~SkImage_Raster(); 55 virtual ~SkImage_Raster();
56 56
57 virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRI DE; 57 virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRI DE;
58 virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
58 59
59 // exposed for SkSurface_Raster via SkNewImageFromPixelRef 60 // exposed for SkSurface_Raster via SkNewImageFromPixelRef
60 SkImage_Raster(const SkImage::Info&, SkPixelRef*, size_t rowBytes); 61 SkImage_Raster(const SkImage::Info&, SkPixelRef*, size_t rowBytes);
61 62
62 SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } 63 SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
63 64
64 private: 65 private:
65 SkImage_Raster() : INHERITED(0, 0) {} 66 SkImage_Raster() : INHERITED(0, 0) {}
66 67
67 SkBitmap fBitmap; 68 SkBitmap fBitmap;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 fBitmap.setPixelRef(pr); 102 fBitmap.setPixelRef(pr);
102 fBitmap.setIsOpaque(isOpaque); 103 fBitmap.setIsOpaque(isOpaque);
103 } 104 }
104 105
105 SkImage_Raster::~SkImage_Raster() {} 106 SkImage_Raster::~SkImage_Raster() {}
106 107
107 void SkImage_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPa int* paint) { 108 void SkImage_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPa int* paint) {
108 canvas->drawBitmap(fBitmap, x, y, paint); 109 canvas->drawBitmap(fBitmap, x, y, paint);
109 } 110 }
110 111
112 bool SkImage_Raster::getROPixels(SkBitmap* dst) const {
113 *dst = fBitmap;
114 return true;
115 }
116
111 /////////////////////////////////////////////////////////////////////////////// 117 ///////////////////////////////////////////////////////////////////////////////
112 118
113 SkImage* SkImage::NewRasterCopy(const SkImage::Info& info, const void* pixels, s ize_t rowBytes) { 119 SkImage* SkImage::NewRasterCopy(const SkImage::Info& info, const void* pixels, s ize_t rowBytes) {
114 if (!SkImage_Raster::ValidArgs(info, rowBytes)) { 120 if (!SkImage_Raster::ValidArgs(info, rowBytes)) {
115 return NULL; 121 return NULL;
116 } 122 }
117 if (0 == info.fWidth && 0 == info.fHeight) { 123 if (0 == info.fWidth && 0 == info.fHeight) {
118 return SkImage_Raster::NewEmpty(); 124 return SkImage_Raster::NewEmpty();
119 } 125 }
120 // check this after empty-check 126 // check this after empty-check
(...skipping 30 matching lines...) Expand all
151 } 157 }
152 158
153 SkImage* SkNewImageFromPixelRef(const SkImage::Info& info, SkPixelRef* pr, 159 SkImage* SkNewImageFromPixelRef(const SkImage::Info& info, SkPixelRef* pr,
154 size_t rowBytes) { 160 size_t rowBytes) {
155 return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes)); 161 return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
156 } 162 }
157 163
158 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) { 164 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
159 return ((SkImage_Raster*)image)->getPixelRef(); 165 return ((SkImage_Raster*)image)->getPixelRef();
160 } 166 }
OLDNEW
« no previous file with comments | « src/image/SkImage_Gpu.cpp ('k') | src/images/SkImageEncoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698