--- a/scripts/compute-homography.py	Wed Apr 08 16:07:15 2015 +0200
+++ b/scripts/compute-homography.py	Thu Apr 09 13:11:25 2015 +0200
@@ -81,15 +81,16 @@
     worldPts, videoPts = cvutils.loadPointCorrespondences(args.pointCorrespondencesFilename)
     homography, mask = cv2.findHomography(videoPts, worldPts) # method=0, ransacReprojThreshold=3
 elif args.tsaiCameraFilename is not None: # hack using PDTV
+    from StringIO import StringIO
+    from pdtv import TsaiCamera
+    import yaml
     f = storage.openCheck(args.tsaiCameraFilename, quitting = True)
     content = storage.getLines(f)
-    outFilename = '/tmp/camera.yaml'
-    out = storage.openCheck(outFilename, 'w')
-    out.write('data_class: TsaiCamera\n')
-    for l in content:
-        out.write(l.replace(' f:', 'f:').replace(' k:', 'k:').replace(',','.')+'\n')
-    out.close()
-    homography = cvutils.computeHomographyFromPDTV(outFilename)
+    #out.write('data_class: TsaiCamera\n')
+    yamlContent = ''.join([l.replace(' f:', 'f:').replace(' k:', 'k:').replace(',','.')+'\n' for l in content])
+    cameraData = yaml.load(StringIO(yamlContent))
+    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:
     worldImg = plt.imread(args.worldFilename)
     videoImg = plt.imread(args.videoFrameFilename)