Attachment #49999 for bug #76271

View | Details | Raw Unified | Return to bug 76271
Collapse All | Expand All

Lines 2-12 Link Here

(-)vym/Makefile (-2 / +2 lines)
2	# Date created: 17 Oct 2004	2	# Date created: 17 Oct 2004
3	# Whom: Gerrit Beine <tux@pinguru.net>	3	# Whom: Gerrit Beine <tux@pinguru.net>
4	#	4	#
5	# $FreeBSD: ports/deskutils/vym/Makefile,v 1.1 2004/10/22 15:20:32 tobez Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= vym	8	PORTNAME= vym
9	PORTVERSION= 1.5.0	9	PORTVERSION= 1.6.0
10	CATEGORIES= deskutils	10	CATEGORIES= deskutils
11	MASTER_SITES= http://www.insilmaril.de/vym/download/	11	MASTER_SITES= http://www.insilmaril.de/vym/download/
12	MASTER_SITE_SUBDIR= ${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION}

Lines 1-2 Link Here

(-)vym/distinfo (-2 / +2 lines)
1	MD5 (vym-1.5.0.tar.gz) = 3343b35d1b072e5359c76b9625a21cbb	1	MD5 (vym-1.6.0.tar.gz) = e0e2c6058c750d6429ee37652bc5f843
2	SIZE (vym-1.5.0.tar.gz) = 326937	2	SIZE (vym-1.6.0.tar.gz) = 538617




--- floatimageobj.cpp.orig	Tue Oct 19 18:31:12 2004
+++ floatimageobj.cpp	Sat Jan 15 12:25:08 2005
@@ -1,6 +1,6 @@
+#include <math.h>
 #include "floatimageobj.h"
 #include "branchobj.h"
-#include <math.h>
 
+#if !defined(HAVE_LRINTF)
+static inline long int lrint(double x)
+{
+    return (long)(rint(x));
+}
+#endif
 
 /////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@
 
 int FloatImageObj::z ()
 {
-	return lrint (icon->z());
+	return (long)rint (icon->z());
 }
 
 bool FloatImageObj::load (const QString &fn)




--- linkablemapobj.cpp.orig	Tue Jan  4 10:49:50 2005
+++ linkablemapobj.cpp	Sat Jan 15 12:41:45 2005
@@ -1,4 +1,4 @@
-//#include <math.h>
+#include <math.h>
 
 #include "linkablemapobj.h"
 #include "branchobj.h"
@@ -456,10 +456,10 @@
 	double vy=p2y - p1y;
 
 	// Draw the horizontal line below heading (from ChildPos to ParPos)
-	bottomline->setPoints (lrint(childPos.x()),
-		lrint(childPos.y()),
-		lrint(p1x),
-		lrint(p1y) );
+	bottomline->setPoints ((long)rint(childPos.x()),
+		(long)rint(childPos.y()),
+		(long)rint(p1x),
+		(long)rint(p1y) );
@@ -400,7 +406,7 @@
 		lrint(p1y) );
 
 	double a;	// angle
 	if (vx > -0.000001 && vx < 0.000001)
@@ -467,7 +467,7 @@
 		a=M_PI_2;
 	else
 		a=atan( vy / vx );
 	// "turning point" for drawing polygonal links
-	QPoint tp (-lrint(sin (a)*thickness_start), lrint(cos (a)*thickness_start));	
+	QPoint tp (-(long)rint(sin (a)*thickness_start), (long)rint(cos (a)*thickness_start));	
 	
 	QCanvasLine *cl;
 
@@ -477,10 +477,10 @@
 	switch (style)
 	{
 		case StyleLine:
-			l->setPoints( lrint (parPos.x()),
-				lrint(parPos.y()),
-				lrint(p2x),
-				lrint(p2y) );
+			l->setPoints( (long)rint (parPos.x()),
+				(long)rint(parPos.y()),
+				(long)rint(p2x),
+				(long)rint(p2y) );
 			break;	
 		case StyleParabel:	
 			parabel (pa0, p1x,p1y,p2x,p2y);
@@ -492,15 +492,15 @@
 			}
 			break;
 		case StylePolyLine:
