commit 08d206be460fc90776a9b6fccd0b651d012bc742
author Mike Reed <reed@google.com> Mon Jul 19 16:46:11 2021 -0400
committer Mike Reed <reed@google.com> Tue Jul 20 00:11:39 2021 +0000
tree 7727393d9bfa9bc5c8d678fdd9d83c06a85d62d5
parent 8aec124cf0e2b9fd4839c35d221f6a05bef3c576

Print out picture version even if its unsupported

Change-Id: I1dd61924f7b72cdae1cc0cf530e39b052ae19add
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430216
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkPicture.cpp

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 5542fca..b504de8 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -93,11 +93,12 @@
     if (!stream->readScalar(&info.fCullRect.fRight )) { return false; }
     if (!stream->readScalar(&info.fCullRect.fBottom)) { return false; }
 
-    if (!IsValidPictInfo(info)) { return false; }
-
-    if (pInfo) { *pInfo = info; }
-    return true;
+    if (pInfo) {
+        *pInfo = info;
+    }
+    return IsValidPictInfo(info);
 }
+
 bool SkPicture_StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
     return SkPicture::StreamIsSKP(stream, pInfo);
 }

tools/skpinfo.cpp

diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp
index 2fa2831..79dbaf3 100644
--- a/tools/skpinfo.cpp
+++ b/tools/skpinfo.cpp
@@ -54,6 +54,7 @@
 
     SkPictInfo info;
     if (!SkPicture_StreamIsSKP(&stream, &info)) {
+        SkDebugf("Unsupported version %d\n", info.getVersion());
         return kNotAnSKP;
     }