ICU 56 update step 1

source/test/letest/PortableFontInstance.cpp

 /*
  *******************************************************************************
  *
- *   Copyright (C) 1999-2013, International Business Machines
+ *   Copyright (C) 1999-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  PortableFontInstance.cpp
  *
  *   created on: 11/22/1999
  *   created by: Eric R. Mader
  */
 
 #include <stdio.h>
@@ skipping 75 matching lines @@
 
     if (fFile == NULL) {
         printf("%s:%d: %s: FNF\n", __FILE__, __LINE__, fileName);
         status = LE_FONT_FILE_NOT_FOUND_ERROR;
         return;
     }
 
     // read in the directory
     SFNTDirectory tempDir;
 
-    fread(&tempDir, sizeof tempDir, 1, fFile);
+    size_t numRead = fread(&tempDir, sizeof tempDir, 1, fFile);
+    (void)numRead;
 
     le_int32 dirSize = sizeof tempDir + ((SWAPW(tempDir.numTables) - ANY_NUMBER) * sizeof(DirectoryEntry));
     const LETag headTag = LE_HEAD_TABLE_TAG;
     const LETag hheaTag = LE_HHEA_TABLE_TAG;
     const HEADTable *headTable = NULL;
     const HHEATable *hheaTable = NULL;
 //  const NAMETable *nameTable = NULL;
     le_uint16 numTables = 0;
 
     fDirectory = (const SFNTDirectory *) LE_NEW_ARRAY(char, dirSize);
 
     if (fDirectory == NULL) {
         printf("%s:%d: %s: malloc err\n", __FILE__, __LINE__, fileName);
         status = LE_MEMORY_ALLOCATION_ERROR;
         goto error_exit;
     }
 
     fseek(fFile, 0L, SEEK_SET);
-    fread((void *) fDirectory, sizeof(char), dirSize, fFile);
+    numRead = fread((void *) fDirectory, sizeof(char), dirSize, fFile);
 
     //
     // We calculate these numbers 'cause some fonts
     // have bogus values for them in the directory header.
     //
     numTables = SWAPW(fDirectory->numTables);
     fDirPower = 1 << highBit(numTables);
     fDirExtra = numTables - fDirPower;
 
     // read unitsPerEm from 'head' table
@@ skipping 105 matching lines @@
         *length = 0;
         return NULL;
     }
 
     *length = SWAPL(entry->length);
 
     void *table = LE_NEW_ARRAY(char, *length);
 
     if (table != NULL) {
         fseek(fFile, SWAPL(entry->offset), SEEK_SET);
-        fread(table, sizeof(char), *length, fFile);
+        size_t numRead = fread(table, sizeof(char), *length, fFile);
+        (void)numRead;
     }
 
     return table;
 }
 
-const void *PortableFontInstance::getFontTable(LETag tableTag) const
-{
-  size_t ignored;
-  return getFontTable(tableTag, ignored);
-}
-
 const void *PortableFontInstance::getFontTable(LETag tableTag, size_t &length) const
 {
   return FontTableCache::find(tableTag, length);
 }
 
 const void *PortableFontInstance::readFontTable(LETag tableTag, size_t &length) const
 {
     le_uint32 len;
 
     const void *data= readTable(tableTag, &len);
@@ skipping 205 matching lines @@
 
 float PortableFontInstance::getScaleFactorX() const
 {
     return 1.0;
 }
 
 float PortableFontInstance::getScaleFactorY() const
 {
     return 1.0;
 }