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

Side by Side Diff: src/gpu/GrSurface.cpp

Issue 108723003: Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix warnings, update SkImageRef_ashmem Created 7 years 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/effects/gradients/SkGradientShader.cpp ('k') | src/gpu/SkGpuDevice.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 "GrSurface.h" 8 #include "GrSurface.h"
9 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkGr.h"
11 #include "SkImageEncoder.h" 12 #include "SkImageEncoder.h"
12 #include <stdio.h> 13 #include <stdio.h>
13 14
15 void GrSurface::asImageInfo(SkImageInfo* info) const {
16 if (!GrPixelConfig2ColorType(this->config(), &info->fColorType)) {
17 sk_throw();
18 }
19 info->fWidth = this->width();
20 info->fHeight = this->height();
21 info->fAlphaType = kPremul_SkAlphaType;
22 }
23
14 bool GrSurface::savePixels(const char* filename) { 24 bool GrSurface::savePixels(const char* filename) {
15 SkBitmap bm; 25 SkBitmap bm;
16 bm.setConfig(SkBitmap::kARGB_8888_Config, this->width(), this->height()); 26 bm.setConfig(SkBitmap::kARGB_8888_Config, this->width(), this->height());
17 bm.allocPixels(); 27 bm.allocPixels();
18 28
19 bool result = readPixels(0, 0, this->width(), this->height(), kSkia8888_GrPi xelConfig, 29 bool result = readPixels(0, 0, this->width(), this->height(), kSkia8888_GrPi xelConfig,
20 bm.getPixels()); 30 bm.getPixels());
21 if (!result) { 31 if (!result) {
22 SkDebugf("------ failed to read pixels for %s\n", filename); 32 SkDebugf("------ failed to read pixels for %s\n", filename);
23 return false; 33 return false;
24 } 34 }
25 35
26 // remove any previous version of this file 36 // remove any previous version of this file
27 remove(filename); 37 remove(filename);
28 38
29 if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100 )) { 39 if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100 )) {
30 SkDebugf("------ failed to encode %s\n", filename); 40 SkDebugf("------ failed to encode %s\n", filename);
31 remove(filename); // remove any partial file 41 remove(filename); // remove any partial file
32 return false; 42 return false;
33 } 43 }
34 44
35 return true; 45 return true;
36 } 46 }
OLDNEW
« no previous file with comments | « src/effects/gradients/SkGradientShader.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698