Update ICU to 54.1 step 1

source/test/letest/SimpleFontInstance.cpp

 /*
  *******************************************************************************
  *
- *   Copyright (C) 1999-2013, International Business Machines
+ *   Copyright (C) 1999-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  SimpleFontInstance.cpp
  *
  *   created on: 03/30/2006
  *   created by: Eric R. Mader
  */
 
 #include "unicode/utypes.h"
 #include "unicode/uchar.h"
 
 #include "layout/LETypes.h"
 #include "layout/LEFontInstance.h"
 
+#ifndef USING_ICULEHB
 #include "CanonShaping.h"
+#endif
+
 #include "SimpleFontInstance.h"
 
 SimpleFontInstance::SimpleFontInstance(float pointSize, LEErrorCode &status)
     : fPointSize(pointSize), fAscent(0), fDescent(0)
 {
     if (LE_FAILURE(status)) {
         return;
     }
 
     fAscent  = (le_int32) yUnitsToPoints(2000.0);
     fDescent = (le_int32) yUnitsToPoints(600.0);
 
     return;
 }
 
 SimpleFontInstance::~SimpleFontInstance()
 {
     // nothing to do...
 }
 
 const void *SimpleFontInstance::getFontTable(LETag tableTag) const
 {
+#ifndef USING_ICULEHB
     if (tableTag == LE_GSUB_TABLE_TAG) {
         return CanonShaping::glyphSubstitutionTable;
     }
     
     if (tableTag == LE_GDEF_TABLE_TAG) {
         return CanonShaping::glyphDefinitionTable;
     }
-
+#endif
     return NULL;
 }
 
 void SimpleFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
 {
 #if 0
     if (u_getCombiningClass((UChar32) glyph) == 0) {
         advance.fX = xUnitsToPoints(2048);
     } else {
         advance.fX = 0;
     }
 #else
+    (void)glyph;  // Suppress unused parameter compiler warning.
     advance.fX = xUnitsToPoints(2048);
 #endif
 
     advance.fY = 0;
 }
 
 le_int32 SimpleFontInstance::getUnitsPerEM() const
 {
     return 2048;
 }
@@ skipping 50 matching lines @@
 float SimpleFontInstance::getScaleFactorY() const
 {
     return 1.0;
 }
 
 le_bool SimpleFontInstance::getGlyphPoint(LEGlyphID /*glyph*/, le_int32 /*pointNumber*/, LEPoint &/*point*/) const
 {
     return FALSE;
 }