Correct overlapping layout ranges.

src/layout.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "layout.h"
 
 #include <limits>
 #include <vector>
 
 #include "gdef.h"
@@ skipping 376 matching lines @@
   uint16_t last_start_coverage_index = 0;
   for (unsigned i = 0; i < range_count; ++i) {
     uint16_t start = 0;
     uint16_t end = 0;
     uint16_t start_coverage_index = 0;
     if (!subtable.ReadU16(&start) ||
         !subtable.ReadU16(&end) ||
         !subtable.ReadU16(&start_coverage_index)) {
       return OTS_FAILURE();
     }
-    if (start > end || (last_end && start <= last_end)) {
+
+    // Some of the Adobe Pro fonts have ranges that overlap by one element: the
+    // start of one range is equal to the end of the previous range. Therefore
+    // the < in the following condition should be <= were it not for this.
+    // See crbug.com/29937.

[bashi, 2012/06/25 22:23:31]

crbug.com/134135 ?

[agl, 2012/06/26 14:43:27]

Done. Thanks, that was the other bug that I was looking at.

+    if (start > end || (last_end && start < last_end)) {
       OTS_WARNING("glyph range is overlapping.");
       return OTS_FAILURE();
     }
     if (start_coverage_index != last_start_coverage_index) {
       OTS_WARNING("bad start coverage index.");
       return OTS_FAILURE();
     }
     last_end = end;
     last_start_coverage_index += end - start + 1;
   }
@@ skipping 1060 matching lines @@
   if (!parser->Parse(file, data + offset_extension, length - offset_extension,
                      lookup_type)) {
     return OTS_FAILURE();
   }
 
   return true;
 }
 
 }  // namespace ots