-			pa0[0]=QPoint (lrint(p2x+tp.x()), lrint(p2y+tp.y()));
-			pa0[1]=QPoint (lrint(p2x-tp.x()), lrint(p2y-tp.y()));
-			pa0[2]=QPoint (lrint (parPos.x()), lrint(parPos.y()) );
+			pa0[0]=QPoint ((long)rint(p2x+tp.x()), (long)rint(p2y+tp.y()));
+			pa0[1]=QPoint ((long)rint(p2x-tp.x()), (long)rint(p2y-tp.y()));
+			pa0[2]=QPoint ((long)rint (parPos.x()), (long)rint(parPos.y()) );
 			p->setPoints (pa0);
 			// here too, draw line to avoid missing pixels
-			l->setPoints( lrint (parPos.x()),
-				lrint(parPos.y()),
-				lrint(p2x),
-				lrint(p2y) );
+			l->setPoints( (long)rint (parPos.x()),
+				(long)rint(parPos.y()),
+				(long)rint(p2x),
+				(long)rint(p2y) );
 			break;
 		case StylePolyParabel:	
 			parabel (pa1, p1x,p1y,p2x+tp.x(),p2y+tp.y());
@@ -680,12 +680,12 @@
 		m=(vy / (vx*vx));
 	dx=vx/(arcsegs);
 	int i;
-	ya.setPoint (0,QPoint (lrint(p1x),lrint(p1y)));
+	ya.setPoint (0,QPoint ((long)rint(p1x),(long)rint(p1y)));
 	for (i=1;i<=arcsegs;i++)
 	{	
 		pnx=p1x+dx;
 		pny=m*(pnx-parPos.x())*(pnx-parPos.x())+parPos.y();
-		ya.setPoint (i,QPoint (lrint(pnx),lrint(pny)));
+		ya.setPoint (i,QPoint ((long)rint(pnx),(long)rint(pny)));
 		p1x=pnx;
 		p1y=pny;
 	}	

Lines 1-11 Link Here

(-)vym/files/patch-mainwindow.cpp (-11 lines)
1	--- mainwindow.cpp.orig Tue Sep 28 14:13:06 2004
2	+++ mainwindow.cpp Sun Oct 17 23:49:36 2004
3	@@ -53,6 +53,8 @@
4	#include "showtextdialog.h"
5	#include "process.h"
6
7	+#include <unistd.h>
8	+
9	extern TextEditor *textEditor;
10	extern Main *mainWindow;
11	extern int statusbarTime;

Lines 1-11 Link Here

(-)vym/files/patch-mapeditor.cpp (-11 lines)
1	--- mapeditor.cpp.orig Sun Sep 26 22:45:57 2004
2	+++ mapeditor.cpp Sun Oct 17 23:49:21 2004
3	@@ -53,6 +53,8 @@
4	#include "icons/flag-flash.xpm"
5	#include "icons/flag-lifebelt.xpm"
6
7	+#include <unistd.h>
8	+
9	extern TextEditor *textEditor;
10	extern int statusbarTime;
11	extern Main *mainWindow;




--- misc.cpp.orig	Sun Sep 26 22:45:57 2004
+++ misc.cpp	Sat Jan 15 12:30:23 2005
@@ -223,13 +223,13 @@
 		if (pix.width()>max_w)
 		{
 			r=max_w / pix.width();
-			pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
+			pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
 			// TODO not a resize, but a shrink/enlarge is needed here...
 		}
 		if (pix.height()>max_h)
 		{
 			r=max_h / pix.height();
-			pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
+			pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
 			// TODO not a resize, but a shrink/enlarge is needed here...
 		}
         setPixmap( pix );




