Split picture version into min & max supported versions

src/core/SkPicture.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 255 matching lines @@
     if (!stream->read(magic, sizeof(kMagic)) ||
         (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
         return false;
     }
 
     SkPictInfo info;
     if (!stream->read(&info, sizeof(SkPictInfo))) {
         return false;
     }
 
-    if (PICTURE_VERSION != info.fVersion) {
+    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
 
     if (pInfo != NULL) {
         *pInfo = info;
     }
     return true;
 }
 
 bool SkPicture::BufferIsSKP(SkReadBuffer& buffer, SkPictInfo* pInfo) {
     // Check magic bytes.
     char magic[sizeof(kMagic)];
 
     if (!buffer.readByteArray(magic, sizeof(kMagic)) ||
         (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
         return false;
     }
 
     SkPictInfo info;
     if (!buffer.readByteArray(&info, sizeof(SkPictInfo))) {
         return false;
     }
 
-    if (PICTURE_VERSION != info.fVersion) {
+    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
 
     if (pInfo != NULL) {
         *pInfo = info;
     }
     return true;
 }
 
 SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
@@ skipping 44 matching lines @@
     return SkNEW_ARGS(SkPicture, (playback, info.fWidth, info.fHeight));
 }
 
 void SkPicture::createHeader(void* header) const {
     // Copy magic bytes at the beginning of the header
     SkASSERT(sizeof(kMagic) == 8);
     memcpy(header, kMagic, sizeof(kMagic));
 
     // Set piture info after magic bytes in the header
     SkPictInfo* info = (SkPictInfo*)(((char*)header) + sizeof(kMagic));
-    info->fVersion = PICTURE_VERSION;
+    info->fVersion = CURRENT_PICTURE_VERSION;
     info->fWidth = fWidth;
     info->fHeight = fHeight;
     info->fFlags = SkPictInfo::kCrossProcess_Flag;
     // TODO: remove this flag, since we're always float (now)
     info->fFlags |= SkPictInfo::kScalarIsFloat_Flag;
 
     if (8 == sizeof(void*)) {
         info->fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
     }
 }
@@ skipping 48 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif