diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-03 07:00:57 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-03 07:00:57 +0000 |
commit | 98a196770cc7b9914ad68367c5b06829a5e0b440 (patch) | |
tree | 9bc11b7b5033327a40812eee3debe5be7c8aa9bd | |
parent | c631b792c4560cc5f508438de00999c078b32367 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9882 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | bench/CmapBench.cpp | 7 | ||||
-rw-r--r-- | experimental/PdfViewer/SkPdfUtils.cpp | 1 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/SkPdfNYI.cpp | 2 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp | 1 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp | 1 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp | 1 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp | 2 | ||||
-rw-r--r-- | tests/PaintTest.cpp | 8 |
8 files changed, 7 insertions, 16 deletions
diff --git a/bench/CmapBench.cpp b/bench/CmapBench.cpp index 1ce9d8f7b6..49c2aee70e 100644 --- a/bench/CmapBench.cpp +++ b/bench/CmapBench.cpp @@ -46,7 +46,7 @@ static void charsToGlyphs_proc(const SkPaint& paint, const void* text, SkTypeface::Encoding encoding = paint2Encoding(paint); uint16_t glyphs[NGLYPHS]; SkASSERT(glyphCount <= NGLYPHS); - + SkTypeface* face = paint.getTypeface(); for (int i = 0; i < LOOP; ++i) { face->charsToGlyphs(text, encoding, glyphs, glyphCount); @@ -56,7 +56,7 @@ static void charsToGlyphs_proc(const SkPaint& paint, const void* text, static void charsToGlyphsNull_proc(const SkPaint& paint, const void* text, size_t len, int glyphCount) { SkTypeface::Encoding encoding = paint2Encoding(paint); - + SkTypeface* face = paint.getTypeface(); for (int i = 0; i < LOOP; ++i) { face->charsToGlyphs(text, encoding, NULL, glyphCount); @@ -73,7 +73,7 @@ public: CMAPBench(void* param, TypefaceProc proc, const char name[]) : SkBenchmark(param) { fProc = proc; fName.printf("cmap_%s", name); - + for (int i = 0; i < NGLYPHS; ++i) { // we're jamming values into utf8, so we must keep it legal utf8 fText[i] = 'A' + (i & 31); @@ -101,4 +101,3 @@ DEF_BENCH( return new CMAPBench(p, containsText_proc, "paint_containsText"); ) DEF_BENCH( return new CMAPBench(p, textToGlyphs_proc, "paint_textToGlyphs"); ) DEF_BENCH( return new CMAPBench(p, charsToGlyphs_proc, "face_charsToGlyphs"); ) DEF_BENCH( return new CMAPBench(p, charsToGlyphsNull_proc, "face_charsToGlyphs_null"); ) - diff --git a/experimental/PdfViewer/SkPdfUtils.cpp b/experimental/PdfViewer/SkPdfUtils.cpp index 507077f163..898f83d763 100644 --- a/experimental/PdfViewer/SkPdfUtils.cpp +++ b/experimental/PdfViewer/SkPdfUtils.cpp @@ -1,2 +1 @@ #include "SkPdfUtils.h" - diff --git a/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp b/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp index 7868cc625a..9f232fe3cd 100644 --- a/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp +++ b/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp @@ -1,4 +1,2 @@ #include "SkPdfNYI.h" - - diff --git a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp index f405d4aa34..5d8683899b 100644 --- a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp @@ -9,4 +9,3 @@ SkNativeParsedPDF::SkNativeParsedPDF() { SkNativeParsedPDF::~SkNativeParsedPDF() { // TODO(edisonn): Auto-generated destructor stub } - diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp index ea744ac1ef..ba3a34e372 100644 --- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp @@ -9,4 +9,3 @@ SkPdfNativeTokenizer::SkPdfNativeTokenizer() { SkPdfNativeTokenizer::~SkPdfNativeTokenizer() { // TODO(edisonn): Auto-generated destructor stub } - diff --git a/experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp b/experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp index 86d62315bc..edc65e9d88 100644 --- a/experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp +++ b/experimental/PdfViewer/pdfparser/podofo/SkPodofoParsedPDF.cpp @@ -191,4 +191,3 @@ void SkTraceRect(const SkRect& rect, const char* sz) { printf("\n"); } #endif - diff --git a/experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp b/experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp index 1743510d88..f64090aa72 100644 --- a/experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp +++ b/experimental/PdfViewer/pdfparser/podofo/SkPodofoUtils.cpp @@ -412,5 +412,3 @@ bool StreamFromDictionary(const SkPodofoParsedPDF* pdfDoc, if (abr == NULL || *abr == '\0') return false; return StreamFromDictionary(pdfDoc, dict, abr, data); } - - diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 20dda6b6a4..5631632bdb 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -82,14 +82,14 @@ static void test_cmap(skiatest::Reporter* reporter) { } // inject some random chars, to sometimes abort early src[rand.nextU() & 63] = rand.nextU() & 0xFFF; - + for (size_t k = 0; k < SK_ARRAY_COUNT(gRec); ++k) { paint.setTextEncoding(gRec[k].fEncoding); size_t len = gRec[k].fSeedTextProc(src, dst, NGLYPHS); - + uint16_t glyphs0[NGLYPHS], glyphs1[NGLYPHS]; - + bool contains = paint.containsText(dst, len); int nglyphs = paint.textToGlyphs(dst, len, glyphs0); int first = face->charsToGlyphs(dst, paint2encoding(paint), glyphs1, NGLYPHS); @@ -231,7 +231,7 @@ static void TestPaint(skiatest::Reporter* reporter) { regression_measureText(reporter); test_bicubic(reporter); - + // need to implement charsToGlyphs on other backends (e.g. linux, win) // before we can run this tests everywhere if (false) { |