Add option to render PDFs to memory only.
Review URL: https://codereview.appspot.com/7097045
git-svn-id: http://skia.googlecode.com/svn/trunk@7140 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 6e6a6e8..80ec7fb 100644
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -33,7 +33,7 @@
SkDebugf("SKP to PDF rendering tool\n");
SkDebugf("\n"
"Usage: \n"
-" %s <input>... <outputDir> \n"
+" %s <input>... -w <outputDir> \n"
, argv0);
SkDebugf("\n\n");
SkDebugf(
@@ -89,15 +89,25 @@
static bool write_output(const SkString& outputDir,
const SkString& inputFilename,
const sk_tools::PdfRenderer& renderer) {
+ if (outputDir.isEmpty()) {
+ SkDynamicMemoryWStream stream;
+ renderer.write(&stream);
+ return true;
+ }
+
SkString outputPath;
if (!make_output_filepath(&outputPath, outputDir, inputFilename)) {
return false;
}
- bool isWritten = renderer.write(outputPath);
- if (!isWritten) {
+
+ SkFILEWStream stream(outputPath.c_str());
+ if (!stream.isValid()) {
SkDebugf("Could not write to file %s\n", outputPath.c_str());
+ return false;
}
- return isWritten;
+ renderer.write(&stream);
+
+ return true;
}
/** Reads an skp file, renders it to pdf and writes the output to a pdf file
@@ -168,7 +178,8 @@
}
static void parse_commandline(int argc, char* const argv[],
- SkTArray<SkString>* inputs) {
+ SkTArray<SkString>* inputs,
+ SkString* outputDir) {
const char* argv0 = argv[0];
char* const* stop = argv + argc;
@@ -176,12 +187,20 @@
if ((0 == strcmp(*argv, "-h")) || (0 == strcmp(*argv, "--help"))) {
usage(argv0);
exit(-1);
+ } else if (0 == strcmp(*argv, "-w")) {
+ ++argv;
+ if (argv >= stop) {
+ SkDebugf("Missing outputDir for -w\n");
+ usage(argv0);
+ exit(-1);
+ }
+ *outputDir = SkString(*argv);
} else {
inputs->push_back(SkString(*argv));
}
}
- if (inputs->count() < 2) {
+ if (inputs->count() < 1) {
usage(argv0);
exit(-1);
}
@@ -197,11 +216,11 @@
renderer(SkNEW(sk_tools::SimplePdfRenderer));
SkASSERT(renderer.get());
- parse_commandline(argc, argv, &inputs);
- SkString outputDir = inputs[inputs.count() - 1];
+ SkString outputDir;
+ parse_commandline(argc, argv, &inputs, &outputDir);
int failures = 0;
- for (int i = 0; i < inputs.count() - 1; i ++) {
+ for (int i = 0; i < inputs.count(); i ++) {
failures += process_input(inputs[i], outputDir, *renderer);
}