1de415f2c3
Reason for revert: Breaks Ubuntu and Mac CMAKE Original issue's description: > Make SkPicture/SkImageGenerator default to SkCodec > > Remove reference to SkImageDecoder from SkPicture. Make the default > InstallPixelRefProc passed to CreateFromStream use > SkImageGenerator::NewFromEncoded instead. > > Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator. > Remove the old version that used SkImageDecoder. > > Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default > now behaves lazily. > > Update all clients to use the default. > > Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly. > > BUG=skia:4691 > BUG=skia:4290 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002 > > Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6 TBR=msarett@google.com,reed@google.com,scroggo@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4691 Review URL: https://codereview.chromium.org/1685963004
92 lines
2.2 KiB
C++
92 lines
2.2 KiB
C++
/*
|
|
* 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 "LazyDecodeBitmap.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkPicture.h"
|
|
#include "SkStream.h"
|
|
#include "SkString.h"
|
|
#include "SkDumpCanvas.h"
|
|
|
|
static SkPicture* inspect(const char path[]) {
|
|
SkFILEStream stream(path);
|
|
if (!stream.isValid()) {
|
|
printf("-- Can't open '%s'\n", path);
|
|
return nullptr;
|
|
}
|
|
|
|
printf("Opening '%s'...\n", path);
|
|
|
|
{
|
|
int32_t header[3];
|
|
if (stream.read(header, sizeof(header)) != sizeof(header)) {
|
|
printf("-- Failed to read header (12 bytes)\n");
|
|
return nullptr;
|
|
}
|
|
printf("version:%d width:%d height:%d\n", header[0], header[1], header[2]);
|
|
}
|
|
|
|
stream.rewind();
|
|
SkPicture* pic = SkPicture::CreateFromStream(&stream, &sk_tools::LazyDecodeBitmap);
|
|
if (nullptr == pic) {
|
|
SkDebugf("Could not create SkPicture: %s\n", path);
|
|
return nullptr;
|
|
}
|
|
printf("picture cullRect: [%f %f %f %f]\n",
|
|
pic->cullRect().fLeft, pic->cullRect().fTop,
|
|
pic->cullRect().fRight, pic->cullRect().fBottom);
|
|
return pic;
|
|
}
|
|
|
|
static void dumpOps(SkPicture* pic) {
|
|
#ifdef SK_DEVELOPER
|
|
SkDebugfDumper dumper;
|
|
SkDumpCanvas canvas(&dumper);
|
|
canvas.drawPicture(pic);
|
|
#else
|
|
printf("SK_DEVELOPER mode not enabled\n");
|
|
#endif
|
|
}
|
|
|
|
int tool_main(int argc, char** argv);
|
|
int tool_main(int argc, char** argv) {
|
|
SkAutoGraphics ag;
|
|
if (argc < 2) {
|
|
printf("Usage: pinspect [--dump-ops] filename [filename ...]\n");
|
|
return 1;
|
|
}
|
|
|
|
bool doDumpOps = false;
|
|
|
|
int index = 1;
|
|
if (!strcmp(argv[index], "--dump-ops")) {
|
|
index += 1;
|
|
doDumpOps = true;
|
|
}
|
|
|
|
for (; index < argc; ++index) {
|
|
SkAutoTUnref<SkPicture> pic(inspect(argv[index]));
|
|
if (doDumpOps) {
|
|
dumpOps(pic);
|
|
}
|
|
if (index < argc - 1) {
|
|
printf("\n");
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#if !defined SK_BUILD_FOR_IOS
|
|
int main(int argc, char * const argv[]) {
|
|
return tool_main(argc, (char**) argv);
|
|
}
|
|
#endif
|