From 5ce0a89bb6e9eeda38f40ba3004ca13d10c7a96c Mon Sep 17 00:00:00 2001
From: rep <rep@314r.net>
Date: Fri, 27 Nov 2015 19:03:32 +0100
Subject: [PATCH] correstion diverses

---
 video2d.py | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/video2d.py b/video2d.py
index ef42a3e..5ca8287 100644
--- a/video2d.py
+++ b/video2d.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 # coding: utf-8
 
-<<<<<<< HEAD
 '''
 ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
 '''
@@ -9,10 +8,6 @@ ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
 import sys 		# sys.argv[]
 import Image 	# Image.open()
 import os 		# os.getcwd
-=======
-import sys
-import Image
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
 
 '''
 im1 = Image.open(str(sys.argv[1]))
@@ -35,13 +30,12 @@ for x in range(1,allongement+1):
     print('%03.1i' % x)
 '''
 
-<<<<<<< HEAD
 script = os.getcwd()
 print script
 
 index = 1
-allongement = 10	#4818
-im1 = Image.open("./captain/img001.jpg")
+allongement = 16	#4818
+im1 = Image.open("./capt/img001.jpg")
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]*allongement))
 largeur = im1.size[0]
 hauteur = im1.size[1]
@@ -51,37 +45,22 @@ positiony = 0
 for x in range(0,allongement):	
 	positionx = 0
 
-	for y in range(1,11):
+	for y in range(1,17):
 		z = x*10 + y
-		im1 = Image.open("./captain/img%03.1i.jpg" % z)
-		print "z="+str(z)
+		im1 = Image.open("./capt/img%03.1i.jpg" % z)
+		#print "z="+str(z)
 		im2.paste(im1, (positionx,positiony))
 		#print position
 		#print("./drone/img%03.1i.jpg" % x)
 		positionx = positionx + largeur
-		print "px"+str(positionx)
+		#print "px"+str(positionx)
 	positiony = positiony + hauteur
-	print "py"+str(positiony)
+	#print "py"+str(positiony)
 	#scriptpy = str(sys.argv[1])
 	#script = scriptpy[:-3]
 
 im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 '''
 1145  ffmpeg -i noir...png.mp4 noir...png.enscribe.norm.wav -c:a copy -c:v copy noir..HQ..mp4
  1146  ffmpeg -i noir...png.mp4 -i noir...png.enscribe.norm.wav -c:a copy -c:v copy noir..HQ..mp4
@@ -123,14 +102,12 @@ im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
  1975  ffmpeg -i drone.mp4 
  2006  history | grep ffmpeg
  2009  history | grep ffmpeg
+'''
 
 '''
-=======
-
 index = 1
 allongement = 300      #4818
 
-
 im1 = Image.open("./drone/img001.jpg")
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
 
@@ -149,5 +126,4 @@ for x in range(0,allongement/10):
 	scriptpy = str(sys.argv[1])
 	script = scriptpy[:-3]
 	im2.save(script+"_"+str(x)+".png",'PNG', quality=100)
-
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
+'''