fix for issue #364

webarkit · Dec 20, 2023 · e114e44 · e114e44
1 parent dc4a3e6
commit e114e44
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 93 deletions.
diff --git a/build/artoolkitNFT.debug.js b/build/artoolkitNFT.debug.js
@@ -57891,6 +57891,85 @@ function create_colorindex($0) {
  }
 }
 
+function arLogv($0, $1, $2, $3) {
+ var $4 = 0, $5 = 0, $6 = 0, $7 = 0;
+ $4 = __stack_pointer - 16 | 0;
+ __stack_pointer = $4;
+ HEAP32[$4 + 12 >> 2] = $3;
+ label$1: {
+  if (!HEAPU8[$2 | 0] | (!$2 | HEAP32[18052] > ($1 | 0))) {
+   break label$1;
+  }
+  $0 = HEAP32[$4 + 12 >> 2];
+  HEAP32[$4 + 8 >> 2] = $0;
+  $3 = 0;
+  $5 = vsnprintf(0, 0, $2, $0);
+  if (!$5) {
+   break label$1;
+  }
+  if ($1 >>> 0 <= 3) {
+   $3 = strlen(HEAP32[($1 << 2) + 18720 >> 2]) + 3 | 0;
+  }
+  $6 = $3 + $5 | 0;
+  $7 = $6 + 1 | 0;
+  $0 = dlmalloc($7);
+  if ($3) {
+   HEAP32[$4 >> 2] = HEAP32[($1 << 2) + 18720 >> 2];
+   snprintf($0, $3 + 1 | 0, 4398, $4);
+  }
+  vsnprintf($3 + $0 | 0, $5 + 1 | 0, $2, HEAP32[$4 + 12 >> 2]);
+  label$4: {
+   label$5: {
+    $2 = HEAP32[18932];
+    if ($2) {
+     if (!HEAP32[18933]) {
+      break label$5;
+     }
+     if ((__pthread_self_internal() | 0) != HEAP32[18934]) {
+      $1 = HEAP32[18935];
+      if (!$1) {
+       break label$4;
+      }
+      $2 = HEAP32[18937];
+      $3 = HEAPU8[75744] ? 4096 : 0;
+      if ($2 >>> 0 >= $3 >>> 0) {
+       break label$4;
+      }
+      $1 = $1 + $2 | 0;
+      if (($3 - $2 | 0) - 4 >>> 0 >= $6 >>> 0) {
+       strncpy($1, $0, $7);
+       HEAP32[18937] = $2 + $6;
+       break label$4;
+      }
+      HEAP8[$1 | 0] = 46;
+      HEAP8[$1 + 1 | 0] = 46;
+      HEAP8[$1 + 2 | 0] = 46;
+      HEAP8[$1 + 3 | 0] = 0;
+      HEAP32[18937] = $3;
+      break label$4;
+     }
+     if (!HEAP32[18937]) {
+      break label$5;
+     }
+     FUNCTION_TABLE[$2 | 0](HEAP32[18935]);
+     HEAP32[18937] = 0;
+     $2 = HEAP32[18932];
+     break label$5;
+    }
+    if (($1 | 0) == 3) {
+     fputs($0, HEAP32[11604]);
+     break label$4;
+    }
+    fputs($0, HEAP32[11605]);
+    break label$4;
+   }
+   FUNCTION_TABLE[$2 | 0]($0);
+  }
+  dlfree($0);
+ }
+ __stack_pointer = $4 + 16 | 0;
+}
+
 function std____2____hash_table_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2____unordered_map_hasher_unsigned_20int_2c_20std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2__hash_unsigned_20int__2c_20std____2__equal_to_unsigned_20int__2c_20true__2c_20std____2____unordered_map_equal_unsigned_20int_2c_20std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2__equal_to_unsigned_20int__2c_20std____2__hash_unsigned_20int__2c_20true__2c_20std____2__allocator_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int________hash_table_28_29($0) {
  std____2____hash_table_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2____unordered_map_hasher_unsigned_20int_2c_20std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2__hash_unsigned_20int__2c_20std____2__equal_to_unsigned_20int__2c_20true__2c_20std____2____unordered_map_equal_unsigned_20int_2c_20std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20std____2__equal_to_unsigned_20int__2c_20std____2__hash_unsigned_20int__2c_20true__2c_20std____2__allocator_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int_______deallocate_node_28std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20void______29($0, HEAP32[$0 + 8 >> 2]);
  return std____2__unique_ptr_std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20void______20_5b_5d_2c_20std____2____bucket_list_deallocator_std____2__allocator_std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20void___________unique_ptr_5babi_v15007_5d_28_29($0);
@@ -59225,81 +59304,6 @@ function std____2__vector_std____2__vector_std____2__vector_std____2__pair_float
  std____2__vector_std____2__vector_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long____2c_20std____2__allocator_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long______2c_20std____2__allocator_std____2__vector_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long____2c_20std____2__allocator_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long___________base_destruct_at_end_5babi_v15007_5d_28std____2__vector_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long____2c_20std____2__allocator_std____2__vector_std____2__pair_float_2c_20unsigned_20long__2c_20std____2__allocator_std____2__pair_float_2c_20unsigned_20long_______29($0, HEAP32[$0 >> 2]);
 }
 
