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

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

Issue 19729007: Add SkImage->draw() call with src and dst rects. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 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
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 "SkImageDecoder.h" 8 #include "SkImageDecoder.h"
9 #include "SkImage_Base.h" 9 #include "SkImage_Base.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkCanvas.h" 11 #include "SkCanvas.h"
12 #include "SkData.h" 12 #include "SkData.h"
13 13
14 class SkImage_Codec : public SkImage_Base { 14 class SkImage_Codec : public SkImage_Base {
15 public: 15 public:
16 static SkImage* NewEmpty(); 16 static SkImage* NewEmpty();
17 17
18 SkImage_Codec(SkData* encodedData, int width, int height); 18 SkImage_Codec(SkData* encodedData, int width, int height);
19 virtual ~SkImage_Codec(); 19 virtual ~SkImage_Codec();
20 20
21 virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRI DE; 21 virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRI DE;
22 virtual void onDraw(SkCanvas*, SkRect, SkRect, const SkPaint*) SK_OVERRIDE;
22 23
23 private: 24 private:
24 SkData* fEncodedData; 25 SkData* fEncodedData;
25 SkBitmap fBitmap; 26 SkBitmap fBitmap;
26 27
27 typedef SkImage_Base INHERITED; 28 typedef SkImage_Base INHERITED;
28 }; 29 };
29 30
30 /////////////////////////////////////////////////////////////////////////////// 31 ///////////////////////////////////////////////////////////////////////////////
31 32
32 SkImage_Codec::SkImage_Codec(SkData* data, int width, int height) : INHERITED(wi dth, height) { 33 SkImage_Codec::SkImage_Codec(SkData* data, int width, int height) : INHERITED(wi dth, height) {
33 fEncodedData = data; 34 fEncodedData = data;
34 fEncodedData->ref(); 35 fEncodedData->ref();
35 } 36 }
36 37
37 SkImage_Codec::~SkImage_Codec() { 38 SkImage_Codec::~SkImage_Codec() {
38 fEncodedData->unref(); 39 fEncodedData->unref();
39 } 40 }
40 41
41 void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPai nt* paint) { 42 void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPai nt* paint) {
42 if (!fBitmap.pixelRef()) { 43 if (!fBitmap.pixelRef()) {
43 if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->s ize(), 44 if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->s ize(),
44 &fBitmap)) { 45 &fBitmap)) {
45 return; 46 return;
46 } 47 }
47 } 48 }
48 canvas->drawBitmap(fBitmap, x, y, paint); 49 canvas->drawBitmap(fBitmap, x, y, paint);
49 } 50 }
50 51
52 void SkImage_Codec::onDraw(SkCanvas* canvas, SkRect src, SkRect dst, const SkPai nt* paint) {
Justin Novosad 2013/07/18 21:54:37 Test or leave unimplemented
53 if (!fBitmap.pixelRef()) {
54 if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->s ize(),
55 &fBitmap)) {
56 return;
57 }
58 }
59 canvas->drawBitmapRectToRect(fBitmap, &src, dst, paint);
60 }
61
51 /////////////////////////////////////////////////////////////////////////////// 62 ///////////////////////////////////////////////////////////////////////////////
52 63
53 SkImage* SkImage::NewEncodedData(SkData* data) { 64 SkImage* SkImage::NewEncodedData(SkData* data) {
54 if (NULL == data) { 65 if (NULL == data) {
55 return NULL; 66 return NULL;
56 } 67 }
57 68
58 SkBitmap bitmap; 69 SkBitmap bitmap;
59 if (!SkImageDecoder::DecodeMemory(data->bytes(), data->size(), &bitmap, 70 if (!SkImageDecoder::DecodeMemory(data->bytes(), data->size(), &bitmap,
60 SkBitmap::kNo_Config, 71 SkBitmap::kNo_Config,
61 SkImageDecoder::kDecodeBounds_Mode)) { 72 SkImageDecoder::kDecodeBounds_Mode)) {
62 return NULL; 73 return NULL;
63 } 74 }
64 75
65 return SkNEW_ARGS(SkImage_Codec, (data, bitmap.width(), bitmap.height())); 76 return SkNEW_ARGS(SkImage_Codec, (data, bitmap.width(), bitmap.height()));
66 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698