pdfviewer: remove dependency on picture_utils. add utility function to render SkStream into bitmap.

experimental/PdfViewer/pdf_viewer_main.cpp

 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTArray.h"
-#include "picture_utils.h"
 #include "SkNulCanvas.h"
 
 #include "SkPdfRenderer.h"
 
 DEFINE_string2(readPath, r, "", "pdf files or directories of pdf files to process.");
 DEFINE_string2(writePath, w, "", "Directory to write the rendered pages.");
 DEFINE_bool2(noExtensionForOnePagePdf, n, false, "No page extension if only one page.");
 DEFINE_bool2(showMemoryUsage, m, false, "Show Memory usage.");
 DEFINE_string2(pages, p, "all", "What pages to render and how:\n"
                                 "\tall - all pages\n"
@@ skipping 44 matching lines @@
         }
         if (page >= 0) {
             path->appendf("%i.", page);
         }
         path->append(new_extension);
         return true;
     }
     return false;
 }
 
+void make_filepath(SkString* path, const SkString& dir, const SkString& name) {
+    size_t len = dir.size();
+    path->set(dir);
+    if (0 < len  && '/' != dir[len - 1]) {
+        path->append("/");
+    }
+    path->append(name);
+}
+
+bool is_path_seperator(const char chr) {
+#if defined(SK_BUILD_FOR_WIN)
+    return chr == '\\' || chr == '/';
+#else
+    return chr == '/';
+#endif
+}
+
+void get_basename(SkString* basename, const SkString& path) {
+    if (path.size() == 0) {
+        basename->reset();
+        return;
+    }
+
+    size_t end = path.size() - 1;
+
+    // Paths pointing to directories often have a trailing slash,
+    // we remove it so the name is not empty
+    if (is_path_seperator(path[end])) {
+        if (end == 0) {
+            basename->reset();
+            return;
+        }
+
+        end -= 1;
+    }
+
+    size_t i = end;
+    do {
+        --i;
+        if (is_path_seperator(path[i])) {
+              const char* basenameStart = path.c_str() + i + 1;
+              size_t basenameLength = end - i;
+              basename->set(basenameStart, basenameLength);
+              return;
+        }
+    } while (i > 0);
+
+    basename->set(path.c_str(), end + 1);
+}
+
 /** Builds the output filename. path = dir/name, and it replaces expected
  * .skp extension with .pdf extention.
  * @param path Output filename.
  * @param name The name of the file.
  * @returns false if the file did not has the expected extension.
  *  if false is returned, contents of path are undefined.
  */
-
-
 static bool make_output_filepath(SkString* path, const SkString& dir,
                                  const SkString& name,
                                  int page) {
-    sk_tools::make_filepath(path, dir, name);
+    make_filepath(path, dir, name);
     return add_page_and_replace_filename_extension(path, page,
                                                    PDF_FILE_EXTENSION,
                                                    PNG_FILE_EXTENSION);
 }
 
 static void setup_bitmap(SkBitmap* bitmap, int width, int height, SkColor color = SK_ColorWHITE) {
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
 
     bitmap->allocPixels();
     bitmap->eraseColor(color);
@@ skipping 60 matching lines @@
 /** Reads an skp file, renders it to pdf and writes the output to a pdf file
  * @param inputPath The skp file to be read.
  * @param outputDir Output dir.
  * @param renderer The object responsible to render the skp object into pdf.
  */
 static bool process_pdf(const SkString& inputPath, const SkString& outputDir,
                         SkPdfRenderer& renderer) {
     SkDebugf("Loading PDF:  %s\n", inputPath.c_str());
 
     SkString inputFilename;
-    sk_tools::get_basename(&inputFilename, inputPath);
+    get_basename(&inputFilename, inputPath);
 
     SkFILEStream inputStream;
     inputStream.setPath(inputPath.c_str());
     if (!inputStream.isValid()) {
         SkDebugf("Could not open file %s\n", inputPath.c_str());
         return false;
     }
 
     bool success = false;
 
@@ skipping 53 matching lines @@
 static int process_input(const char* input, const SkString& outputDir,
                          SkPdfRenderer& renderer) {
     int failures = 0;
     if (sk_isdir(input)) {
         SkOSFile::Iter iter(input, PDF_FILE_EXTENSION);
         SkString inputFilename;
         while (iter.next(&inputFilename)) {
             SkString inputPath;
             SkString _input;
             _input.append(input);
-            sk_tools::make_filepath(&inputPath, _input, inputFilename);
+            make_filepath(&inputPath, _input, inputFilename);
             if (!process_pdf(inputPath, outputDir, renderer)) {
                 ++failures;
             }
         }
     } else {
         SkString inputPath(input);
         if (!process_pdf(inputPath, outputDir, renderer)) {
             ++failures;
         }
     }
@@ skipping 31 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif