Update h5_to_db.py

h5_to_db.py

@@ -113,7 +113,7 @@ def add_keypoints(db, h5_path, image_path, img_ext, camera_model, single_camera
 
 def add_matches(db, h5_path, fname_to_id):
     """
-    matches.h5から直接マッチを追加
+    matches.h5から直接マッチを追加（COLMAPフォーマット対応）
     """
     match_file = h5py.File(os.path.join(h5_path, 'matches.h5'), 'r')
     
@@ -122,18 +122,13 @@ def add_matches(db, h5_path, fname_to_id):
     
     with tqdm(total=n_keys, desc="Adding matches") as pbar:
         for pair_key in match_file.keys():
-            # pair_key = "image_000_image_001" の形式を分割
-            # "image_000_image_001" → ["image_000", "image_001"]
             parts = pair_key.split('_')
-            
-            # "image" + "000" + "image" + "001" → "image_000" と "image_001"
-            # 中央で分割（前半と後半に分ける）
             mid = len(parts) // 2
             key_1 = '_'.join(parts[:mid])
             key_2 = '_'.join(parts[mid:])
             
             if key_1 not in fname_to_id or key_2 not in fname_to_id:
-                print(f"Warning: {key_1} or {key_2} not found in fname_to_id")
+                print(f"Warning: {key_1} or {key_2} not found")
                 pbar.update(1)
                 continue
             
@@ -146,7 +141,21 @@ def add_matches(db, h5_path, fname_to_id):
                 continue
             
             matches = match_file[pair_key][()]
+            
+            # マッチが空でないか確認
+            if len(matches) == 0:
+                pbar.update(1)
+                continue
+            
+            # COLMAPのフォーマット: (N, 2) の uint32配列
+            matches = matches.astype(np.uint32)
+            
+            # マッチを追加
             db.add_matches(id_1, id_2, matches)
+            
+            # two_view_geometryも追加（COLMAPが期待する）
+            db.add_two_view_geometry(id_1, id_2, matches)
+            
             added.add(pair_id)
             pbar.update(1)