Merge remote-tracking branch 'origin/main' into fix-video-rotation-90deg

Author: ig-14

.github/workflows/tabs.yml

@@ -0,0 +1,67 @@
+name: Check for Tabs
+on: [push, pull_request]
+
+jobs:
+  no-tabs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Fail if tabs are found in source files
+        # Exclude specific file types if necessary (e.g., binaries, .md files, etc.)
+        run: |
+          # Define folders to check
+          FOLDERS=("Common" "SerialPrograms")
+          
+          # Define file extensions to check
+          EXTENSIONS=("h" "c" "cpp" "tpp")
+          
+          echo "Searching for Git-tracked files with tabs..."
+          echo "Folders: ${FOLDERS[@]}"
+          echo "Extensions: ${EXTENSIONS[@]}"
+          echo ""
+          
+          # Build git ls-files patterns
+          PATTERNS=()
+          for folder in "${FOLDERS[@]}"; do
+            for ext in "${EXTENSIONS[@]}"; do
+              PATTERNS+=("$folder/**/*.$ext")
+            done
+          done
+          
+          # Get all matching Git-tracked files
+          ALL_FILES=$(git ls-files "${PATTERNS[@]}" 2>/dev/null | sort -u)
+          
+          if [ -z "$ALL_FILES" ]; then
+            echo "No Git-tracked source files found to check"
+            exit 0
+          fi
+          
+          echo "Found $(echo "$ALL_FILES" | wc -l) files to check"
+          echo ""
+          
+          # Check each file for tabs
+          FILES_WITH_TABS=""
+          while IFS= read -r file; do
+            if [ -f "$file" ] && grep -q $'\t' "$file" 2>/dev/null; then
+              FILES_WITH_TABS+="$file"$'\n'
+            fi
+          done <<< "$ALL_FILES"
+          
+          # Check results and print
+          if [ -n "$FILES_WITH_TABS" ]; then
+            echo "::error::The following files contain tabs:"
+            echo ""
+            echo "$FILES_WITH_TABS" | while IFS= read -r file; do
+              if [ -n "$file" ]; then
+                echo "  $file"
+                echo "::error file=$file::File contains tabs"
+              fi
+            done
+            echo ""
+            echo "Please replace tabs with spaces in the files listed above."
+            exit 1
+          else
+            echo "✓ No tabs found in any Git-tracked source files"
+          fi

.gitignore

@@ -61,4 +61,4 @@ __pycache__
 # Jupyter Notebooks
 *.ipynb
 
-
+CLAUDE.md

3rdPartyBinaries/onnxruntime.dll

@@ -171,27 +171,24 @@ JsonValue* JsonObject::get_value(const std::string& key){
 
 
 
-#if 0
-
 //  Read with defaults.
 
-bool JsonObject::to_boolean(const std::string& key, bool default_value) const{
+bool JsonObject::get_boolean_default(const std::string& key, bool default_value) const{
     read_boolean(default_value, key);
     return default_value;
 }
-int64_t JsonObject::to_integer(const std::string& key, int64_t default_value) const{
+int64_t JsonObject::get_integer_default(const std::string& key, int64_t default_value) const{
     read_integer(default_value, key);
     return default_value;
 }
-double JsonObject::to_double(const std::string& key, double default_value) const{
+double JsonObject::get_double_default(const std::string& key, double default_value) const{
     read_float(default_value, key);
     return default_value;
 }
-std::string JsonObject::to_string(const std::string& key, const char* default_value) const{
+std::string JsonObject::get_string_default(const std::string& key, const char* default_value) const{
     const std::string* str = get_string(key);
     return str == nullptr ? default_value : *str;
 }
-#endif
 
 
 

3rdPartyBinaries/onnxruntime.lib

@@ -69,13 +69,11 @@ class JsonObject{
     const JsonValue*    get_value   (const std::string& key) const;
           JsonValue*    get_value   (const std::string& key);
 
-#if 0
     //  Convert to the specified type. If the type doesn't match, return the default.
-    bool        to_boolean  (const std::string& key, bool default_value = false) const;
-    int64_t     to_integer  (const std::string& key, int64_t default_value = 0) const;
-    double      to_double   (const std::string& key, double default_value = 0) const;
-    std::string to_string   (const std::string& key, const char* default_value = "") const;
-#endif
+    bool        get_boolean_default (const std::string& key, bool default_value = false) const;
+    int64_t     get_integer_default (const std::string& key, int64_t default_value = 0) const;
+    double      get_double_default  (const std::string& key, double default_value = 0) const;
+    std::string get_string_default  (const std::string& key, const char* default_value = "") const;
 
     //  Attempt to read this value at the specified key.
     //  If the key exists and the type matches, the value is assigned to "value" and returns true.

3rdPartyBinaries/onnxruntime_providers_shared.dll

@@ -32,7 +32,11 @@ MemoryUsage process_memory_usage(){
             (PROCESS_MEMORY_COUNTERS*)&data,
             sizeof(data)
         )){
-            ret.process_physical_memory = data.PrivateWorkingSetSize;
+            if (data.cb >= sizeof(PROCESS_MEMORY_COUNTERS_EX2)){
+                ret.process_physical_memory = data.PrivateWorkingSetSize;
+            }else{
+                ret.process_physical_memory = data.WorkingSetSize;
+            }
             ret.process_virtual_memory = data.PagefileUsage;
         }
     }

Common/Cpp/Json/JsonObject.cpp

@@ -77,10 +77,6 @@ class ConfigOption{
     ConfigOption(LockMode lock_mode);
     ConfigOption(ConfigOptionState visibility);
 
-//    //  Deep copy this entire config. This will not copy listeners.
-//    //  Returns null if config cannot be copied.
-//    virtual std::unique_ptr<ConfigOption> clone() const = 0;
-
     virtual void load_json(const JsonValue& json);
     virtual JsonValue to_json() const;
 

Common/Cpp/Json/JsonObject.h

@@ -32,7 +32,7 @@ void panic_dump(const char* location, const char* message){
 
 
 void run_with_catch(const char* location, std::function<void()>&& lambda){
-#if 1
+#ifdef _WIN32
     lambda();
 #else
     try{
@@ -59,3 +59,4 @@ void run_with_catch(const char* location, std::function<void()>&& lambda){
 
 
 }
+