Updates to skimage tool to use it for testing.

tools/picture_utils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "picture_utils.h"
 #include "SkColorPriv.h"
 #include "SkBitmap.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "SkStream.h"
 
 namespace sk_tools {
     void force_all_opaque(const SkBitmap& bitmap) {
         SkASSERT(NULL == bitmap.getTexture());
-        SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());
-        if (NULL != bitmap.getTexture() || SkBitmap::kARGB_8888_Config == bitmap.config()) {
+        if (NULL != bitmap.getTexture()) {
             return;
         }
 
-        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);
+        SkBitmap bitmap8888;
+        const SkBitmap* bmPtr;
+        if (SkBitmap::kARGB_8888_Config == bitmap.config()) {

[epoger, 2013/04/19 21:35:16]

Do non-8888 configs even allow for alpha channel variations?  I thought, at this
point, we only supported 8888 and 565...

[scroggo, 2013/04/19 22:12:01]

I think kIndex8 does. And we can get kIndex8 from a decoder.

+            bmPtr = &bitmap;
+        } else {
+            bitmap.copyTo(&bitmap8888, SkBitmap::kARGB_8888_Config);
+            bmPtr = &bitmap8888;

[epoger, 2013/04/19 21:35:16]

In this case, are this method's modifications even preserved?  It seems to me
that it is modifying bitmap8888, which only lives on the stack.

[scroggo, 2013/04/19 22:12:01]

D'oh! No the modifications are not :(

[scroggo, 2013/04/22 22:10:15]

Rather than modify this function further, so it will do what I want it to do, I
do my own forcing to opaque...

+        }
+
+        SkAutoLockPixels lock(*bmPtr);
+        for (int y = 0; y < bmPtr->height(); y++) {
+            for (int x = 0; x < bmPtr->width(); x++) {
+                *bmPtr->getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);
             }
         }
     }
 
     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("/");
         }
@@ skipping 47 matching lines @@
         SkString skString(string);
         return skString.endsWith("%");
     }
 
     void setup_bitmap(SkBitmap* bitmap, int width, int height) {
         bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
         bitmap->allocPixels();
         bitmap->eraseColor(SK_ColorTRANSPARENT);
     }
 }