diff options
-rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 | ||||
-rw-r--r-- | src/core/SkWriter32.cpp | 2 | ||||
-rw-r--r-- | tools/filtermain.cpp | 2 | ||||
-rw-r--r-- | tools/path_utils.cpp | 4 | ||||
-rw-r--r-- | tools/path_utils.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index b301fcef66..48e14e2913 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -358,7 +358,7 @@ void SkDebuggerGUI::actionProfile() { } bool success = false; - SkTimedPicture picture(&inputStream, &success, &SkImageDecoder::DecodeStream, + SkTimedPicture picture(&inputStream, &success, &SkImageDecoder::DecodeStream, fOffsets, fSkipCommands); if (!success) { return; diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp index ce240c25f5..4bb83b3e37 100644 --- a/src/core/SkWriter32.cpp +++ b/src/core/SkWriter32.cpp @@ -159,7 +159,7 @@ uint32_t* SkWriter32::peek32(size_t offset) { if (offset >= fWrittenBeforeLastBlock) { return fTail->peek32(offset - fWrittenBeforeLastBlock); } - + Block* block = fHead; SkASSERT(NULL != block); diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp index 28020cd02a..c1b2040fd0 100644 --- a/tools/filtermain.cpp +++ b/tools/filtermain.cpp @@ -140,7 +140,7 @@ static bool PNGEncodeBitmapToStream(SkWStream* stream, const SkBitmap& bitmap) { return SkImageEncoder::EncodeStream(stream, bitmap, SkImageEncoder::kPNG_Type, 100); } -int filter_picture(const SkString& inFile, const SkString& outFile, +int filter_picture(const SkString& inFile, const SkString& outFile, const SkString& textureDir, SkFILEWStream *pathStream) { SkPicture* inPicture = NULL; diff --git a/tools/path_utils.cpp b/tools/path_utils.cpp index 217554d1ce..b1dad3487f 100644 --- a/tools/path_utils.cpp +++ b/tools/path_utils.cpp @@ -16,7 +16,7 @@ namespace sk_tools { if (NULL == pathStream) { return; } - + pathStream->writeText("#include \"SkScalar.h\"\n"); pathStream->writeText("#include \"SkPoint.h\"\n"); pathStream->writeText("#include \"SkBitmap.h\"\n"); @@ -81,7 +81,7 @@ namespace sk_tools { pathStream->writeText(" = "); pathStream->writeDecAsText(numVerbs); pathStream->writeText(";\n"); - + pathStream->writeText("uint8_t verbs"); pathStream->writeDecAsText(gCurPathID); pathStream->writeText("[] = {\n"); diff --git a/tools/path_utils.h b/tools/path_utils.h index d459611204..d05ad16c9a 100644 --- a/tools/path_utils.h +++ b/tools/path_utils.h @@ -19,7 +19,7 @@ namespace sk_tools { // dump_path_suffix - once per program invocation // // The output system relies on a global current path ID and assumes that - // only one set of aggregation arrays will be written per program + // only one set of aggregation arrays will be written per program // invocation. These utilities are not thread safe. // Write of the headers needed to compile the resulting .cpp file @@ -44,4 +44,4 @@ namespace sk_tools { void dump_path_suffix(SkFILEWStream* pathStream); } -#endif
\ No newline at end of file +#endif |