%%DATADIR%%/styles/vym2html.xsl
%%DATADIR%%/styles/vym2txt.xsl
%%DATADIR%%/styles/vym2xhtml.xsl
%%PORTDOCS%%%%DOCSDIR%%/vym.pdf
%%PORTDOCS%%%%DOCSDIR%%/tex/branches.png
%%PORTDOCS%%%%DOCSDIR%%/tex/color-buttons.png
%%PORTDOCS%%%%DOCSDIR%%/tex/default-flags.png
%%PORTDOCS%%%%DOCSDIR%%/tex/example1.png
%%PORTDOCS%%%%DOCSDIR%%/tex/find-window.png
%%PORTDOCS%%%%DOCSDIR%%/tex/flag-url.png
%%PORTDOCS%%%%DOCSDIR%%/tex/flag-vymlink.png
%%PORTDOCS%%%%DOCSDIR%%/tex/formatfixedfont.png
%%PORTDOCS%%%%DOCSDIR%%/tex/move-buttons.png
%%PORTDOCS%%%%DOCSDIR%%/tex/vym.tex
%%PORTDOCS%%%%DOCSDIR%%/tex/windows.png
%%PORTDOCS%%%%DOCSDIR%%/tex/zoom-buttons.png
%%PORTDOCS%%%%EXAMPLESDIR%%/liveform.vym
%%PORTDOCS%%%%EXAMPLESDIR%%/math.vym
%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym
%%PORTDOCS%%%%EXAMPLESDIR%%/todo.vym
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%DATADIR%%/scripts

Return to bug 76271

Lines 1-15 Link Here

(-)vym/files/patch-floatimageobj.cpp (-11 / +15 lines)
1	--- floatimageobj.cpp.orig Sun Sep 26 22:45:56 2004	1	--- floatimageobj.cpp.orig Tue Oct 19 18:31:12 2004
2	+++ floatimageobj.cpp Sun Oct 17 17:12:27 2004	2	+++ floatimageobj.cpp Sat Jan 15 12:25:08 2005
3	@@ -2,6 +2,12 @@	3	@@ -1,6 +1,6 @@
		4	+#include <math.h>
		5	#include "floatimageobj.h"
4	#include "branchobj.h"	6	#include "branchobj.h"
5	#include <math.h>	7	-#include <math.h>
6		8
7	+#if !defined(HAVE_LRINTF)
8	+static inline long int lrint(double x)
9	+{
10	+ return (long)(rint(x));
11	+}
12	+#endif
13		9
14	/////////////////////////////////////////////////////////////////	10	/////////////////////////////////////////////////////////////////
15	// FloatImageObj	11	@@ -67,7 +67,7 @@
		12
		13	int FloatImageObj::z ()
		14	{
		15	- return lrint (icon->z());
		16	+ return (long)rint (icon->z());
		17	}
		18
		19	bool FloatImageObj::load (const QString &fn)

Lines 1-33 Link Here

(-)vym/files/patch-linkablemapobj.cpp (-25 / +77 lines)
1	--- linkablemapobj.cpp.orig Fri Sep 24 16:50:15 2004	1	--- linkablemapobj.cpp.orig Tue Jan 4 10:49:50 2005
2	+++ linkablemapobj.cpp Thu Oct 21 17:22:44 2004	2	+++ linkablemapobj.cpp Sat Jan 15 12:41:45 2005
3	@@ -6,6 +6,12 @@	3	@@ -1,4 +1,4 @@
		4	-//#include <math.h>
		5	+#include <math.h>
4		6
5	#include "version.h"	7	#include "linkablemapobj.h"
		8	#include "branchobj.h"
		9	@@ -456,10 +456,10 @@
		10	double vy=p2y - p1y;
