Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
kalwalt committed Jun 29, 2022
2 parents 6c93f29 + 211bbaa commit 9c63804
Showing 3 changed files with 12 additions and 7 deletions.
15 changes: 10 additions & 5 deletions build/artoolkitNFT.debug.js
Original file line number Diff line number Diff line change
@@ -69323,7 +69323,6 @@ function std____2__basic_string_char_2c_20std____2__char_traits_char__2c_20std__
std____2__basic_string_char_2c_20std____2__char_traits_char__2c_20std____2__allocator_char__20_____throw_length_error_28_29_20const($0);
abort();
}

function std____2__unique_ptr_vision__VisualDatabase_vision__FREAKExtractor_2c_20vision__BinaryFeatureStore_2c_20vision__BinaryFeatureMatcher_96__20__2c_20std____2__default_delete_vision__VisualDatabase_vision__FREAKExtractor_2c_20vision__BinaryFeatureStore_2c_20vision__BinaryFeatureMatcher_96__20__20__20___reset_28vision__VisualDatabase_vision__FREAKExtractor_2c_20vision__BinaryFeatureStore_2c_20vision__BinaryFeatureMatcher_96__20___29($0, $1) {
var $2 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
$2 = HEAP32[std____2____compressed_pair_vision__VisualDatabase_vision__FREAKExtractor_2c_20vision__BinaryFeatureStore_2c_20vision__BinaryFeatureMatcher_96__20___2c_20std____2__default_delete_vision__VisualDatabase_vision__FREAKExtractor_2c_20vision__BinaryFeatureStore_2c_20vision__BinaryFeatureMatcher_96__20__20__20___first_28_29($0) >> 2];
@@ -104203,10 +104202,6 @@ function std____2____compressed_pair_std____2__pair_float_2c_20unsigned_20long__
return std____2____compressed_pair_elem_std____2__pair_float_2c_20unsigned_20long___2c_200_2c_20false_____get_28_29_20const($0);
}

function std____2____compressed_pair_float_2c_20std____2____unordered_map_equal_int_2c_20std____2____hash_value_type_int_2c_20arController__2c_20std____2__equal_to_int__2c_20std____2__hash_int__2c_20true__20___first_28_29($0) {
return std____2____compressed_pair_elem_float_2c_200_2c_20false_____get_28_29($0);
}

function std____2____compressed_pair_elem_std____2____bucket_list_deallocator_std____2__allocator_std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_int_2c_20std____2__shared_ptr_vision__Keyframe_96__20__20__2c_20void_______20__2c_201_2c_20false_____get_28_29_20const($0) {
return $0;
}
@@ -107748,6 +107743,10 @@ function std____2__moneypunct_wchar_t_2c_20false___do_grouping_28_29_20const($0,
std____2__basic_string_char_2c_20std____2__char_traits_char__2c_20std____2__allocator_char__20___basic_string_28_29($0);
}

function std____2__moneypunct_char_2c_20true__20const__20std____2__use_facet_std____2__moneypunct_char_2c_20true__20__28std____2__locale_20const__29($0) {
return std____2__locale__use_facet_28std____2__locale__id__29_20const($0, 82e3);
}

function std____2__moneypunct_char_2c_20false___do_curr_symbol_28_29_20const($0, $1) {
$0 = $0 | 0;
$1 = $1 | 0;
@@ -115554,6 +115553,12 @@ function emscripten__internal__noncopyable___noncopyable_28_29($0) {
return $0;
}

function wctomb($0, $1) {
if (!$0) {
return 0;
}
return wcrtomb($0, $1, 0);
}
function vision__Image__height_28_29_20const($0) {
return HEAP32[$0 + 8 >> 2];
}
2 changes: 1 addition & 1 deletion dist/ARToolkitNFT.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ARToolkitNFT_simd.js

Large diffs are not rendered by default.

0 comments on commit 9c63804

Please sign in to comment.