[go: nahoru, domu]

This is intended to make it easier for us to be backwards compatible.

R=reed@google.com, bsalomon@google.com, mtklein@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/178383003

git-svn-id: http://skia.googlecode.com/svn/trunk/src@13575 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkPicture.cpp b/core/SkPicture.cpp
index b9b2442..b2c19e8 100644
--- a/core/SkPicture.cpp
+++ b/core/SkPicture.cpp
@@ -273,7 +273,7 @@
         return false;
     }
 
-    if (PICTURE_VERSION != info.fVersion) {
+    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
 
@@ -297,7 +297,7 @@
         return false;
     }
 
-    if (PICTURE_VERSION != info.fVersion) {
+    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
 
@@ -362,7 +362,7 @@
 
     // 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;