6		11
7	+#if !defined(HAVE_LRINTF)	12	// Draw the horizontal line below heading (from ChildPos to ParPos)
8	+static inline long int lrint(double x)	13	- bottomline->setPoints (lrint(childPos.x()),
9	+{	14	- lrint(childPos.y()),
10	+ return (long)(rint(x));	15	- lrint(p1x),
11	+}	16	- lrint(p1y) );
12	+#endif	17	+ bottomline->setPoints ((long)rint(childPos.x()),
13		18	+ (long)rint(childPos.y()),
14	/////////////////////////////////////////////////////////////////	19	+ (long)rint(p1x),
15	// LinkableMapObj	20	+ (long)rint(p1y) );
16	@@ -400,7 +406,7 @@
17	lrint(p1y) );
18		21
19	double a; // angle	22	double a; // angle
20	- if (abs(vx)<0.000001)	23	if (vx > -0.000001 && vx < 0.000001)
21	+ if (fabs(vx)<0.000001)	24	@@ -467,7 +467,7 @@
22	a=M_PI_2;
23	else	25	else
24	a=atan( vy / vx );	26	a=atan( vy / vx );
25	@@ -611,7 +617,7 @@	27	// "turning point" for drawing polygonal links
26	double pny;	28	- QPoint tp (-lrint(sin (a)thickness_start), lrint(cos (a)thickness_start));
27	double m;	29	+ QPoint tp (-(long)rint(sin (a)thickness_start), (long)rint(cos (a)thickness_start));
		30
		31	QCanvasLine *cl;
28		32
29	- if (abs(vx) <0.0001)	33	@@ -477,10 +477,10 @@
30	+ if (fabs(vx) <0.0001)	34	switch (style)
31	m=0;	35	{
32	else	36	case StyleLine:
		37	- l->setPoints( lrint (parPos.x()),
		38	- lrint(parPos.y()),
		39	- lrint(p2x),
		40	- lrint(p2y) );
		41	+ l->setPoints( (long)rint (parPos.x()),
		42	+ (long)rint(parPos.y()),
		43	+ (long)rint(p2x),
		44	+ (long)rint(p2y) );
		45	break;
		46	case StyleParabel:
		47	parabel (pa0, p1x,p1y,p2x,p2y);
		48	@@ -492,15 +492,15 @@
		49	}
		50	break;
		51	case StylePolyLine:
		52	- pa0[0]=QPoint (lrint(p2x+tp.x()), lrint(p2y+tp.y()));
		53	- pa0[1]=QPoint (lrint(p2x-tp.x()), lrint(p2y-tp.y()));
		54	- pa0[2]=QPoint (lrint (parPos.x()), lrint(parPos.y()) );
		55	+ pa0[0]=QPoint ((long)rint(p2x+tp.x()), (long)rint(p2y+tp.y()));
		56	+ pa0[1]=QPoint ((long)rint(p2x-tp.x()), (long)rint(p2y-tp.y()));
		57	+ pa0[2]=QPoint ((long)rint (parPos.x()), (long)rint(parPos.y()) );
		58	p->setPoints (pa0);
		59	// here too, draw line to avoid missing pixels
		60	- l->setPoints( lrint (parPos.x()),
		61	- lrint(parPos.y()),
		62	- lrint(p2x),
		63	- lrint(p2y) );
		64	+ l->setPoints( (long)rint (parPos.x()),
		65	+ (long)rint(parPos.y()),
		66	+ (long)rint(p2x),
		67	+ (long)rint(p2y) );
		68	break;
		69	case StylePolyParabel:
		70	parabel (pa1, p1x,p1y,p2x+tp.x(),p2y+tp.y());
		71	@@ -680,12 +680,12 @@
33	m=(vy / (vx*vx));	72	m=(vy / (vx*vx));
		73	dx=vx/(arcsegs);
		74	int i;
		75	- ya.setPoint (0,QPoint (lrint(p1x),lrint(p1y)));
		76	+ ya.setPoint (0,QPoint ((long)rint(p1x),(long)rint(p1y)));
		77	for (i=1;i<=arcsegs;i++)
		78	{
		79	pnx=p1x+dx;
		80	pny=m(pnx-parPos.x())(pnx-parPos.x())+parPos.y();
		81	- ya.setPoint (i,QPoint (lrint(pnx),lrint(pny)));
		82	+ ya.setPoint (i,QPoint ((long)rint(pnx),(long)rint(pny)));
		83	p1x=pnx;
		84	p1y=pny;
		85	}

