From: handa <handa>
Date: Sat, 21 May 2005 01:09:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-0-9-5~70
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35bbdcc867fc2872dde2bbd1b74e452a849066c;p=m17n%2Flibotf.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index f784aa2..5dae7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-21  Kenichi Handa  <handa@m17n.org>
+
+	* src/otfopen.c (OTF_get_features): If table_info doesn't have
+	stream nor address, return -1.
+
 2005-05-19  Kenichi Handa  <handa@m17n.org>
 
 	* src/otf.h (OTF_get_scripts, OTF_get_features,
diff --git a/src/otfopen.c b/src/otfopen.c
index 7385805..14e6b82 100644
--- a/src/otfopen.c
+++ b/src/otfopen.c
@@ -244,7 +244,7 @@ enum OTF_ReaderFlag
     OTF_READ_FULL,
     OTF_READ_SCRIPTS,
     OTF_READ_FEATURES,
-    OTF_READ_MAX,
+    OTF_READ_MAX
   };
 
 struct _OTF_TableInfo;
@@ -2898,8 +2898,12 @@ OTF_get_features (OTF *otf, int gsubp)
   if (! table_info->reader)
     return -1;
   if (! table_info->stream)
-    /* Already fully loaded.  */
-    return 0;
+    {
+      if (*table_info->address)
+	/* Already fully loaded.  */
+	return 0;
+      return -1;
+    }
 
   address = (*table_info->reader) (otf, table_info, OTF_READ_FEATURES);
   if (! address)