Bump min picture version.

tools/skpinfo.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"
@@ skipping 41 matching lines @@
 
     SkPictInfo info;
     if (!SkPicture::InternalOnly_StreamIsSKP(&stream, &info)) {
         return kNotAnSKP;
     }
 
     if (FLAGS_version && !FLAGS_quiet) {
         SkDebugf("Version: %d\n", info.fVersion);
     }
     if (FLAGS_cullRect && !FLAGS_quiet) {
-        SkDebugf("Cull Rect: %f,%f,%f,%f\n", 
-                 info.fCullRect.fLeft, info.fCullRect.fTop, 
+        SkDebugf("Cull Rect: %f,%f,%f,%f\n",
+                 info.fCullRect.fLeft, info.fCullRect.fTop,
                  info.fCullRect.fRight, info.fCullRect.fBottom);
     }
     if (FLAGS_flags && !FLAGS_quiet) {
         SkDebugf("Flags: 0x%x\n", info.fFlags);
     }
 
     if (!stream.readBool()) {
         // If we read true there's a picture playback object flattened
         // in the file; if false, there isn't a playback, so we're done
         // reading the file.
@@ skipping 25 matching lines @@
         switch (tag) {
         case SK_PICT_READER_TAG:
             if (FLAGS_tags && !FLAGS_quiet) {
                 SkDebugf("SK_PICT_READER_TAG %d\n", chunkSize);
             }
             break;
         case SK_PICT_FACTORY_TAG:
             if (FLAGS_tags && !FLAGS_quiet) {
                 SkDebugf("SK_PICT_FACTORY_TAG %d\n", chunkSize);
             }
-            // Remove this code when v21 and below are no longer supported
-#ifndef DISABLE_V21_COMPATIBILITY_CODE
-            if (info.fVersion < 22) {
-                if (!FLAGS_quiet) {
-                    SkDebugf("Exiting early due to format limitations\n");
-                }
-                return kSuccess;       // TODO: need to store size in bytes
-            }
-#endif
             break;
         case SK_PICT_TYPEFACE_TAG:
             if (FLAGS_tags && !FLAGS_quiet) {
                 SkDebugf("SK_PICT_TYPEFACE_TAG %d\n", chunkSize);
                 SkDebugf("Exiting early due to format limitations\n");
             }
             return kSuccess;       // TODO: need to store size in bytes
             break;
         case SK_PICT_PICTURE_TAG:
             if (FLAGS_tags && !FLAGS_quiet) {
@@ skipping 23 matching lines @@
     }
 
     return kSuccess;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif