rpms/subtitleeditor/F-12 subtitleeditor-0.36.2-segfault.patch, 1.1, 1.2 subtitleeditor.spec, 1.14, 1.15

[Martin Sourada]

Author: mso

Update of /cvs/pkgs/rpms/subtitleeditor/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12874/F-12

Modified Files:
	subtitleeditor-0.36.2-segfault.patch subtitleeditor.spec 
Log Message:


Updated patch for rhbz #583343.



subtitleeditor-0.36.2-segfault.patch:
 waveformrenderercairo.cc |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Index: subtitleeditor-0.36.2-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-12/subtitleeditor-0.36.2-segfault.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- subtitleeditor-0.36.2-segfault.patch	8 Jun 2010 13:28:07 -0000	1.1
+++ subtitleeditor-0.36.2-segfault.patch	24 Jun 2010 09:35:34 -0000	1.2
@@ -1,30 +1,40 @@
 Index: src/we/waveformrenderercairo.cc
 ===================================================================
---- src/we/waveformrenderercairo.cc	(révision 714)
+--- src/we/waveformrenderercairo.cc	(révision 724)
 +++ src/we/waveformrenderercairo.cc	(copie de travail)
-@@ -521,7 +521,7 @@
+@@ -539,6 +539,8 @@
+ 	cr->fill();
+ 	*/
  
- 	int width = get_width();
++	se_debug_message(SE_DEBUG_WAVEFORM, "init drawing values");
++
+ 	double skip = 4;
  
--	/*
-+	
- 	double skip = (double)(width * zoom()) / peaks.size();
+ 	double begin = peaks.size() * ((double)get_start_area() / (width * zoom()));
+@@ -548,12 +550,15 @@
  
- 	double x = 0;
-@@ -537,7 +537,7 @@
- 	}
- 	cr->line_to(x, bottom);
- 	cr->fill();
--	*/
-+	/*
+ 	double x = begin;
+ 	
++	se_debug_message(SE_DEBUG_WAVEFORM, "start drawing peaks");
++
+ 	cr->line_to(0, bottom);
+ 	for(int t=0; t<length; t+=skip, x+=move)
+ 	{
+-		if((int)x > peaks_size)
++		int px = (int)x;
++		if(px > peaks_size)
+ 			break;
+-		double peakOnScreen = peaks[(int)x] * scale_value;
++		double peakOnScreen = peaks[px] * scale_value;
  
- 	double skip = 4;
+ 		peakOnScreen = CLAMP(peakOnScreen, 0, bottom);
  
-@@ -561,6 +561,7 @@
+@@ -561,6 +566,8 @@
  	}
  	cr->line_to(length, bottom);
  	cr->fill();
-+	*/
++
++	se_debug_message(SE_DEBUG_WAVEFORM, "end of drawing peaks");
  }
  
  /*


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-12/subtitleeditor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- subtitleeditor.spec	8 Jun 2010 13:28:07 -0000	1.14
+++ subtitleeditor.spec	24 Jun 2010 09:35:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           subtitleeditor
 Version:        0.36.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
@@ -99,6 +99,9 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Mon Jun 21 2010 Martin Sourada <mso at fedoraproject.org> - 0.36.2-2
+- Updated patch for rhbz #583343 (upstream #16016)
+
 * Sun Jun 06 2010 Martin Sourada <mso at fedoraproject.org> - 0.36.2-1
 - New subtitle format SBV
 - Build with gl waveform renderer now works, we'll keep Cairo based one though