Read and write pixel offset when serializing bitmaps.

src/core/SkOrderedWriteBuffer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOrderedWriteBuffer.h"
 #include "SkBitmap.h"
@@ skipping 163 matching lines @@
         // The generation ID is not required information. We write it to prevent collisions
         // in SkFlatDictionary.  It is possible to get a collision when a previously
         // unflattened (i.e. stale) instance of a similar flattenable is in the dictionary
         // and the instance currently being written is re-using the same slot from the
         // bitmap heap.
         fWriter.write32(bitmap.getGenerationID());
         return;
     }
     if (fBitmapEncoder != NULL) {
         SkASSERT(NULL == fBitmapHeap);
-        size_t offset;
+        size_t offset = 0;
         SkAutoDataUnref data(fBitmapEncoder(&offset, bitmap));
         if (data.get() != NULL) {
             // Write the length to indicate that the bitmap was encoded successfully, followed
             // by the actual data.
             this->writeUInt(SkToU32(data->size()));
             fWriter.writePad(data->data(), data->size());
-#ifdef BUMP_PICTURE_VERSION
-            // Recording this fixes https://code.google.com/p/skia/issues/detail?id=1301, but
-            // also requires bumping PICTURE_VERSION, so leaving out for now.
             // Store the coordinate of the offset, rather than fPixelRefOffset, which may be
             // different depending on the decoder.
             int32_t x, y;
             if (0 == offset || !get_upper_left_from_offset(bitmap.config(), offset,
                                                            bitmap.rowBytes(), &x, &y)) {
                 x = y = 0;
             }
             this->write32(x);
             this->write32(y);
-#endif
             return;
         }
     }
     // Bitmap was not encoded. Record a zero, implying that the reader need not decode.
     this->writeUInt(0);
     bitmap.flatten(*this);
 }
 
 void SkOrderedWriteBuffer::writeTypeface(SkTypeface* obj) {
     if (NULL == obj || NULL == fTFSet) {
@@ skipping 95 matching lines @@
     // make room for the size of the flattened object
     (void)fWriter.reserve(sizeof(uint32_t));
     // record the current size, so we can subtract after the object writes.
     uint32_t offset = fWriter.size();
     // now flatten the object
     flattenObject(flattenable, *this);
     uint32_t objSize = fWriter.size() - offset;
     // record the obj's size
     *fWriter.peek32(offset - sizeof(uint32_t)) = objSize;
 }