diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBitmapCache.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBuffer.cpp | 2 | ||||
-rw-r--r-- | src/core/SkCanvas.cpp | 4 | ||||
-rw-r--r-- | src/core/SkColorSpace_ICC.cpp | 8 | ||||
-rw-r--r-- | src/core/SkGeometry.cpp | 4 | ||||
-rw-r--r-- | src/core/SkMatrixPriv.h | 6 | ||||
-rw-r--r-- | src/core/SkPaintPriv.h | 2 | ||||
-rw-r--r-- | src/core/SkPathEffect.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPictureData.cpp | 2 | ||||
-rw-r--r-- | src/core/SkReadBuffer.h | 2 | ||||
-rw-r--r-- | src/core/SkRegion.cpp | 2 | ||||
-rw-r--r-- | src/core/SkStroke.cpp | 2 | ||||
-rw-r--r-- | src/core/SkTextBlob.cpp | 4 | ||||
-rw-r--r-- | src/core/SkVertices.cpp | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp index 0fc0c9e075..210787e47d 100644 --- a/src/core/SkBitmapCache.cpp +++ b/src/core/SkBitmapCache.cpp @@ -193,7 +193,7 @@ public: SkASSERT(rec->fMalloc != nullptr); } } - + bool install(SkBitmap* bitmap) { SkAutoMutexAcquire ama(fMutex); diff --git a/src/core/SkBuffer.cpp b/src/core/SkBuffer.cpp index b7cf8b2b87..51ab239afe 100644 --- a/src/core/SkBuffer.cpp +++ b/src/core/SkBuffer.cpp @@ -35,7 +35,7 @@ bool SkRBuffer::skipToAlign4() { return false; } } - + /////////////////////////////////////////////////////////////////////////////////////////////////// void* SkWBuffer::skip(size_t size) { diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index f1b42e6975..fdfd5a4007 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1440,7 +1440,7 @@ void SkCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle edge AutoValidateClip avc(this); bool isAA = kSoft_ClipEdgeStyle == edgeStyle; - + FOR_EACH_TOP_DEVICE(device->clipRRect(rrect, op, isAA)); fMCRec->fRasterClip.op(rrect, fMCRec->fMatrix, this->getTopLayerBounds(), (SkRegion::Op)op, @@ -1477,7 +1477,7 @@ void SkCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle edgeSty AutoValidateClip avc(this); bool isAA = kSoft_ClipEdgeStyle == edgeStyle; - + FOR_EACH_TOP_DEVICE(device->clipPath(path, op, isAA)); const SkPath* rasterClipPath = &path; diff --git a/src/core/SkColorSpace_ICC.cpp b/src/core/SkColorSpace_ICC.cpp index 5a510903c6..72592d6444 100644 --- a/src/core/SkColorSpace_ICC.cpp +++ b/src/core/SkColorSpace_ICC.cpp @@ -652,7 +652,7 @@ static bool load_color_lut(sk_sp<SkColorLookUpTable>* colorLUT, uint32_t inputCh * 3x3 matrix with no translation * * @param matrix The matrix to store the result in - * @param src Data to load the matrix out of. + * @param src Data to load the matrix out of. * @param len The length of |src|. * Must have 48 bytes if |translate| is set and 36 bytes otherwise. * @param translate Whether to read the translation column or not @@ -679,7 +679,7 @@ static bool load_matrix(SkMatrix44* matrix, const uint8_t* src, size_t len, bool default: encodingFactor = 1.f; SkASSERT(false); - break; + break; } float array[16]; array[ 0] = encodingFactor * SkFixedToFloat(read_big_endian_i32(src)); @@ -1100,7 +1100,7 @@ bool load_a2b0_lutn_type(std::vector<SkColorSpace_A2B::Element>* elements, const inTableEntries = read_big_endian_u16(src + 48); outTableEntries = read_big_endian_u16(src + 50); precision = 2; - + constexpr size_t kMaxLut16GammaEntries = 4096; if (inTableEntries < 2) { SkColorSpacePrintf("Too few (%d) input gamma table entries. Must have at least 2.\n", @@ -1111,7 +1111,7 @@ bool load_a2b0_lutn_type(std::vector<SkColorSpace_A2B::Element>* elements, const inTableEntries, kMaxLut16GammaEntries); return false; } - + if (outTableEntries < 2) { SkColorSpacePrintf("Too few (%d) output gamma table entries. Must have at least 2.\n", outTableEntries); diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index caae8398f1..0b3eedab17 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -1185,7 +1185,7 @@ int SkConic::computeQuadPOW2(SkScalar tol) const { return pow2; } -// This was originally developed and tested for pathops: see SkOpTypes.h +// This was originally developed and tested for pathops: see SkOpTypes.h // returns true if (a <= b <= c) || (a >= b >= c) static bool between(SkScalar a, SkScalar b, SkScalar c) { return (a - b) * (c - b) <= 0; @@ -1425,7 +1425,7 @@ int SkConic::BuildUnitArc(const SkVector& uStart, const SkVector& uStop, SkRotat if (!lastQ.equalsWithinTolerance(offCurve)) { dst[conicCount].set(lastQ, offCurve, finalP, cosThetaOver2); conicCount += 1; - } + } } // now handle counter-clockwise and the initial unitStart rotation diff --git a/src/core/SkMatrixPriv.h b/src/core/SkMatrixPriv.h index 844901c011..ee6f8a153d 100644 --- a/src/core/SkMatrixPriv.h +++ b/src/core/SkMatrixPriv.h @@ -27,7 +27,7 @@ public: return true; } // Insert other special-cases here (e.g. scale+translate) - + // general case SkMatrix inverse; if (mx.invert(&inverse)) { @@ -42,7 +42,7 @@ public: SkASSERT(0 == stride % sizeof(SkScalar)); SkMatrix::TypeMask tm = mx.getType(); - + if (SkMatrix::kIdentity_Mask == tm) { return; } @@ -57,7 +57,7 @@ public: return; } // Insert other special-cases here (e.g. scale+translate) - + // general case SkMatrix::MapXYProc proc = mx.getMapXYProc(); for (int i = 0; i < count; ++i) { diff --git a/src/core/SkPaintPriv.h b/src/core/SkPaintPriv.h index 663ed2d836..72c9274859 100644 --- a/src/core/SkPaintPriv.h +++ b/src/core/SkPaintPriv.h @@ -62,7 +62,7 @@ public: static void MakeTextMatrix(SkMatrix* matrix, const SkPaint& paint) { MakeTextMatrix(matrix, paint.getTextSize(), paint.getTextScaleX(), paint.getTextSkewX()); } - + static bool ShouldDither(const SkPaint&, SkColorType); }; diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index ec5ac3b945..3eee6656dd 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -104,7 +104,7 @@ public: } return fPE0->filterPath(dst, *ptr, rec, cullRect); } - + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) @@ -170,7 +170,7 @@ public: return fPE0->filterPath(dst, src, rec, cullRect) | fPE1->filterPath(dst, src, rec, cullRect); } - + SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp index 69ff736fcf..40ce54e4d8 100644 --- a/src/core/SkPictureData.cpp +++ b/src/core/SkPictureData.cpp @@ -95,7 +95,7 @@ SkPictureData::SkPictureData(const SkPictureRecord& record, fVerticesRefs[i] = SkRef(verts[i]); } } - + const SkTDArray<const SkImage*>& imgs = record.getImageRefs(); fImageCount = imgs.count(); if (fImageCount > 0) { diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h index 2541b54202..28f7ecba17 100644 --- a/src/core/SkReadBuffer.h +++ b/src/core/SkReadBuffer.h @@ -223,7 +223,7 @@ public: void setInflator(SkInflator* inf) { fInflator = inf; } // sk_sp<SkImage> inflateImage(); - + protected: /** * Allows subclass to check if we are using factories for expansion diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp index b25633b67c..dd70d1f507 100644 --- a/src/core/SkRegion.cpp +++ b/src/core/SkRegion.cpp @@ -200,7 +200,7 @@ char* SkRegion::toString() { iter.reset(*this); while (!iter.done()) { const SkIRect& r = iter.rect(); - count += snprintf(result+count, max - count, + count += snprintf(result+count, max - count, "(%d,%d,%d,%d)", r.fLeft, r.fTop, r.fRight, r.fBottom); iter.next(); } diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp index 7e5d4e3939..0852f56bd2 100644 --- a/src/core/SkStroke.cpp +++ b/src/core/SkStroke.cpp @@ -1396,7 +1396,7 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const { // We can always ignore centers for stroke and fill convex line-only paths // TODO: remove the line-only restriction - bool ignoreCenter = fDoFill && (src.getSegmentMasks() == SkPath::kLine_SegmentMask) && + bool ignoreCenter = fDoFill && (src.getSegmentMasks() == SkPath::kLine_SegmentMask) && src.isLastContourClosed() && src.isConvex(); SkPathStroker stroker(src, radius, fMiterLimit, this->getCap(), this->getJoin(), diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp index 03ef397dc0..ebd73a91dc 100644 --- a/src/core/SkTextBlob.cpp +++ b/src/core/SkTextBlob.cpp @@ -247,7 +247,7 @@ private: SkTextBlob::GlyphPositioning positioning) { return glyphCount * ScalarsPerGlyph(positioning); } - + uint32_t* textSizePtr() const { // textSize follows the position buffer. SkASSERT(isExtended()); @@ -809,7 +809,7 @@ sk_sp<SkTextBlob> SkTextBlob::MakeFromBuffer(SkReadBuffer& reader) { } } } - + return blobBuilder.make(); } diff --git a/src/core/SkVertices.cpp b/src/core/SkVertices.cpp index 8dadad056b..853bd31ca8 100644 --- a/src/core/SkVertices.cpp +++ b/src/core/SkVertices.cpp @@ -216,6 +216,6 @@ sk_sp<SkVertices> SkVertices::Decode(const void* data, size_t length) { reader.read(builder.texCoords(), sizes.fTSize); reader.read(builder.colors(), sizes.fCSize); reader.read(builder.indices(), sizes.fISize); - + return builder.detach(); } |