Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8211 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkData.h b/include/core/SkData.h
index 6b09119..06edb02 100644
--- a/include/core/SkData.h
+++ b/include/core/SkData.h
@@ -93,7 +93,7 @@
* will handle calling munmap().
*/
static SkData* NewFromMMap(const void* data, size_t length);
-
+
/**
* Create a new dataref using a subset of the data in the specified
* src dataref.
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index eb0cd47..c941870 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -23,7 +23,7 @@
* returned object. On failure, returns NULL.
*/
static SkStream* NewFromFile(const char path[]);
-
+
SK_DECLARE_INST_COUNT(SkStream)
/** Called to rewind to the beginning of the stream. If this cannot be
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 5873091..c6aaa52 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -82,8 +82,8 @@
}
#ifdef SK_DEVELOPER
- virtual void toString(SkString* str) const SK_OVERRIDE {
- str->append("Darken: (");
+ virtual void toString(SkString* str) const SK_OVERRIDE {
+ str->append("Darken: (");
this->INHERITED::toString(str);
str->append(")");
}
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp
index 8fbca7a..8c22200 100644
--- a/src/core/SkData.cpp
+++ b/src/core/SkData.cpp
@@ -321,4 +321,3 @@
gEmptySet->ref();
return gEmptySet;
}
-
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index bd5dd32..ed1287e 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -802,24 +802,24 @@
if (fd < 0) {
return false;
}
-
+
off_t offset = lseek(fd, 0, SEEK_END); // find the file size
if (offset == -1) {
close(fd);
return false;
}
(void)lseek(fd, 0, SEEK_SET); // restore file offset to beginning
-
+
// to avoid a 64bit->32bit warning, I explicitly create a size_t size
size_t size = static_cast<size_t>(offset);
-
+
void* addr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
close(fd);
-
+
if (MAP_FAILED == addr) {
return false;
}
-
+
*addrPtr = addr;
*sizePtr = size;
return true;
@@ -837,7 +837,7 @@
return SkNEW_ARGS(SkMemoryStream, (data.get()));
}
}
-
+
// If we get here, then our attempt at using mmap failed, so try normal
// file access.
SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
@@ -847,4 +847,3 @@
}
return stream;
}
-
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 2329b0f..3d0fb81 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -357,11 +357,11 @@
str->append("flags: (");
if (fBlurFlags) {
bool needSeparator = false;
- SkAddFlagToString(str,
- SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag),
+ SkAddFlagToString(str,
+ SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag),
"IgnoreXform", &needSeparator);
- SkAddFlagToString(str,
- SkToBool(fBlurFlags & SkBlurMaskFilter::kHighQuality_BlurFlag),
+ SkAddFlagToString(str,
+ SkToBool(fBlurFlags & SkBlurMaskFilter::kHighQuality_BlurFlag),
"HighQuality", &needSeparator);
} else {
str->append("None");
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index a205fcc..391cba5 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -145,7 +145,7 @@
str->appendScalar(fLight.fDirection[2]);
str->append(") ");
- str->appendf("ambient: %d specular: %d ",
+ str->appendf("ambient: %d specular: %d ",
fLight.fAmbient, fLight.fSpecular);
str->append("blurRadius: ");