Correctly handle reuse of screens in yaml file.

utility/bmpblk_utility.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Utility for manipulating firmware screen block (BMPBLOCK) in GBB.
 //
 
 #include "bmpblk_utility.h"
 
 #include <assert.h>
@@ skipping 458 matching lines @@
         config_.localizations[i].size());
   }
   config_.header.number_of_imageinfos = config_.images_map.size();
 }
 
 void BmpBlockUtil::pack_bmpblock() {
   bmpblock_.clear();
 
   /* Compute the ImageInfo offsets from start of BMPBLOCK. */
   uint32_t current_offset = sizeof(BmpBlockHeader) +
-                            sizeof(ScreenLayout) * config_.screens_map.size();
+    sizeof(ScreenLayout) * (config_.header.number_of_localizations *
+                            config_.header.number_of_screenlayouts);
   for (unsigned int i = 0; i < config_.image_names.size(); ++i) {
     string image_name = config_.image_names[i];
     ImageConfig &img = config_.images_map[image_name];
     img.offset = current_offset;
     current_offset += sizeof(ImageInfo) +
       config_.images_map[image_name].data.compressed_size;
     /* Make it 4-byte aligned. */
     if ((current_offset & 3) > 0) {
       current_offset = (current_offset & ~3) + 4;
     }
@@ skipping 190 matching lines @@
   else if (extract_mode) {
     return dump_bmpblock(bmpblock_fn, 1, extract_dir, overwrite);
   } else {
     return dump_bmpblock(bmpblock_fn, show_as_yaml, 0, 0);
   }
 
   return 0;
 }
 
 #endif  // WITH_UTIL_MAIN