Update OTS to revision 6d2e08b

third_party/ots/test/side-by-side.cc

 // Copyright (c) 2009 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 <fcntl.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
 #include "opentype-sanitiser.h"
 #include "ots-memory-stream.h"
 
 namespace {
 
 void DumpBitmap(const FT_Bitmap *bitmap) {
-  for (int i = 0; i < bitmap->rows * bitmap->width; ++i) {
+  for (unsigned int i = 0; i < bitmap->rows * bitmap->width; ++i) {
     if (bitmap->buffer[i] > 192) {
       std::fprintf(stderr, "#");
     } else if (bitmap->buffer[i] > 128) {
       std::fprintf(stderr, "*");
     } else if (bitmap->buffer[i] > 64) {
       std::fprintf(stderr, "+");
     } else if (bitmap->buffer[i] > 32) {
       std::fprintf(stderr, ".");
     } else {
       std::fprintf(stderr, " ");
     }
 
     if ((i + 1) % bitmap->width == 0) {
       std::fprintf(stderr, "\n");
     }
   }
 }
 
 int CompareBitmaps(const FT_Bitmap *orig, const FT_Bitmap *trans) {
   int ret = 0;
 
   if (orig->width == trans->width &&
       orig->rows == trans->rows) {
-    for (int i = 0; i < orig->rows * orig->width; ++i) {
+    for (unsigned int i = 0; i < orig->rows * orig->width; ++i) {
       if (orig->buffer[i] != trans->buffer[i]) {
         std::fprintf(stderr, "bitmap data doesn't match!\n");
         ret = 1;
         break;
       }
     }
   } else {
     std::fprintf(stderr, "bitmap metrics doesn't match! (%d, %d), (%d, %d)\n",
                  orig->width, orig->rows, trans->width, trans->rows);
     ret = 1;
@@ skipping 214 matching lines @@
     std::fprintf(stderr, "Failed to sanitise file! %s\n", argv[1]);
     return 1;
   }
   const size_t trans_len = output.Tell();
 
   // perform side-by-side tests.
   return SideBySide(library, argv[1],
                     orig_font, orig_len,
                     trans_font, trans_len);
 }