--- a/scripts/compute-homography.py	Thu Jun 01 10:33:07 2017 -0400
+++ b/scripts/compute-homography.py	Thu Jun 01 14:54:11 2017 -0400
@@ -83,12 +83,7 @@
     homography, mask = cv2.findHomography(videoPts, worldPts) # method=0, ransacReprojThreshold=3
 elif args.tsaiCameraFilename is not None: # hack using PDTV
     from pdtv import TsaiCamera
-    f = storage.openCheck(args.tsaiCameraFilename, quitting = True)
-    content = storage.getLines(f)
-    cameraData = {}
-    for l in content:
-        tmp = l.split(':')
-        cameraData[tmp[0]] = float(tmp[1].strip().replace(',','.'))
+    cameraData = storage.loadPinholeCameraModel(args.tsaiCameraFilename)
     camera = TsaiCamera(Cx=cameraData['Cx'], Cy=cameraData['Cy'], Sx=cameraData['Sx'], Tx=cameraData['Tx'], Ty=cameraData['Ty'], Tz=cameraData['Tz'], dx=cameraData['dx'], dy=cameraData['dy'], f=cameraData['f'], k=cameraData['k'], r1=cameraData['r1'], r2=cameraData['r2'], r3=cameraData['r3'], r4=cameraData['r4'], r5=cameraData['r5'], r6=cameraData['r6'], r7=cameraData['r7'], r8=cameraData['r8'], r9=cameraData['r9'])
     homography = cvutils.computeHomographyFromPDTV(camera)
 elif args.videoFrameFilename is not None and args.worldFilename is not None: