diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-18 23:32:05 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-18 23:32:05 +0000 |
| commit | b45c56e4b7e3d51c808b0d8694e13ea3b403ec6f (patch) | |
| tree | 8c7158031efde026e8d4e659b0e5abcdfcae709b /experimental | |
| parent | d281c9240c7bd51ce0c29c6d4de27819e359e1d1 (diff) | |
fix iOS build -- pass colortype, not config
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/170743002
git-svn-id: http://skia.googlecode.com/svn/trunk@13494 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/iOSSampleApp/Shared/SkUIView.mm | 4 | ||||
| -rw-r--r-- | experimental/iOSSampleApp/SkSampleUIView.mm | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/experimental/iOSSampleApp/Shared/SkUIView.mm b/experimental/iOSSampleApp/Shared/SkUIView.mm index 10b55183c3..904cb9c992 100644 --- a/experimental/iOSSampleApp/Shared/SkUIView.mm +++ b/experimental/iOSSampleApp/Shared/SkUIView.mm @@ -29,8 +29,8 @@ - (void)setUpWindow { if (NULL != fWind) { fWind->setVisibleP(true); - fWind->resize(self.frame.size.width, self.frame.size.height, - SkBitmap::kARGB_8888_Config); + fWind->resize(self.frame.size.width, self.frame.size.height, + kPMColor_SkColorType); } } diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm index a6d00f7b0e..7b90cb778d 100644 --- a/experimental/iOSSampleApp/SkSampleUIView.mm +++ b/experimental/iOSSampleApp/SkSampleUIView.mm @@ -1,7 +1,5 @@ #import "SkSampleUIView.h" -//#define SKWIND_CONFIG SkBitmap::kRGB_565_Config -#define SKWIND_CONFIG SkBitmap::kARGB_8888_Config #define SKGL_CONFIG kEAGLColorFormatRGB565 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 @@ -338,7 +336,8 @@ static FPSState gFPS; static char* kDummyArgv = const_cast<char*>("dummyExecutableName"); fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager); - fWind->resize(self.frame.size.width, self.frame.size.height, SKWIND_CONFIG); + fWind->resize(self.frame.size.width, self.frame.size.height, + kPMColor_SkColorType); } return self; } |