AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove more unnamed namespace usages.

Browse Source 
Skia prefers 'static' over 'unnamed' namespaces.

BUG=None
TEST=skgpu and tools
R=robertphillips@google.com, bsalomon@google.com

Review URL: https://codereview.chromium.org/139743010

git-svn-id: http://skia.googlecode.com/svn/trunk@13146 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tfarina@chromium.org 2014-01-23 02:02:57 +00:00
parent d173b87608
commit 5a064e3af8
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
View File

@ -11,9 +11,7 @@
#include "SkPath.h"
#include "SkStrokeRec.h"
namespace {
bool is_clockwise(const SkVector& before, const SkVector& after) {
static bool is_clockwise(const SkVector& before, const SkVector& after) {
return before.cross(after) > 0;
}
@ -23,9 +21,9 @@ enum IntersectionType {
kOut_IntersectionType
};
IntersectionType intersection(const SkPoint& p1, const SkPoint& p2,
const SkPoint& p3, const SkPoint& p4,
SkPoint& res) {
static IntersectionType intersection(const SkPoint& p1, const SkPoint& p2,
const SkPoint& p3, const SkPoint& p4,
SkPoint& res) {
// Store the values for fast access and easy
// equations-to-code conversion
SkScalar x1 = p1.x(), x2 = p2.x(), x3 = p3.x(), x4 = p4.x();
@ -52,8 +50,6 @@ IntersectionType intersection(const SkPoint& p1, const SkPoint& p2,
kOut_IntersectionType : kIn_IntersectionType;
}
} // namespace
GrStrokePathRenderer::GrStrokePathRenderer() {
}

18
tools/picture_utils.cpp
View File

@ -12,6 +12,14 @@
#include "SkString.h"
#include "SkStream.h"
static bool is_path_seperator(const char chr) {
#if defined(SK_BUILD_FOR_WIN)
return chr == '\\' || chr == '/';
#else
return chr == '/';
#endif
}
namespace sk_tools {
void force_all_opaque(const SkBitmap& bitmap) {
SkASSERT(NULL == bitmap.getTexture());
@ -37,16 +45,6 @@ namespace sk_tools {
path->append(name);
}
namespace {
bool is_path_seperator(const char chr) {
#if defined(SK_BUILD_FOR_WIN)
return chr == '\\' || chr == '/';
#else
return chr == '/';
#endif
}
}
void get_basename(SkString* basename, const SkString& path) {
if (path.size() == 0) {
basename->reset();

2
tools/render_pictures_main.cpp
View File

@ -219,7 +219,6 @@ static int MaxByteDiff(uint32_t v1, uint32_t v2) {
SkMax32(abs(getByte(v1, 2) - getByte(v2, 2)), abs(getByte(v1, 3) - getByte(v2, 3))));
}
namespace {
class AutoRestoreBbhType {
public:
AutoRestoreBbhType() {
@ -244,7 +243,6 @@ private:
sk_tools::PictureRenderer* fRenderer;
sk_tools::PictureRenderer::BBoxHierarchyType fSavedBbhType;
};
}
/**
* Render the SKP file(s) within inputPath, writing their bitmap images into outputDir.