packages: paragui/paragui.spec, paragui/SDL_Sint16.patch (NEW) - fix width ...

[glen]

Author: glen                         Date: Fri Aug  6 07:42:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix width errors:
  pgmultilineedit.cpp: In member function ‘void PG_MultiLineEdit::DrawText(const PG_Rect&)’:
  pgmultilineedit.cpp:102:55: error: narrowing conversion of ‘(((int)((PG_MultiLineEdit*)this)->PG_MultiLineEdit::<anonymous>.PG_LineEdit::<anonymous>.PG_ThemeWidget::<anonymous>.PG_Widget::<anonymous>.PG_Rect::<anonymous>.SDL_Rect::x) + x1)’ from ‘int’ to ‘Sint16’ inside { }

---- Files affected:
packages/paragui:
   paragui.spec (1.31 -> 1.32) , SDL_Sint16.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/paragui/paragui.spec
diff -u packages/paragui/paragui.spec:1.31 packages/paragui/paragui.spec:1.32
--- packages/paragui/paragui.spec:1.31	Fri Aug  6 00:29:34 2010
+++ packages/paragui/paragui.spec	Fri Aug  6 09:42:27 2010
@@ -14,6 +14,7 @@
 Patch3:		%{name}-pkg_sigc.patch
 Patch4:		%{name}-no_cairotest.patch
 Patch5:		gcc45.patch
+Patch6:		SDL_Sint16.patch
 URL:		http://savannah.nongnu.org/projects/paragui/
 BuildRequires:	SDL-devel >= 1.2.6
 BuildRequires:	SDL_image-devel >= 1.2.0
@@ -79,6 +80,7 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -137,6 +139,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/08/06 07:42:27  glen
+- fix width errors:
+  pgmultilineedit.cpp: In member function ‘void PG_MultiLineEdit::DrawText(const PG_Rect&)’:
+  pgmultilineedit.cpp:102:55: error: narrowing conversion of ‘(((int)((PG_MultiLineEdit*)this)->PG_MultiLineEdit::<anonymous>.PG_LineEdit::<anonymous>.PG_ThemeWidget::<anonymous>.PG_Widget::<anonymous>.PG_Rect::<anonymous>.SDL_Rect::x) + x1)’ from ‘int’ to ‘Sint16’ inside { }
+
 Revision 1.31  2010/08/05 22:29:34  glen
 - add c++ fixes, thanks pluto
 

================================================================
Index: packages/paragui/SDL_Sint16.patch
diff -u /dev/null packages/paragui/SDL_Sint16.patch:1.1
--- /dev/null	Fri Aug  6 09:42:33 2010
+++ packages/paragui/SDL_Sint16.patch	Fri Aug  6 09:42:27 2010
@@ -0,0 +1,32 @@
+--- paragui-1.1.8/src/widgets/pgmultilineedit.cpp~	2010-08-06 10:38:18.000000000 +0300
++++ paragui-1.1.8/src/widgets/pgmultilineedit.cpp	2010-08-06 10:38:20.371087056 +0300
+@@ -45,8 +45,8 @@
+ }
+ 
+ void PG_MultiLineEdit::DrawText(const PG_Rect& dst) {
+-	int _x = 3;
+-	int _y = 3; 
++	Sint16 _x = 3;
++	Sint16 _y = 3; 
+ 
+ 	// should we draw the cursor ? 
+ 	if(IsCursorVisible()) { 
+@@ -63,7 +63,7 @@
+ 	int maxLines = my_height/GetFontSize() + 1;
+ 	int endpos, start, end;
+ 
+-	int x1 = 0;
++	Sint16 x1 = 0;
+ 	Uint16 w = 0;
+ 	int offset = 0;
+ 
+@@ -99,7 +99,8 @@
+ 			PG_Color inv_color(255 - color.r, 255 - color.g, 255 - color.b);			
+ 			SetFontColor(inv_color);
+ 			PG_FontEngine::GetTextSize(middlepart.c_str(), GetFont(), &w);
+-			SDL_Rect rect = {x + x1, y + _y, w, GetFontHeight()};
++			// XXX: where the fck is x and y defined
++			SDL_Rect rect = {(Sint16 )(x + x1), (Sint16)(y + _y), w, (Sint16 )GetFontHeight()};
+ 			SDL_Surface* screen = PG_Application::GetScreen();
+ 			SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, color.r, color.g, color.b));
+ 			PG_Widget::DrawText(x1, _y, middlepart.c_str());
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paragui/paragui.spec?r1=1.31&r2=1.32&f=u