Révision 524
Ajouté par yoguer il y a presque 4 ans
| branch/Guer/sp4a12/main.c | ||
|---|---|---|
|
|
||
|
int calcul_vitesse(int *platitude,int *plongitude)
|
||
|
{
|
||
|
<<<<<<< .mine int vitesse;
|
||
|
int distance;
|
||
|
======= long vitesse,distance;
|
||
|
>>>>>>> .theirs
|
||
|
float distance, vitesse;
|
||
|
|
||
|
if((tab_memoirelatlong[0]!=*platitude) || (tab_memoirelatlong[1]!=*plongitude))
|
||
|
{
|
||
|
distance=sqrt((*platitude-tab_memoirelatlong[0])*(*platitude-tab_memoirelatlong[0])+(*plongitude-tab_memoirelatlong[1])*(*plongitude-tab_memoirelatlong[1]));
|
||
Formats disponibles : Unified diff