aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-18 03:02:11 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-18 03:02:11 +0000
commitdb0c8753775774aa3f67114491e26ac1be32f38e (patch)
tree1d64e592bbbc7caef89ec3c856745b9e64bdfa71 /src/core
parentd9cdff67a40e21cf45d3e07b483b9c745bd4481f (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13845 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBitmapDevice.cpp4
-rw-r--r--src/core/SkCanvas.cpp6
-rw-r--r--src/core/SkDevice.cpp2
-rw-r--r--src/core/SkPicturePlayback.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
index 868306ca2e..f0f4df41f1 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -310,7 +310,7 @@ bool SkBitmapDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, s
if (NULL == fBitmap.getPixels()) {
return false;
}
-
+
SkImageInfo srcInfo = fBitmap.info();
// perhaps can relax these in the future
@@ -323,7 +323,7 @@ bool SkBitmapDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, s
srcInfo.fWidth = dstInfo.width();
srcInfo.fHeight = dstInfo.height();
-
+
const void* srcPixels = fBitmap.getAddr(x, y);
const size_t srcRowBytes = fBitmap.rowBytes();
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index ef6a82d9bf..10ca95c7a5 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -748,12 +748,12 @@ bool SkCanvas::readPixels(const SkImageInfo& origInfo, void* dstP, size_t rowByt
if (!srcR.intersect(0, 0, size.width(), size.height())) {
return false;
}
-
+
SkImageInfo info = origInfo;
// the intersect may have shrunk info's logical size
info.fWidth = srcR.width();
info.fHeight = srcR.height();
-
+
// if x or y are negative, then we have to adjust pixels
if (x > 0) {
x = 0;
@@ -763,7 +763,7 @@ bool SkCanvas::readPixels(const SkImageInfo& origInfo, void* dstP, size_t rowByt
}
// here x,y are either 0 or negative
dstP = ((char*)dstP - y * rowBytes - x * info.bytesPerPixel());
-
+
// The device can assert that the requested area is always contained in its bounds
return device->readPixels(info, dstP, rowBytes, srcR.x(), srcR.y());
}
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 61a7ab61c7..ac46755013 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -182,7 +182,7 @@ bool SkBaseDevice::readPixels(const SkImageInfo& info, void* dstP, size_t rowByt
SkASSERT(dstP);
SkASSERT(rowBytes >= info.minRowBytes());
SkASSERT(x >= 0 && y >= 0);
-
+
const SkImageInfo& srcInfo = this->imageInfo();
SkASSERT(x + info.width() <= srcInfo.width());
SkASSERT(y + info.height() <= srcInfo.height());
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index c989061619..fc1d98e093 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -871,7 +871,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
if (0 == activeOpsList.numOps()) {
return; // nothing to draw
}
-
+
// Since the opList is valid we know it is our derived class
activeOps = &((const CachedOperationList&)activeOpsList).fOps;
}