[SCM] Positional Astronomy Library branch, debian, updated. edd1fabf91136eea237a3582bf8978bfa7823106

[Ole Streicher]

The following commit has been merged in the debian branch:
commit edd1fabf91136eea237a3582bf8978bfa7823106
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Feb 11 00:16:01 2012 +0100

    Switch over to the (almost) original code before starlink changed to
    the obfuscated variant of slaDeuler()

diff --git a/debian/patches/remove_obfuscated.patch b/debian/patches/remove_obfuscated.patch
index f637b61..56af17f 100644
--- a/debian/patches/remove_obfuscated.patch
+++ b/debian/patches/remove_obfuscated.patch
@@ -4,7 +4,7 @@ Description: Replace the obfuscated C function by the call of the original
  use -frecursive instead of locks...
 --- a/sla.c
 +++ b/sla.c
-@@ -1596,31 +1631,31 @@ void slaGeoc ( double p, double h, double *r, double *z ) {
+@@ -1596,31 +1631,38 @@ void slaGeoc ( double p, double h, double *r, double *z ) {
  }
  
  
@@ -41,22 +41,29 @@ Description: Replace the obfuscated C function by the call of the original
 +
 +void slaDeuler ( const char *order, double phi, double theta, double psi,
 +                 double rmat[3][3] ) {
-+  DECLARE_CHARACTER_DYN(ORDER);
++  DECLARE_CHARACTER(ORDER,4);
 +  DECLARE_DOUBLE(PHI);
 +  DECLARE_DOUBLE(THETA);
 +  DECLARE_DOUBLE(PSI);
 +  DECLARE_DOUBLE_ARRAY(RMAT,9);
-+  F77_EXPORT_DOUBLE(phi, PHI);
-+  F77_EXPORT_DOUBLE(theta, THETA);
-+  F77_EXPORT_DOUBLE(psi, PSI);
-+  F77_CREATE_EXPORT_CHARACTER( order, ORDER );
++  int i,j;
++
++  PHI   = phi;
++  THETA = theta;
++  PSI   = psi;
++
++  slaStringExport( order, ORDER, 4 );
++
 +  F77_LOCK( F77_CALL(sla_deuler)( CHARACTER_ARG(ORDER),
 +				  DOUBLE_ARG(&PHI),
 +				  DOUBLE_ARG(&THETA),
 +				  DOUBLE_ARG(&PSI),
-+				  DOUBLE_ARRAY_ARG(RMAT) TRAIL_ARG(ORDER)); )
-+  F77_IMPORT_DOUBLE_ARRAY(RMAT, rmat, 9);
-+  F77_FREE_CHARACTER(ORDER);
++				  DOUBLE_ARRAY_ARG(RMAT)
++                                 TRAIL_ARG(ORDER)); )
++ 
++  for ( i = 0; i < 3; i++ ) {
++     for ( j = 0; j < 3; j++ ) rmat[ i ][ j ] = RMAT[ i + 3 * j ];
++  }
 +}
  
  F77_SUBROUTINE(sla_de2h)( DOUBLE(HA),

-- 
Positional Astronomy Library