ttf2woff2 1.2.3 → 2.0.3

package/csrc/fallback.cc

@@ -1,33 +1,51 @@
 // Emscripten wrapper
-
+#include <emscripten/bind.h>
 #include <stdlib.h>
 #include "./woff2/woff2_enc.h"
 
+using namespace emscripten;
 using std::string;
 
-extern "C"
-{
+int getSizePtr() {
+  int* sizePtr = reinterpret_cast<int*>(calloc(1, sizeof(int)));
+  return reinterpret_cast<int>(sizePtr);
+}
 
-  char * convertTTFToWOFF2(char * input, int length, int * outputLength) {
+int convert(int inputDataAddress, int inputLength, int outputSizePtrAddress) {
+  int* outputSizePtr = reinterpret_cast<int*>(outputSizePtrAddress);
+  char* inputData = reinterpret_cast<char*>(inputDataAddress);
 
-    const uint8_t* input_data = reinterpret_cast<const uint8_t*>(input);
-    size_t output_size = woff2::MaxWOFF2CompressedSize(input_data, length);
+  size_t outputSize = woff2::MaxWOFF2CompressedSize(
+    reinterpret_cast<const uint8_t*>(inputData),
+    inputLength
+  );
 
-    uint8_t* output_data = reinterpret_cast<uint8_t*>(malloc(output_size));
+  uint8_t* outputData = reinterpret_cast<uint8_t*>(calloc(outputSize, sizeof(uint8_t)));
 
 
-    if (woff2::ConvertTTFToWOFF2(input_data, length,
-                                  output_data, &output_size)) {
-      //output.resize(output_size);
-    }
+  if(!woff2::ConvertTTFToWOFF2(
+    reinterpret_cast<const uint8_t*>(inputData),
+    inputLength,
+    outputData,
+    &outputSize
+  )) {
+    // throw an error
+  }
 
-    *outputLength = output_size;
+  *outputSizePtr = outputSize;
 
-    return (char *) output_data;
-  }
+  return reinterpret_cast<int>(outputData);
+}
 
-  void freeTTFToWOFF2(char * output_data) {
-    free(output_data);
-  }
+void freePtrs(int outputDataAddress, int sizePtrAddress) {
+  int* sizePtr = reinterpret_cast<int*>(sizePtrAddress);
+  char* outputData = reinterpret_cast<char*>(outputDataAddress);
+  free(outputData);
+  free(sizePtr);
+}
 
+EMSCRIPTEN_BINDINGS(ttf2woff2_fallback) {
+    function("getSizePtr", &getSizePtr, allow_raw_pointers());
+    function("convert", &convert, allow_raw_pointers());
+    function("freePtrs", &freePtrs, allow_raw_pointers());
 }

package/csrc/woff2/port.h

@@ -17,6 +17,8 @@
 #ifndef WOFF2_PORT_H_
 #define WOFF2_PORT_H_
 
+#include <assert.h>
+
 namespace woff2 {
 
 typedef unsigned int       uint32;

package/jssrc/index.js

@@ -3,20 +3,20 @@
 var theTTFToWOFF2Module = require('./ttf2woff2');
 
 module.exports = function ttf2woff2(inputContent) {
-  var outputSize;
-  var outputContent;
-  var outputBufferPtr;
-  var i;
 
   // Prepare input
   var inputBuffer = theTTFToWOFF2Module._malloc(inputContent.length + 1);
   var outputSizePtr = theTTFToWOFF2Module._malloc(4);
+  var outputBufferPtr;
+  var outputSize;
+  var outputContent;
+  var i;
 
   theTTFToWOFF2Module.writeArrayToMemory(inputContent, inputBuffer);
 
   // Run
-  outputBufferPtr = theTTFToWOFF2Module._convertTTFToWOFF2(
-    inputBuffer, inputContent.length + 1, outputSizePtr
+  outputBufferPtr = theTTFToWOFF2Module.convert(
+    inputBuffer, inputContent.length, outputSizePtr
   );
 
   // Retrieve output
@@ -27,9 +27,7 @@ module.exports = function ttf2woff2(inputContent) {
     outputContent[i] = theTTFToWOFF2Module.getValue(outputBufferPtr + i, 'i8');
   }
 
-  theTTFToWOFF2Module._free(inputBuffer);
-  theTTFToWOFF2Module._free(outputSizePtr);
-  theTTFToWOFF2Module._freeTTFToWOFF2(outputBufferPtr);
+  theTTFToWOFF2Module.freePtrs(outputBufferPtr, outputSizePtr);
 
   return outputContent;
 };