added wasm for blingfire, removed old pregenerated VC projects

blingfireclient.library/inc/FAConfig.h

@@ -77,6 +77,9 @@
 #define HANDLE void*
 #endif
 
+#include <stdint.h>
+
+/* because we have stdint.h 
 #ifndef __int32
 #define __int32 int32_t
 #endif
@@ -96,6 +99,8 @@
 #ifndef uint8_t
 #define uint8_t u_int8_t
 #endif
+*/
+
 
 #ifndef __fallthrough
 #define __fallthrough

blingfiretools/blingfiretokdll/blingfiretokdll.cpp

@@ -782,20 +782,15 @@ const int TextToHashes(const char * pInUtf8Str, int InUtf8StrByteCount, int32_t
 
 
 //
-// Loads a model and return a handle.
-// Returns 0 in case of an error.
+// Helper, sets up pNewModelData object with model data from memory
+// Returns 0 in case of an error otherwise initialized pNewModelData object is returned
 //
 extern "C"
-void* LoadModel(const char * pszLdbFileName)
+void* SetModelData(FAModelData * pNewModelData, const unsigned char * pImgBytes)
 {
-    FAModelData * pNewModelData = new FAModelData();
     if (NULL == pNewModelData) {
         return 0;
     }
-
-    // load the bin file
-    pNewModelData->m_Img.Load (pszLdbFileName);
-    const unsigned char * pImgBytes = pNewModelData->m_Img.GetImageDump ();
     if (NULL == pImgBytes) {
         return 0;
     }
@@ -844,6 +839,52 @@ void* LoadModel(const char * pszLdbFileName)
 }
 
 
+//
+// Same as LoadModel except a model is created from a memory pointer
+// Returns 0 in case of an error
+//
+extern "C"
+void* SetModel(const unsigned char * pImgBytes, int ModelByteCount)
+{
+    FAModelData * pNewModelData = new FAModelData();
+    if (NULL == pNewModelData) {
+        return 0;
+    }
+
+    // load the bin file
+    if (NULL == pImgBytes || 0 == ModelByteCount) {
+        return 0;
+    }
+
+    // return the initialized model handle
+    return SetModelData(pNewModelData, pImgBytes);
+}
+
+
+//
+// Loads a model and return a handle.
+// Returns 0 in case of an error.
+//
+extern "C"
+void* LoadModel(const char * pszLdbFileName)
+{
+    FAModelData * pNewModelData = new FAModelData();
+    if (NULL == pNewModelData) {
+        return 0;
+    }
+
+    // load the bin file
+    pNewModelData->m_Img.Load (pszLdbFileName);
+    const unsigned char * pImgBytes = pNewModelData->m_Img.GetImageDump ();
+    if (NULL == pImgBytes) {
+        return 0;
+    }
+
+    // return the initialized model handle
+    return SetModelData(pNewModelData, pImgBytes);
+}
+
+
 //
 // Implements a word-piece algorithm. Returns ids of words or sub-words, returns upto MaxIdsArrLength ids,
 // the rest of the array is unchanged, so the array can be set to initial length and fill with 0's for padding.

blingfiretools/blingfiretokdll/blingfiretokdll.def

@@ -21,4 +21,4 @@ EXPORTS
     TextToIdsWithOffsets_wp
     TextToIdsWithOffsets
     NormalizeSpaces
-
+    SetModel