Add the lazy decoder from PictureFlags to SkImageDecoder

tools/lua/lua_pictures.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "LazyDecodeBitmap.h"
 #include "SkLua.h"
 #include "SkLuaCanvas.h"
 #include "SkPicture.h"
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkData.h"
 #include "picture_utils.h"
 #include "SkOSFile.h"
 #include "SkImageDecoder.h"
-#include "SkForceLinking.h"
-
-__SK_FORCE_IMAGE_DECODER_LINKING;
 
 extern "C" {
     #include "lua.h"
     #include "lualib.h"
     #include "lauxlib.h"
 }
 
 static const char gStartCanvasFunc[] = "sk_scrape_startcanvas";
 static const char gEndCanvasFunc[] = "sk_scrape_endcanvas";
 static const char gAccumulateFunc[] = "sk_scrape_accumulate";
 static const char gSummarizeFunc[] = "sk_scrape_summarize";
 
 // PictureRenderingFlags.cpp
 extern bool lazy_decode_bitmap(const void* buffer, size_t size, SkBitmap*);

[scroggo, 2013/07/15 18:02:41]

No longer needed.

 
 // Example usage for the modulo flag:
 // for i in {0..5}; do lua_pictures --skpPath SKP_PATH -l YOUR_SCRIPT --modulo $i 6 &; done
 DEFINE_string(modulo, "", "[--modulo <remainder> <divisor>]: only run tests for which "
               "testIndex %% divisor == remainder.");
 DEFINE_string2(skpPath, r, "", "Read this .skp file or .skp files from this dir");
 DEFINE_string2(luaFile, l, "", "File containing lua script to run");
 DEFINE_string2(headCode, s, "", "Optional lua code to call at beginning");
 DEFINE_string2(tailFunc, s, "", "Optional lua function to call at end");
 
 static SkPicture* load_picture(const char path[]) {
     SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
     SkPicture* pic = NULL;
     if (stream.get()) {
-        pic = SkPicture::CreateFromStream(stream.get(), &lazy_decode_bitmap);
+        pic = SkPicture::CreateFromStream(stream.get(), &LazyDecodeBitmap);
     }
     return pic;
 }
 
 static SkData* read_into_data(const char file[]) {
     SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(file));
     if (!stream.get()) {
         return SkData::NewEmpty();
     }
     size_t len = stream->getLength();
@@ skipping 107 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif