Merge branch 'master' of github.com:pauldb89/cdec

2 files changed, 11 insertions, 1 deletions

diff --git a/utils/filelib.h b/utils/filelib.h
index bb6e7415..b9ea3940 100644
--- a/utils/filelib.h
+++ b/utils/filelib.h
@@ -27,7 +27,7 @@ struct BaseFile {
   }
   bool is_null() const { return !ps_; }
   operator bool() const {
-    return ps_;
+    return ps_.get();
   }
   S* stream() { return ps_.get(); }
   S* operator->() { return ps_.get(); } // compat with old ReadFile * -> new Readfile. remove?
diff --git a/utils/stringlib.h b/utils/stringlib.h
index ff5dc89d..1bb533d8 100644
--- a/utils/stringlib.h
+++ b/utils/stringlib.h
@@ -268,6 +268,16 @@ inline unsigned int UTF8Len(unsigned char x) {
   else return 0;
 }
 
+inline unsigned int UTF8StringLen(const std::string& x) {
+  unsigned pos = 0;
+  int len = 0;
+  while(pos < x.size()) {
+    ++len;
+    pos += UTF8Len(x[pos]);
+  }
+  return len;
+}
+
 std::string md5(const std::string& in);
 
 #endif