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

Side by Side Diff: gm/testimagefilters.cpp

Issue 147683003: fix more 64bit warnings (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 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 | « gm/polygons.cpp ('k') | gm/typeface.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 2011 Google Inc. 2 * Copyright 2011 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 "gm.h" 8 #include "gm.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 make0, make1, make2, make3, make4, make5, make6, make7 110 make0, make1, make2, make3, make4, make5, make6, make7
111 }; 111 };
112 112
113 const SkRect bounds = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT); 113 const SkRect bounds = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT);
114 114
115 const SkScalar dx = bounds.width() * 8 / 7; 115 const SkScalar dx = bounds.width() * 8 / 7;
116 const SkScalar dy = bounds.height() * 8 / 7; 116 const SkScalar dy = bounds.height() * 8 / 7;
117 117
118 canvas->translate(SkIntToScalar(8), SkIntToScalar(8)); 118 canvas->translate(SkIntToScalar(8), SkIntToScalar(8));
119 119
120 for (size_t i = 0; i < SK_ARRAY_COUNT(gFilterProc); ++i) { 120 for (int i = 0; i < (int)SK_ARRAY_COUNT(gFilterProc); ++i) {
121 int ix = i % 4; 121 int ix = i % 4;
122 int iy = i / 4; 122 int iy = i / 4;
123 123
124 SkAutoCanvasRestore acr(canvas, true); 124 SkAutoCanvasRestore acr(canvas, true);
125 canvas->translate(ix * dx, iy * dy); 125 canvas->translate(ix * dx, iy * dy);
126 126
127 SkPaint p; 127 SkPaint p;
128 p.setStyle(SkPaint::kStroke_Style); 128 p.setStyle(SkPaint::kStroke_Style);
129 canvas->drawRect(bounds, p); 129 canvas->drawRect(bounds, p);
130 130
131 SkPaint paint; 131 SkPaint paint;
132 paint.setImageFilter(gFilterProc[i]())->unref(); 132 paint.setImageFilter(gFilterProc[i]())->unref();
133 canvas->saveLayer(&bounds, &paint); 133 canvas->saveLayer(&bounds, &paint);
134 draw0(canvas); 134 draw0(canvas);
135 } 135 }
136 } 136 }
137 137
138 private: 138 private:
139 typedef GM INHERITED; 139 typedef GM INHERITED;
140 }; 140 };
141 141
142 ////////////////////////////////////////////////////////////////////////////// 142 //////////////////////////////////////////////////////////////////////////////
143 143
144 static skiagm::GM* MyFactory(void*) { return new TestImageFiltersGM; } 144 static skiagm::GM* MyFactory(void*) { return new TestImageFiltersGM; }
145 static skiagm::GMRegistry reg(MyFactory); 145 static skiagm::GMRegistry reg(MyFactory);
OLDNEW
« no previous file with comments | « gm/polygons.cpp ('k') | gm/typeface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698