Date: Mon, 29 Nov 1999 13:10:02 -0800 (PST) From: Tobias Reifenberger <treif@mayn.de> To: freebsd-ports@FreeBSD.org Subject: Re: ports/14379: New port: graphics/xmrm Message-ID: <199911292110.NAA47572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/14379; it has been noted by GNATS.
From: Tobias Reifenberger <treif@mayn.de>
To: freebsd-gnats-submit@freebsd.org, treif@mayn.de
Cc:
Subject: Re: ports/14379: New port: graphics/xmrm
Date: Mon, 29 Nov 1999 22:02:51 +0100
This is a multi-part message in MIME format.
--------------605FA9C351C2BB6CFF45BEAD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi
GCC 2.95.2 broke the port. Attached are the new versions of two patch-files
- please use these when you test the port.
bye
--
Tobias Reifenberger -- treif@mayn.de -- DG1NGT
GEE e* dpu s:- a-- C+++ UB+++ L- W+ N+ w--- Y+ tv+ b++ D++ h++ r---
--------------605FA9C351C2BB6CFF45BEAD
Content-Type: text/plain; charset=us-ascii;
name="patch-ac"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ac"
--- ../xmrm.orig/io.h Tue Mar 10 00:00:00 1998
+++ io.h Sat Nov 27 00:33:23 1999
@@ -39,7 +39,7 @@
char *URL_CG_Home;
char *URL_TU_Vienna;
- ControlClass();
+ void ControlClassInit();
int GetDraw();
void SetDraw(int d);
void SetCursor(int Active, Window win);
--- ../xmrm.orig/io.cc Tue Mar 10 00:00:00 1998
+++ io.cc Sat Nov 27 00:55:37 1999
@@ -87,7 +87,7 @@
extern ControlClass control;
/* Constructor: */
-ControlClass::ControlClass()
+void ControlClass::ControlClassInit()
{
int i;
@@ -1720,7 +1720,7 @@
// extension--;
i=0;
- number = ".000.";
+ strcpy(number , ".000.");
while ( !(extension = strstr(extension,number)) && i<=999 )
{
i++;
--- ../xmrm.orig/xmrm_main.cc Tue Mar 10 00:00:00 1998
+++ xmrm_main.cc Sat Nov 27 00:31:24 1999
@@ -6,7 +6,6 @@
#include <tiffio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <malloc.h> //****************
#include "xmrm.h"
#include "io.h"
#include "const.h"
@@ -308,7 +307,7 @@
control.debug = 0;
/* Init control: */
- control.ControlClass(); // call constructor
+ control.ControlClassInit(); // call constructor
temp = control.URL_manual;
while( (c=getopt(argc, argv, "hdm:p:")) != -1)
--- ../xmrm.orig/xmrm_mpeg_main.cc Tue Mar 10 00:00:00 1998
+++ xmrm_mpeg_main.cc Sat Nov 27 00:54:15 1999
@@ -68,7 +68,7 @@
{
int count = 0;
- backup_class->number_str = ".000.";
+ strcpy(backup_class->number_str , ".000.");
while ( !(*ext = strstr(fname_only,backup_class->number_str)) && (count <= MAX_PIC_NUM) )
{
@@ -417,7 +417,7 @@
// Check for even picture size
if ( (tif_w % 2) || (tif_h % 2) )
{
- work_class->even = ".even";
+ strcpy(work_class->even , ".even");
if ( Even_Size( tif, tif_w, tif_h) )
return 1;
}
--------------605FA9C351C2BB6CFF45BEAD
Content-Type: text/plain; charset=us-ascii;
name="patch-ad"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ad"
--- ../xmrm.orig/morphvec.cc Tue Mar 10 00:00:00 1998
+++ morphvec.cc Sat Nov 27 00:44:30 1999
@@ -9,6 +9,7 @@
#include "io.h"
#include "xmrm.h"
//#include "areas.h"
+#include <floatingpoint.h>
//static int oneliner = 1;
@@ -17,7 +18,7 @@
extern Display *disp;
-extern max_x,max_y;
+extern int max_x,max_y;
extern ControlClass control;
extern VisualInfoClass vis;
extern WindowClass *s_win, *d_win;
@@ -433,6 +434,10 @@
void MorphVecClass::DrawVectorScal(FL_OBJECT *obj, int item, int mode, FL_COLOR col)
{
double sc_x,sc_y;
+
+ /* don't exit on FPE */
+ fpsetmask(0);
+
sc_x = (double) obj->w / max_x; sc_y = (double) obj->h / max_y;
if (item > nr_vec)
--------------605FA9C351C2BB6CFF45BEAD--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911292110.NAA47572>