diff options
Diffstat (limited to 'science/flounder/files')
-rw-r--r-- | science/flounder/files/patch-Colourscale.cc | 11 | ||||
-rw-r--r-- | science/flounder/files/patch-Fl_Gnuplot.cc | 31 | ||||
-rw-r--r-- | science/flounder/files/patch-Fl_Gnuplot.h | 11 | ||||
-rw-r--r-- | science/flounder/files/patch-GlAreaUI.cc | 19 | ||||
-rw-r--r-- | science/flounder/files/patch-Glarea.cc | 11 | ||||
-rw-r--r-- | science/flounder/files/patch-Glarea.h | 20 | ||||
-rw-r--r-- | science/flounder/files/patch-IGBheader.cc | 52 | ||||
-rw-r--r-- | science/flounder/files/patch-PNGwrite.cc | 11 | ||||
-rw-r--r-- | science/flounder/files/patch-RenderEPS.h | 10 | ||||
-rw-r--r-- | science/flounder/files/patch-flguppy.h | 11 | ||||
-rw-r--r-- | science/flounder/files/patch-isosurf.cc | 11 |
11 files changed, 0 insertions, 198 deletions
diff --git a/science/flounder/files/patch-Colourscale.cc b/science/flounder/files/patch-Colourscale.cc deleted file mode 100644 index efd3d7e70d8f..000000000000 --- a/science/flounder/files/patch-Colourscale.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Colourscale.cc.orig Thu Jan 16 02:38:50 2003 -+++ src/Colourscale.cc Thu Jan 16 02:39:10 2003 -@@ -18,6 +18,8 @@ - */ - #include "Colourscale.h" - -+using namespace std; -+ - Colourscale :: Colourscale( int ts, CScale_t tcs ) - { - n = 0; diff --git a/science/flounder/files/patch-Fl_Gnuplot.cc b/science/flounder/files/patch-Fl_Gnuplot.cc deleted file mode 100644 index 7eed076d864d..000000000000 --- a/science/flounder/files/patch-Fl_Gnuplot.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- src/Fl_Gnuplot.cc.orig 2002-12-20 03:56:35.000000000 +0900 -+++ src/Fl_Gnuplot.cc 2012-10-23 23:22:44.000000000 +0900 -@@ -39,11 +39,11 @@ - - #include <stdlib.h> - #include <stdio.h> --#include <fstream.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <iostream> - - #include "FL/fl_draw.H" - #include "FL/fl_ask.H" -@@ -53,12 +53,14 @@ - - #define N_ENTRIES 8192 - -+using namespace std; -+ - // enter a GNUP{LOT command to be executed - void gnuplotcom_cb( Fl_Widget *w, void *p ) - { - Fl_Gnuplot* graph=(Fl_Gnuplot*)w; - -- char *s=fl_input("Enter Gnuplot commands seperated by ;",graph->command() ); -+ char *s=(char*)fl_input("Enter Gnuplot commands seperated by ;",graph->command() ); - if( s != NULL ) graph->command(s); - graph->window()->redraw(); - } diff --git a/science/flounder/files/patch-Fl_Gnuplot.h b/science/flounder/files/patch-Fl_Gnuplot.h deleted file mode 100644 index 27c98a587888..000000000000 --- a/science/flounder/files/patch-Fl_Gnuplot.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Fl_Gnuplot.h.orig Tue Oct 15 04:00:20 2002 -+++ src/Fl_Gnuplot.h Tue Oct 15 04:00:37 2002 -@@ -47,6 +47,8 @@ - #include "FL/Fl_Widget.H" - #include "FL/Fl_Box.H" - -+using namespace std; -+ - class Fl_Gnuplot : public Fl_Box { - private: - Fl_Gnuplot(); diff --git a/science/flounder/files/patch-GlAreaUI.cc b/science/flounder/files/patch-GlAreaUI.cc deleted file mode 100644 index f872e065bae2..000000000000 --- a/science/flounder/files/patch-GlAreaUI.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- src/GlAreaUI.cc.orig Thu Jan 16 02:49:11 2003 -+++ src/GlAreaUI.cc Thu Jan 16 02:50:08 2003 -@@ -19,6 +19,7 @@ - #include "../config.h" - #include "flguppy.h" - #include <algorithm> -+#include <iostream> - #ifdef HAVE_VALUES_H - #include <values.h> - #endif -@@ -34,6 +35,8 @@ - #include <avifile/utils.h> - #include <avifile/fourcc.h> - #endif -+ -+using namespace std; - - Fl_Font fontset[] = { - FL_HELVETICA, FL_HELVETICA_BOLD, diff --git a/science/flounder/files/patch-Glarea.cc b/science/flounder/files/patch-Glarea.cc deleted file mode 100644 index 115aa1248112..000000000000 --- a/science/flounder/files/patch-Glarea.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Glarea.cc.orig 2002-12-20 03:56:35.000000000 +0900 -+++ src/Glarea.cc 2012-12-12 23:16:47.000000000 +0900 -@@ -918,7 +918,7 @@ - igbname = fname + ".gz"; - if( (in=gzopen( igbname.c_str(), "r" )) == NULL ) { - igbname = fname + ".igb.gz"; -- if( (in=fopen( igbname.c_str(), "rb" )) == NULL ) -+ if( (in=(gzFile)fopen( igbname.c_str(), "rb" )) == NULL ) - return 1; - } - } diff --git a/science/flounder/files/patch-Glarea.h b/science/flounder/files/patch-Glarea.h deleted file mode 100644 index f74c274a0c36..000000000000 --- a/science/flounder/files/patch-Glarea.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Glarea.h.orig 2002-12-19 19:37:48.000000000 +0100 -+++ src/Glarea.h 2011-11-17 11:21:09.000000000 +0100 -@@ -29,7 +29,7 @@ - extern "C" { - #include <gif_lib.h> - } --#include <FL/fl_file_chooser.H> -+#include <FL/Fl_File_Chooser.H> - #include <FL/fl_ask.H> - #include <FL/fl_draw.H> - #include <FL/fl_show_colormap.H> -@@ -44,6 +44,8 @@ - #include "RenderEPS.h" - #include "IGBheader.h" - -+using namespace std; -+ - typedef enum dispdim{DISP_XY, DISP_YZ, DISP_ZX, - DISP_YX, DISP_ZY, DISP_XZ} DispDim; - typedef enum bbvalue{ BBXM, BBXP, BBYM, BBYP, BBZM, BBZP } BBvalue; diff --git a/science/flounder/files/patch-IGBheader.cc b/science/flounder/files/patch-IGBheader.cc deleted file mode 100644 index 73f7207bef0a..000000000000 --- a/science/flounder/files/patch-IGBheader.cc +++ /dev/null @@ -1,52 +0,0 @@ ---- src/IGBheader.cc.orig Tue Oct 15 02:15:19 2002 -+++ src/IGBheader.cc Tue Oct 15 02:15:44 2002 -@@ -17,8 +17,11 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - #include<stdlib.h> -+#include <iostream> - #include "IGBheader.h" - -+using namespace std; -+ - /* -------------- Bits de statut pour Header_Read et Header_Write ------ */ - - #define MOT_CLEF_INV 2 -@@ -756,7 +759,7 @@ - if (bool_comment) { - comment = v_comment; - while (*comment != NULL) { -- n_car = gzprintf(file, "#%.80s\r\n", *comment++); -+ n_car = gzprintf((gzFile)file, "#%.80s\r\n", *comment++); - if (n_car==0) { - if (!Header_Quiet) { - fprintf(stderr, "\nHeader_Write: Erreur a l'ecriture \n"); -@@ -861,7 +864,7 @@ - } - - /* --- lit le caractere suivant --- */ -- in = gzgetc( file ) ; -+ in = gzgetc( (gzFile)file ) ; - - /* --- (EOF dans l'entete) --> erreur --- */ - if ( in == -1 ) { -@@ -1318,8 +1321,8 @@ - } - } - -- if (gztell(file)!=1024) { -- gzseek( file, 1024, SEEK_SET ); -+ if (gztell((gzFile)file)!=1024) { -+ gzseek( (gzFile)file, 1024, SEEK_SET ); - if (!Header_Quiet) { - fprintf(stderr, - "\nATTENTION: etiquette de grandeur non-standard \n"); -@@ -1335,7 +1338,7 @@ - - if (bool_vect_z) { - v_vect_z = (float *)malloc(v_z*sizeof(float)); -- gzread(file, v_vect_z, sizeof(float)*v_z); -+ gzread((gzFile)file, v_vect_z, sizeof(float)*v_z); - } - - return( statut ) ; diff --git a/science/flounder/files/patch-PNGwrite.cc b/science/flounder/files/patch-PNGwrite.cc deleted file mode 100644 index 9906e80c4225..000000000000 --- a/science/flounder/files/patch-PNGwrite.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/PNGwrite.cc.orig 2002-12-19 19:56:35.000000000 +0100 -+++ src/PNGwrite.cc 2012-05-05 09:40:41.000000000 +0200 -@@ -38,7 +38,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return; - } -- setjmp(png_ptr->jmpbuf); -+ setjmp( png_jmpbuf(png_ptr)); - png_init_io(png_ptr, fp); - } - diff --git a/science/flounder/files/patch-RenderEPS.h b/science/flounder/files/patch-RenderEPS.h deleted file mode 100644 index 718932b0a1a7..000000000000 --- a/science/flounder/files/patch-RenderEPS.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/RenderEPS.h.orig 2002-12-19 13:37:24.000000000 +0900 -+++ src/RenderEPS.h 2012-10-23 23:23:41.000000000 +0900 -@@ -20,6 +20,7 @@ - #include <math.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <GL/gl.h> - #include <string> - using namespace std; diff --git a/science/flounder/files/patch-flguppy.h b/science/flounder/files/patch-flguppy.h deleted file mode 100644 index 969c63be1ebe..000000000000 --- a/science/flounder/files/patch-flguppy.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/flguppy.h.orig Tue Oct 15 01:03:47 2002 -+++ src/flguppy.h Tue Oct 15 01:03:57 2002 -@@ -31,6 +31,8 @@ - #include <FL/Fl_Button.H> - #include <FL/Fl_Value_Output.H> - -+using namespace std; -+ - class TableauUI { - public: - void *widg; diff --git a/science/flounder/files/patch-isosurf.cc b/science/flounder/files/patch-isosurf.cc deleted file mode 100644 index fd90b297aec1..000000000000 --- a/science/flounder/files/patch-isosurf.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/isosurf.cc.orig Thu Jan 16 03:24:03 2003 -+++ src/isosurf.cc Thu Jan 16 03:24:16 2003 -@@ -2241,8 +2241,6 @@ - * the University of Illinois at Urbana-Champaign. - */ - --#include <malloc.h> -- - /********************************************************/ - float * - alloc_list(unsigned int size) |