[Debian-astro-commits] [gyoto] 148/221: Fix Scenery to ccompile correctly with --without-udunits

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 6a9859c7668a51a0cf8714dbdc46888a6659b665
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Mon Dec 15 11:54:34 2014 +0100

    Fix Scenery to ccompile correctly with --without-udunits
---
 lib/Scenery.C | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Scenery.C b/lib/Scenery.C
index b7d6cb9..b3e15be 100644
--- a/lib/Scenery.C
+++ b/lib/Scenery.C
@@ -319,6 +319,7 @@ void Scenery::rayTrace(Screen::Coord2dSet & ij,
     size_t offset=1;
     size_t curquant=0;
 
+# ifdef GYOTO_USE_UDUNITS
     if (Scenery::am_worker) {
       // set all converters to the trivial one, conversion is
       // performed in the manager.
@@ -327,6 +328,7 @@ void Scenery::rayTrace(Screen::Coord2dSet & ij,
       binspectrum_converter_ = NULL;
       setPropertyConverters(locdata);
     }
+# endif
 
     if (quantities & GYOTO_QUANTITY_INTENSITY) {
       locdata->intensity=vect+offset*(curquant++);
@@ -423,8 +425,11 @@ void Scenery::rayTrace(Screen::Coord2dSet & ij,
 	if (s.tag()==Scenery::raytrace_done && data) {
 	  // Copy each relevant quantity, performing conversion if needed
 	  if (data->intensity)
-	    data->intensity[cs]=data->intensity_converter_?
+	    data->intensity[cs]=
+# ifdef GYOTO_USE_UDUNITS
+	      data->intensity_converter_?
 	      (*data->intensity_converter_)(*locdata->intensity):
+# endif
 	      *locdata->intensity;
 	  if (data->time) data->time[cs]=*locdata->time;
 	  if (data->distance) data->distance[cs]=*locdata->distance;
@@ -441,14 +446,18 @@ void Scenery::rayTrace(Screen::Coord2dSet & ij,
 	  if (data->spectrum)
 	    for (size_t c=0; c<nbnuobs; ++c)
 	      data->spectrum[cs+c*data->offset]=
+# ifdef GYOTO_USE_UDUNITS
 		data->spectrum_converter_?
 		(*data->spectrum_converter_)(locdata->spectrum[c]):
+# endif
 		locdata->spectrum[c];
 	  if (data->binspectrum)
 	    for (size_t c=0; c<nbnuobs; ++c)
 	      data->binspectrum[cs+c*data->offset]=
+# ifdef GYOTO_USE_UDUNITS
 		data->binspectrum_converter_?
 		(*data->binspectrum_converter_)(locdata->binspectrum[c]):
+# endif
 		locdata->binspectrum[c];
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git