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

Side by Side Diff: tests/BitmapTest.cpp

Issue 308683005: setConfig -> setInfo (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: missed one setConfig (release only) Created 6 years, 6 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 | « tests/BitmapCopyTest.cpp ('k') | tests/CanvasTest.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 2013 Google Inc. 2 * Copyright 2013 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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 9
10 #include "Test.h" 10 #include "Test.h"
11 11
12 static void test_bigwidth(skiatest::Reporter* reporter) { 12 static void test_bigwidth(skiatest::Reporter* reporter) {
13 SkBitmap bm; 13 SkBitmap bm;
14 int width = 1 << 29; // *4 will be the high-bit of 32bit int 14 int width = 1 << 29; // *4 will be the high-bit of 32bit int
15 15
16 SkImageInfo info = SkImageInfo::Make(width, 1, kAlpha_8_SkColorType, 16 SkImageInfo info = SkImageInfo::MakeA8(width, 1);
17 kPremul_SkAlphaType); 17 REPORTER_ASSERT(reporter, bm.setInfo(info));
18 REPORTER_ASSERT(reporter, bm.setConfig(info));
19 info.fColorType = kRGB_565_SkColorType; 18 info.fColorType = kRGB_565_SkColorType;
20 REPORTER_ASSERT(reporter, bm.setConfig(info)); 19 REPORTER_ASSERT(reporter, bm.setInfo(info));
21 20
22 // for a 4-byte config, this width will compute a rowbytes of 0x80000000, 21 // for a 4-byte config, this width will compute a rowbytes of 0x80000000,
23 // which does not fit in a int32_t. setConfig should detect this, and fail. 22 // which does not fit in a int32_t. setConfig should detect this, and fail.
24 23
25 // TODO: perhaps skia can relax this, and only require that rowBytes fit 24 // TODO: perhaps skia can relax this, and only require that rowBytes fit
26 // in a uint32_t (or larger), but for now this is the constraint. 25 // in a uint32_t (or larger), but for now this is the constraint.
27 26
28 info.fColorType = kN32_SkColorType; 27 info.fColorType = kN32_SkColorType;
29 REPORTER_ASSERT(reporter, !bm.setConfig(info)); 28 REPORTER_ASSERT(reporter, !bm.setInfo(info));
30 } 29 }
31 30
32 /** 31 /**
33 * This test contains basic sanity checks concerning bitmaps. 32 * This test contains basic sanity checks concerning bitmaps.
34 */ 33 */
35 DEF_TEST(Bitmap, reporter) { 34 DEF_TEST(Bitmap, reporter) {
36 // Zero-sized bitmaps are allowed 35 // Zero-sized bitmaps are allowed
37 for (int width = 0; width < 2; ++width) { 36 for (int width = 0; width < 2; ++width) {
38 for (int height = 0; height < 2; ++height) { 37 for (int height = 0; height < 2; ++height) {
39 SkBitmap bm; 38 SkBitmap bm;
40 bool setConf = bm.setConfig(SkImageInfo::MakeN32Premul(width, 39 bool setConf = bm.setInfo(SkImageInfo::MakeN32Premul(width, height)) ;
41 height));
42 REPORTER_ASSERT(reporter, setConf); 40 REPORTER_ASSERT(reporter, setConf);
43 if (setConf) { 41 if (setConf) {
44 REPORTER_ASSERT(reporter, bm.allocPixels(NULL)); 42 REPORTER_ASSERT(reporter, bm.allocPixels(NULL));
45 } 43 }
46 REPORTER_ASSERT(reporter, SkToBool(width & height) != bm.empty()); 44 REPORTER_ASSERT(reporter, SkToBool(width & height) != bm.empty());
47 } 45 }
48 } 46 }
49 47
50 test_bigwidth(reporter); 48 test_bigwidth(reporter);
51 } 49 }
OLDNEW
« no previous file with comments | « tests/BitmapCopyTest.cpp ('k') | tests/CanvasTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698