Make output path to render_pictures optional
Review URL: https://codereview.appspot.com/6779049
git-svn-id: http://skia.googlecode.com/svn/trunk@6136 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index ae2c94e..e6d86dd 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -163,7 +163,10 @@
pipeCanvas->drawPicture(*fPicture);
writer.endRecording();
fCanvas->flush();
- return path != NULL && write(fCanvas, *path);
+ if (NULL != path) {
+ return write(fCanvas, *path);
+ }
+ return true;
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -177,7 +180,10 @@
fCanvas->drawPicture(*fPicture);
fCanvas->flush();
- return path != NULL && write(fCanvas, *path);
+ if (NULL != path) {
+ return write(fCanvas, *path);
+ }
+ return true;
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -382,7 +388,8 @@
int32_t i;
while ((i = tileData->nextTile(&tileRect)) != -1) {
DrawTileToCanvas(tileData->fCanvas, tileRect, tileData->fController);
- if (!writeAppendNumber(tileData->fCanvas, tileData->fPath, i)) {
+ if (NULL != tileData->fPath &&
+ !writeAppendNumber(tileData->fCanvas, tileData->fPath, i)) {
*tileData->fSuccess = false;
break;
}
@@ -412,7 +419,8 @@
int32_t i;
while ((i = cloneData->nextTile(&tileRect)) != -1) {
DrawTileToCanvas(cloneData->fCanvas, tileRect, cloneData->fClone);
- if (!writeAppendNumber(cloneData->fCanvas, cloneData->fPath, i)) {
+ if (NULL != cloneData->fPath &&
+ !writeAppendNumber(cloneData->fCanvas, cloneData->fPath, i)) {
*cloneData->fSuccess = false;
break;
}
@@ -486,13 +494,14 @@
SkCanvas* canvas = this->setupCanvas(fTileWidth, fTileHeight);
SkAutoUnref aur(canvas);
+ bool success = true;
for (int i = 0; i < fTileRects.count(); ++i) {
DrawTileToCanvas(canvas, fTileRects[i], fPicture);
- if (!writeAppendNumber(canvas, path, i)) {
- return false;
+ if (NULL != path) {
+ success &= writeAppendNumber(canvas, path, i);
}
}
- return path != NULL;
+ return success;
}
}