Lines 1-15 Link Here

(-)vym/files/patch-misc.cpp (-14 / +17 lines)
1	--- misc.cpp.orig Sun Sep 26 22:45:57 2004	1	--- misc.cpp.orig Sun Sep 26 22:45:57 2004
2	+++ misc.cpp Sun Oct 17 17:11:40 2004	2	+++ misc.cpp Sat Jan 15 12:30:23 2005
3	@@ -5,6 +5,12 @@	3	@@ -223,13 +223,13 @@
4		4	if (pix.width()>max_w)
5	#include "misc.h"	5	{
6		6	r=max_w / pix.width();
7	+#if !defined(HAVE_LRINTF)	7	- pix.resize(lrint(pix.width()r), lrint(pix.height()r));
8	+static inline long int lrint(double x)	8	+ pix.resize((long)rint(pix.width()r), (long)rint(pix.height()r));
9	+{	9	// TODO not a resize, but a shrink/enlarge is needed here...
10	+ return (long)(rint(x));	10	}
11	+}	11	if (pix.height()>max_h)
12	+#endif	12	{
13		13	r=max_h / pix.height();
14	ostream &operator<< (ostream &stream, QPoint const &p)	14	- pix.resize(lrint(pix.width()r), lrint(pix.height()r));
15	{	15	+ pix.resize((long)rint(pix.width()r), (long)rint(pix.height()r));
		16	// TODO not a resize, but a shrink/enlarge is needed here...
		17	}
		18	setPixmap( pix );

Lines 11-33 Link Here

(-)vym/pkg-plist (-14 / +2 lines)
11	%%DATADIR%%/styles/vym2html.xsl	11	%%DATADIR%%/styles/vym2html.xsl
12	%%DATADIR%%/styles/vym2txt.xsl	12	%%DATADIR%%/styles/vym2txt.xsl
13	%%DATADIR%%/styles/vym2xhtml.xsl	13	%%DATADIR%%/styles/vym2xhtml.xsl
14	%%PORTDOCS%%%%DOCSDIR%%/tex/branches-flags.png	14	%%PORTDOCS%%%%DOCSDIR%%/vym.pdf
15	%%PORTDOCS%%%%DOCSDIR%%/tex/branches.png
16	%%PORTDOCS%%%%DOCSDIR%%/tex/color-buttons.png
17	%%PORTDOCS%%%%DOCSDIR%%/tex/default-flags.png
18	%%PORTDOCS%%%%DOCSDIR%%/tex/example1.png
19	%%PORTDOCS%%%%DOCSDIR%%/tex/find-window.png
20	%%PORTDOCS%%%%DOCSDIR%%/tex/flag-url.png
21	%%PORTDOCS%%%%DOCSDIR%%/tex/flag-vymlink.png
22	%%PORTDOCS%%%%DOCSDIR%%/tex/formatfixedfont.png
23	%%PORTDOCS%%%%DOCSDIR%%/tex/move-buttons.png
24	%%PORTDOCS%%%%DOCSDIR%%/tex/vym.tex
25	%%PORTDOCS%%%%DOCSDIR%%/tex/windows.png
26	%%PORTDOCS%%%%DOCSDIR%%/tex/zoom-buttons.png
27	%%PORTDOCS%%%%EXAMPLESDIR%%/liveform.vym	15	%%PORTDOCS%%%%EXAMPLESDIR%%/liveform.vym
		16	%%PORTDOCS%%%%EXAMPLESDIR%%/math.vym
28	%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym	17	%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym
29	%%PORTDOCS%%%%EXAMPLESDIR%%/todo.vym	18	%%PORTDOCS%%%%EXAMPLESDIR%%/todo.vym
30	%%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
31	%%PORTDOCS%%@dirrm %%DOCSDIR%%	19	%%PORTDOCS%%@dirrm %%DOCSDIR%%
32	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%	20	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
33	@dirrm %%DATADIR%%/scripts	21	@dirrm %%DATADIR%%/scripts