-function arLogv($0, $1, $2, $3) {
- var $4 = 0, $5 = 0, $6 = 0, $7 = 0;
- $4 = __stack_pointer - 16 | 0;
- __stack_pointer = $4;
- HEAP32[$4 + 12 >> 2] = $3;
- label$1: {
-  if (!HEAPU8[$2 | 0] | (!$2 | HEAP32[18052] > ($1 | 0))) {
-   break label$1;
-  }
-  $0 = HEAP32[$4 + 12 >> 2];
-  HEAP32[$4 + 8 >> 2] = $0;
-  $3 = 0;
-  $5 = vsnprintf(0, 0, $2, $0);
-  if (!$5) {
-   break label$1;
-  }
-  if ($1 >>> 0 <= 3) {
-   $3 = strlen(HEAP32[($1 << 2) + 18720 >> 2]) + 3 | 0;
-  }
-  $6 = $3 + $5 | 0;
-  $7 = $6 + 1 | 0;
-  $0 = dlmalloc($7);
-  if ($3) {
-   HEAP32[$4 >> 2] = HEAP32[($1 << 2) + 18720 >> 2];
-   snprintf($0, $3 + 1 | 0, 4398, $4);
-  }
-  vsnprintf($3 + $0 | 0, $5 + 1 | 0, $2, HEAP32[$4 + 12 >> 2]);
-  label$4: {
-   label$5: {
-    $2 = HEAP32[18932];
-    if ($2) {
-     if (!HEAP32[18933]) {
-      break label$5;
-     }
-     if ((__pthread_self_internal() | 0) != HEAP32[18934]) {
-      $1 = HEAP32[18935];
-      if (!$1) {
-       break label$4;
-      }
-      $2 = HEAP32[18937];
-      $3 = HEAPU8[75744] ? 4096 : 0;
-      if ($2 >>> 0 >= $3 >>> 0) {
-       break label$4;
-      }
-      $1 = $1 + $2 | 0;
-      if (($3 - $2 | 0) - 4 >>> 0 >= $6 >>> 0) {
-       strncpy($1, $0, $7);
-       HEAP32[18937] = $2 + $6;
-       break label$4;
-      }
-      HEAP8[$1 | 0] = 46;
-      HEAP8[$1 + 1 | 0] = 46;
-      HEAP8[$1 + 2 | 0] = 46;
-      HEAP8[$1 + 3 | 0] = 0;
-      HEAP32[18937] = $3;
-      break label$4;
-     }
-     if (!HEAP32[18937]) {
-      break label$5;
-     }
-     FUNCTION_TABLE[$2 | 0](HEAP32[18935]);
-     HEAP32[18937] = 0;
-     $2 = HEAP32[18932];
-     break label$5;
-    }
-    fputs($0, HEAP32[11604]);
-    break label$4;
-   }
-   FUNCTION_TABLE[$2 | 0]($0);
-  }
-  dlfree($0);
- }
- __stack_pointer = $4 + 16 | 0;
-}
-
 function std____2__pair_std____2____hash_map_iterator_std____2____hash_iterator_std____2____hash_node_std____2____hash_value_type_unsigned_20int_2c_20unsigned_20int__2c_20void______2c_20bool__20std____2__unordered_map_unsigned_20int_2c_20unsigned_20int_2c_20std____2__hash_unsigned_20int__2c_20std____2__equal_to_unsigned_20int__2c_20std____2__allocator_std____2__pair_unsigned_20int_20const_2c_20unsigned_20int_____insert_5babi_v15007_5d_std____2__pair_unsigned_20int_2c_20unsigned_20int__2c_20void__28std____2__pair_unsigned_20int_2c_20unsigned_20int____29($0, $1, $2) {
  var $3 = 0;
  $3 = __stack_pointer - 16 | 0;

diff --git a/build/artoolkitNFT.min.js b/build/artoolkitNFT.min.js
diff --git a/build/artoolkitNFT_ES6_wasm.js b/build/artoolkitNFT_ES6_wasm.js
diff --git a/build/artoolkitNFT_ES6_wasm.simd.js b/build/artoolkitNFT_ES6_wasm.simd.js
diff --git a/build/artoolkitNFT_ES6_wasm_td.js b/build/artoolkitNFT_ES6_wasm_td.js
diff --git a/build/artoolkitNFT_embed_ES6_wasm.js b/build/artoolkitNFT_embed_ES6_wasm.js
diff --git a/build/artoolkitNFT_thread.js b/build/artoolkitNFT_thread.js
diff --git a/build/artoolkitNFT_wasm.js b/build/artoolkitNFT_wasm.js
diff --git a/build/artoolkitNFT_wasm.simd.js b/build/artoolkitNFT_wasm.simd.js
diff --git a/dist/ARToolkitNFT.js b/dist/ARToolkitNFT.js
diff --git a/dist/ARToolkitNFT_simd.js b/dist/ARToolkitNFT_simd.js
diff --git a/dist/ARToolkitNFT_td.js b/dist/ARToolkitNFT_td.js
diff --git a/emscripten/WebARKitLib b/emscripten/WebARKitLib