JWS-112 Bumping version of Mafft to version 7.310.

[jabaws.git] / binaries / src / mafft / core / rnatest.c

diff --git a/binaries/src/mafft/core/rnatest.c b/binaries/src/mafft/core/rnatest.c
index c1f5ca2..552619e 100644 (file)
--- a/binaries/src/mafft/core/rnatest.c
+++ b/binaries/src/mafft/core/rnatest.c
@@ -92,25 +92,25 @@ void arguments( int argc, char *argv[] )
                                        --argc;
                                        goto nextoption;
                                case 'k':
-                                       kimuraR = atoi( *++argv );
+                                       kimuraR = myatoi( *++argv );
 //                                     fprintf( stderr, "kimuraR = %d\n", kimuraR );
                                        --argc;
                                        goto nextoption;
                                case 'b':
-                                       nblosum = atoi( *++argv );
+                                       nblosum = myatoi( *++argv );
                                        scoremtx = 1;
                                        fprintf( stderr, "blosum %d\n", nblosum );
                                        --argc;
                                        goto nextoption;
                                case 'j':
-                                       pamN = atoi( *++argv );
+                                       pamN = myatoi( *++argv );
                                        scoremtx = 0;
                                        TMorJTT = JTT;
                                        fprintf( stderr, "jtt %d\n", pamN );
                                        --argc;
                                        goto nextoption;
                                case 'm':
-                                       pamN = atoi( *++argv );
+                                       pamN = myatoi( *++argv );
                                        scoremtx = 0;
                                        TMorJTT = TM;
                                        fprintf( stderr, "TM %d\n", pamN );
@@ -204,11 +204,11 @@ void arguments( int argc, char *argv[] )
                                        break;
 /* modification end. */
                                case 'z':
-                                       fftThreshold = atoi( *++argv );
+                                       fftThreshold = myatoi( *++argv );
                                        --argc; 
                                        goto nextoption;
                                case 'w':
-                                       fftWinSize = atoi( *++argv );
+                                       fftWinSize = myatoi( *++argv );
                                        --argc;
                                        goto nextoption;
                                case 'Z':
@@ -336,7 +336,7 @@ int main( int argc, char *argv[] )
        int alloclen;
        RNApair **pair1;
        RNApair **pair2;
-       float **map;
+       double **map;
 
        arguments( argc, argv );