Fixing SkPicture serialization

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 273 matching lines @@
     }
 
     if (pInfo != NULL) {
         *pInfo = info;
     }
     return true;
 }
 
 bool SkPicture::InternalOnly_BufferIsSKP(SkReadBuffer& buffer, SkPictInfo* pInfo) {
     // Check magic bytes.
-    char magic[sizeof(kMagic)];
+    char header[kHeaderSize];
 
-    if (!buffer.readByteArray(magic, sizeof(kMagic)) ||
-        (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
+    if (!buffer.readByteArray(header, kHeaderSize) ||
+        (0 != memcmp(header, kMagic, sizeof(kMagic)))) {
         return false;
     }
 
-    SkPictInfo info;
-    if (!buffer.readByteArray(&info, sizeof(SkPictInfo))) {
-        return false;
-    }
+    SkPictInfo* info = reinterpret_cast<SkPictInfo*>(header + sizeof(kMagic));
 
-    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
+    if (info->fVersion < MIN_PICTURE_VERSION || info->fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
 
     if (pInfo != NULL) {
-        *pInfo = info;
+        *pInfo = *info;
     }
     return true;
 }
 
 SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
     : fPlayback(playback)
     , fRecord(NULL)
     , fWidth(width)
     , fHeight(height) {}
 
@@ skipping 108 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif