ICU-62107.0.1.tar.gz

[apple/icu.git] / icuSources / samples / layout / GnomeFontMap.cpp

diff --git a/icuSources/samples/layout/GnomeFontMap.cpp b/icuSources/samples/layout/GnomeFontMap.cpp
index e189db28971b1dbcaf7385e0dd787e3796b7fafc..7895dd82d2f841327d59ffc9a2e8273dc2d00963 100644 (file)
--- a/icuSources/samples/layout/GnomeFontMap.cpp
+++ b/icuSources/samples/layout/GnomeFontMap.cpp
@@ -1,13 +1,18 @@
 /*
  ******************************************************************************
- * Copyright (C) 1998-2003, International Business Machines Corporation and   *
+ * © 2016 and later: Unicode, Inc. and others.                    *
+ * License & terms of use: http://www.unicode.org/copyright.html#License      *
+ ******************************************************************************
+ ******************************************************************************
+ * Copyright (C) 1998-2006, International Business Machines Corporation and   *
  * others. All Rights Reserved.                                               *
  ******************************************************************************
  */
 
 #include <stdio.h>
 
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #include "layout/LEFontInstance.h"
 #include "GnomeFontInstance.h"
@@ -16,7 +21,7 @@
 #include "FontMap.h"
 #include "GnomeFontMap.h"
 
-GnomeFontMap::GnomeFontMap(TT_Engine engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status)
+GnomeFontMap::GnomeFontMap(FT_Library engine, const char *fileName, le_int16 pointSize, GUISupport *guiSupport, LEErrorCode &status)
     : FontMap(fileName, pointSize, guiSupport, status), fEngine(engine)
 {
     // nothing to do?
@@ -29,5 +34,12 @@ GnomeFontMap::~GnomeFontMap()
 
 const LEFontInstance *GnomeFontMap::openFont(const char *fontName, le_int16 pointSize, LEErrorCode &status)
 {
-    return new GnomeFontInstance(fEngine, fontName, pointSize, status);
+    LEFontInstance *result = new GnomeFontInstance(fEngine, fontName, pointSize, status);
+
+    if (LE_FAILURE(status)) {
+      delete result;
+      result = NULL;
+    }
+
+    return result;
 }