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

Unified Diff: skia/ext/image_operations.cc

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/image_operations.h ('k') | skia/ext/image_operations_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/image_operations.cc
===================================================================
--- skia/ext/image_operations.cc (revision 6142)
+++ skia/ext/image_operations.cc (working copy)
@@ -7,17 +7,21 @@
#include <limits>
#include <vector>
-#include "base/gfx/image_operations.h"
+#include "skia/ext/image_operations.h"
-#include "base/gfx/convolver.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
#include "base/logging.h"
#include "base/stack_container.h"
+#include "skia/ext/convolver.h"
#include "SkBitmap.h"
-namespace gfx {
+// TODO(brettw) this should be removed when the base/gfx dependencies are
+// removed.
+using namespace gfx;
+namespace skia {
+
namespace {
// Returns the ceiling/floor as an integer.
@@ -113,7 +117,7 @@
case ImageOperations::RESIZE_BOX:
return EvalBox(pos);
case ImageOperations::RESIZE_LANCZOS3:
- return EvalLanczos(3, pos);
+ return EvalLanczos(2, pos);
default:
NOTREACHED();
return 0;
@@ -358,5 +362,5 @@
return blended;
}
-} // namespace gfx
+} // namespace skia
Property changes on: skia\ext\image_operations.cc
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.cc:r69-2775
« 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