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

Side by Side Diff: skia/ext/image_operations.cc

Issue 13080: Move convolver and image_operations from base/gfx to skia/ext. This is just... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 | « skia/ext/image_operations.h ('k') | skia/ext/image_operations_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.cc:r69-2775
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 #define _USE_MATH_DEFINES 5 #define _USE_MATH_DEFINES
6 #include <cmath> 6 #include <cmath>
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/gfx/image_operations.h" 10 #include "skia/ext/image_operations.h"
11 11
12 #include "base/gfx/convolver.h"
13 #include "base/gfx/rect.h" 12 #include "base/gfx/rect.h"
14 #include "base/gfx/size.h" 13 #include "base/gfx/size.h"
15 #include "base/logging.h" 14 #include "base/logging.h"
16 #include "base/stack_container.h" 15 #include "base/stack_container.h"
17 #include "SkBitmap.h" 16 #include "SkBitmap.h"
17 #include "skia/ext/convolver.h"
18 18
19 namespace gfx { 19 namespace gfx {
20 20
21 namespace { 21 namespace {
22 22
23 // Returns the ceiling/floor as an integer. 23 // Returns the ceiling/floor as an integer.
24 inline int CeilInt(float val) { 24 inline int CeilInt(float val) {
25 return static_cast<int>(ceil(val)); 25 return static_cast<int>(ceil(val));
26 } 26 }
27 inline int FloorInt(float val) { 27 inline int FloorInt(float val) {
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 353
354 dst_row[x] = SkColorSetARGB(a, r, g, b); 354 dst_row[x] = SkColorSetARGB(a, r, g, b);
355 } 355 }
356 } 356 }
357 357
358 return blended; 358 return blended;
359 } 359 }
360 360
361 } // namespace gfx 361 } // namespace gfx
362 362
OLDNEW
« no previous file with comments | « skia/ext/image_operations.h ('k') | skia/ext/image_operations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698