commit 9299eded3838a7997235ff033aa3b9a8d4c6d4d4
author keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 21 19:05:08 2012 +0000
committer keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 21 19:05:08 2012 +0000
tree 2905d615f99521ececd9b97a7887f04eac962599
parent db9a5fb55f77935774f21e07a04b6d1350ca54cc

Images are written by PictureRenderer and not render_pictures_main.

Review URL: https://codereview.appspot.com/6448174

git-svn-id: http://skia.googlecode.com/svn/trunk@5216 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/render_pictures_main.cpp

diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index dfea915..9981230 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -7,9 +7,7 @@
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
 #include "SkDevice.h"
-#include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
@@ -68,32 +66,11 @@
     path->append("png");
 }
 
-/* since PNG insists on unpremultiplying our alpha, we take no precision chances
-    and force all pixels to be 100% opaque, otherwise on compare we may not get
-    a perfect match.
- */
-static void force_all_opaque(const SkBitmap& bitmap) {
-    SkAutoLockPixels lock(bitmap);
-    for (int y = 0; y < bitmap.height(); y++) {
-        for (int x = 0; x < bitmap.width(); x++) {
-            *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);
-        }
-    }
-}
-
-static bool write_bitmap(const SkString& path, const SkBitmap& bitmap) {
-    SkBitmap copy;
-    bitmap.copyTo(&copy, SkBitmap::kARGB_8888_Config);
-    force_all_opaque(copy);
-    return SkImageEncoder::EncodeFile(path.c_str(), copy,
-                                      SkImageEncoder::kPNG_Type, 100);
-}
-
 static void write_output(const SkString& outputDir, const SkString& inputFilename,
-                         const SkBitmap& bitmap) {
+                         const sk_tools::PictureRenderer& renderer) {
     SkString outputPath;
     make_output_filepath(&outputPath, outputDir, inputFilename);
-    bool isWritten = write_bitmap(outputPath, bitmap);
+    bool isWritten = renderer.write(outputPath);
     if (!isWritten) {
         SkDebugf("Could not write to file %s\n", outputPath.c_str());
     }
@@ -112,15 +89,12 @@
     }
 
     SkPicture picture(&inputStream);
-    SkBitmap bitmap;
-    sk_tools::setup_bitmap(&bitmap, picture.width(), picture.height());
 
     renderer.init(&picture);
 
     renderer.render();
 
-    renderer.getCanvas()->readPixels(&bitmap, 0, 0);
-    write_output(outputDir, inputFilename, bitmap);
+    write_output(outputDir, inputFilename, renderer);
 
     renderer.end();
 }