Browse code

correstion diverses

rep authored on 27/11/2015 18:03:32
Showing 1 changed files
... ...
@@ -1,7 +1,6 @@
1 1
 #!/usr/bin/python
2 2
 # coding: utf-8
3 3
 
4
-<<<<<<< HEAD
5 4
 '''
6 5
 ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
7 6
 '''
... ...
@@ -9,10 +8,6 @@ ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
9 9
 import sys 		# sys.argv[]
10 10
 import Image 	# Image.open()
11 11
 import os 		# os.getcwd
12
-=======
13
-import sys
14
-import Image
15
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
16 12
 
17 13
 '''
18 14
 im1 = Image.open(str(sys.argv[1]))
... ...
@@ -35,13 +30,12 @@ for x in range(1,allongement+1):
35 35
     print('%03.1i' % x)
36 36
 '''
37 37
 
38
-<<<<<<< HEAD
39 38
 script = os.getcwd()
40 39
 print script
41 40
 
42 41
 index = 1
43
-allongement = 10	#4818
44
-im1 = Image.open("./captain/img001.jpg")
42
+allongement = 16	#4818
43
+im1 = Image.open("./capt/img001.jpg")
45 44
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]*allongement))
46 45
 largeur = im1.size[0]
47 46
 hauteur = im1.size[1]
... ...
@@ -51,37 +45,22 @@ positiony = 0
51 51
 for x in range(0,allongement):	
52 52
 	positionx = 0
53 53
 
54
-	for y in range(1,11):
54
+	for y in range(1,17):
55 55
 		z = x*10 + y
56
-		im1 = Image.open("./captain/img%03.1i.jpg" % z)
57
-		print "z="+str(z)
56
+		im1 = Image.open("./capt/img%03.1i.jpg" % z)
57
+		#print "z="+str(z)
58 58
 		im2.paste(im1, (positionx,positiony))
59 59
 		#print position
60 60
 		#print("./drone/img%03.1i.jpg" % x)
61 61
 		positionx = positionx + largeur
62
-		print "px"+str(positionx)
62
+		#print "px"+str(positionx)
63 63
 	positiony = positiony + hauteur
64
-	print "py"+str(positiony)
64
+	#print "py"+str(positiony)
65 65
 	#scriptpy = str(sys.argv[1])
66 66
 	#script = scriptpy[:-3]
67 67
 
68 68
 im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
69 69
 
70
-
71
-
72
-
73
-
74
-
75
-
76
-
77
-
78
-
79
-
80
-
81
-
82
-
83
-
84
-
85 70
 '''
86 71
 1145  ffmpeg -i noir...png.mp4 noir...png.enscribe.norm.wav -c:a copy -c:v copy noir..HQ..mp4
87 72
  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)
123 123
  1975  ffmpeg -i drone.mp4 
124 124
  2006  history | grep ffmpeg
125 125
  2009  history | grep ffmpeg
126
-
127 126
 '''
128
-=======
129 127
 
128
+'''
130 129
 index = 1
131 130
 allongement = 300      #4818
132 131
 
133
-
134 132
 im1 = Image.open("./drone/img001.jpg")
135 133
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
136 134
 
... ...
@@ -149,5 +126,4 @@ for x in range(0,allongement/10):
149 149
 	scriptpy = str(sys.argv[1])
150 150
 	script = scriptpy[:-3]
151 151
 	im2.save(script+"_"+str(x)+".png",'PNG', quality=100)
152
-
153
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
152
+'''