Index: skia/ext/convolver.h |
=================================================================== |
--- skia/ext/convolver.h (revision 6142) |
+++ skia/ext/convolver.h (working copy) |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef BASE_GFX_CONVOLVER_H__ |
-#define BASE_GFX_CONVOLVER_H__ |
+#ifndef SKIA_EXT_CONVOLVER_H_ |
+#define SKIA_EXT_CONVOLVER_H_ |
#include <vector> |
@@ -14,7 +14,7 @@ |
#undef FloatToFixed |
#endif |
-namespace gfx { |
+namespace skia { |
// Represents a filter in one dimension. Each output pixel has one entry in this |
// object for the filter values contributing to it. You build up the filter |
@@ -131,7 +131,7 @@ |
const ConvolusionFilter1D& yfilter, |
uint8* output); |
-} // namespace gfx |
+} // namespace skia |
-#endif // BASE_GFX_CONVOLVER_H__ |
+#endif // SKIA_EXT_CONVOLVER_H_ |
Property changes on: skia\ext\convolver.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/gfx/convolver.h:r69-2775 |