From e92ecd240be801c3d03b5afa94cbb956d4ff3de6 Mon Sep 17 00:00:00 2001
From: "clayton.otey@gmail.com"
 <clayton.otey@gmail.com@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Tue, 8 Jun 2010 01:13:11 +0000
Subject: [PATCH] Got rid of remaining sbsms windows warnings, except for
 fopen_s

---
 lib-src/sbsms/src/fft.cpp |  2 +-
 lib-src/sbsms/src/sms.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib-src/sbsms/src/fft.cpp b/lib-src/sbsms/src/fft.cpp
index cceeb34db..652446085 100644
--- a/lib-src/sbsms/src/fft.cpp
+++ b/lib-src/sbsms/src/fft.cpp
@@ -162,7 +162,7 @@ fftplan *planIFFT(int N)
   plan->t = calcTwiddles(plan->n,plan->N1,plan->N2,plan->order,-1);
   plan->f = getFuncs(factors);
   plan->N = N;
-  plan->norm = 1.0/(real)N;
+  plan->norm = 1.0f/(real)N;
   return plan;
 }
 
diff --git a/lib-src/sbsms/src/sms.cpp b/lib-src/sbsms/src/sms.cpp
index d4aa851d3..434889d1e 100644
--- a/lib-src/sbsms/src/sms.cpp
+++ b/lib-src/sbsms/src/sms.cpp
@@ -969,7 +969,7 @@ long sms :: assignTrackPoints_(long offset, sms *hi, sms *lo, real dtlo, long of
 	(*tpi)->bConnected = false;
 	if((*tpi)->f < minFMatch) break;
 	real F;
-	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5f,1.0f,square(1.0/dtlo),&minL1,&F,maxMerit2,maxDF2);
+	tplist::iterator minL1; bool minL1Set = nearestTrackPoint(&trackPoints0,*tpi,0.5f,1.0f,square(1.0f/dtlo),&minL1,&F,maxMerit2,maxDF2);
 	if(minL1Set) (*tpi)->cont = *minL1;
       }
     }
@@ -1599,7 +1599,7 @@ void sms :: adjustPeaks(list<peak*> &peaks,
     real mdec = 0;
 
     if(k0 < tp->x) {
-      mdec += (dec[k0]+dec[k0+1])*(1.0-kf0);
+      mdec += (dec[k0]+dec[k0+1])*(1.0f-kf0);
     } else {
       mdec += (dec[k0]+dec[k0+1]);
       mdec += (dec[k0-1]+dec[k0])*kf0;
@@ -1609,7 +1609,7 @@ void sms :: adjustPeaks(list<peak*> &peaks,
       mdec += (dec[k2-1]+dec[k2]);
       mdec += (dec[k2]+dec[k2+1])*kf2;
     } else {
-      mdec += (dec[k2-1]+dec[k2])*(1.0-kf2);
+      mdec += (dec[k2-1]+dec[k2])*(1.0f-kf2);
     }
     
     for(int k=k0+1;k<k2-1;k++) {
@@ -1653,7 +1653,7 @@ void sms :: extractTrackPoints(grain *g,
 
   peak *t0 = pa->create();
   t0->k = 1;
-  t0->x = 1;
+  t0->x = (real)1;
   t0->y = mag1[0];
   t0->y2 = mag2[0];
   t0->tp = NULL;
@@ -1663,7 +1663,7 @@ void sms :: extractTrackPoints(grain *g,
 
   peak *t1 = pa->create();
   t1->k = Nover2-1;
-  t1->x = Nover2-1;
+  t1->x = (real)(Nover2-1);
   t1->y = mag1[Nover2-1];
   t1->y2 = mag2[Nover2-1];
   t1->tp = NULL;