diff -ur xmrm-2.0/io.cc xmrm-2.0.new/io.cc --- xmrm-2.0/io.cc 2009-05-23 14:54:21 +0000 +++ xmrm-2.0.new/io.cc 2009-05-23 14:51:50 +0000 @@ -925,7 +925,7 @@ // *directory = '\0'; if ( filename ) - if ( help = strrchr( filename, '/') ) + if ( help = strrchr((char *)filename, '/') ) { (void) strcpy( directory, filename ); help = strrchr(directory, '/'); @@ -1713,7 +1713,7 @@ return; } - extension=strrchr(filename, '/'); + extension=strrchr((char *)filename, '/'); // if( *(++extension)=='\0' ) // { @@ -1731,7 +1731,7 @@ number[1] = '0' + i/100; number[2] = '0' + (i%100)/10; number[3] = '0' + (i%10); - extension=strrchr(filename, '/'); + extension=strrchr((char *)filename, '/'); } if (i==1000) @@ -1766,11 +1766,11 @@ } } - extension = strstr(filename,number); + extension = strstr((char *)filename,number); *(++extension) = '0' + pic_num/100; *(++extension) = '0' + (pic_num%100)/10; *(++extension) = '0' + (pic_num%10); - extension = strrchr(filename, '/'); + extension = strrchr((char *)filename, '/'); number[1] = '0' + pic_num/100; number[2] = '0' + (pic_num%100)/10; @@ -1814,7 +1814,7 @@ else return; - START_fname_only = strrchr(filename,'/'); + START_fname_only = strrchr((char *)filename,'/'); START_fname_only++; pic_num = 0; @@ -2174,7 +2174,7 @@ // return; // } -// ptr=strrchr(filename, '/'); +// ptr=strrchr((char *)filename, '/'); // if( *(++ptr)=='\0' ) // { // fl_show_alert("ERROR:","Filename mustn't end with '/' !","",1); diff -ur xmrm-2.0/io.h xmrm-2.0.new/io.h --- xmrm-2.0/io.h 2009-05-23 14:54:21 +0000 +++ xmrm-2.0.new/io.h 2009-05-23 13:30:07 +0000 @@ -35,9 +35,9 @@ char filename_vector[BUFSIZ]; char filename_project[BUFSIZ]; char filename_area_map[BUFSIZ]; - char *URL_manual; - char *URL_CG_Home; - char *URL_TU_Vienna; + const char *URL_manual; + const char *URL_CG_Home; + const char *URL_TU_Vienna; void ControlClassInit(); int GetDraw(); diff -ur xmrm-2.0/xmrm_cb.cc xmrm-2.0.new/xmrm_cb.cc --- xmrm-2.0/xmrm_cb.cc 1998-03-09 23:00:00 +0000 +++ xmrm-2.0.new/xmrm_cb.cc 2009-05-23 13:30:23 +0000 @@ -415,7 +415,7 @@ int obj_wavelets_handler(FL_OBJECT *obj, int event, FL_Coord mx, FL_Coord my, int key, void *xev) { - char *s1, *s2, *s3; + const char *s1, *s2, *s3; switch(event) { diff -ur xmrm-2.0/xmrm_main.cc xmrm-2.0.new/xmrm_main.cc --- xmrm-2.0/xmrm_main.cc 2009-05-23 14:54:21 +0000 +++ xmrm-2.0.new/xmrm_main.cc 2009-05-23 14:53:34 +0000 @@ -61,7 +61,7 @@ // SLID_CONTR_pre_handler int SLID_CONTR_pre_handler(FL_OBJECT *ob, int event, FL_Coord mx, FL_Coord my, int key, void *xev) { - char *s1, *s2, *s3; + const char *s1, *s2, *s3; if ( ((event == FL_PUSH) || (event == FL_MOUSE)) && (key >= 2) ) { @@ -94,7 +94,7 @@ // SLID_CONTR_post_handler int SLID_CONTR_post_handler(FL_OBJECT *ob, int event, FL_Coord mx, FL_Coord my, int key, void *xev) { - char *s=NULL; + const char *s=NULL; if (ob == fd_SLID_CONTR->SL_Param_a) s="Press right button for detailed information..."; else if (ob == fd_SLID_CONTR->SL_Param_b) @@ -163,7 +163,7 @@ // MRM_post_handler int MRM_post_handler(FL_OBJECT *ob, int event, FL_Coord mx, FL_Coord my, int key, void *xev) { - char *s=NULL; + const char *s=NULL; if (ob == fd_MRM->CB_Simple_Morph) s="Morph Source Image into Destination Image according to your settings !"; @@ -300,7 +300,7 @@ FL_OBJECT *obj; int c; char *argv_filename_project = NULL; - char *temp; + const char *temp; // memory_warnings(NULL, NULL);//(void *)Warn_Mem());