Sophie

Sophie

distrib > Mageia > 6 > armv5tl > media > core-release-src > by-pkgid > 1c2c51afc3284db25b4799e1ce873f29 > files > 6

ds9-7.5-2.mga6.src.rpm

--- saods9/tksao/colorbar/cbgrid.C.orig	2017-02-14 16:34:10.866190711 +0100
+++ saods9/tksao/colorbar/cbgrid.C	2017-02-14 16:34:46.106843271 +0100
@@ -194,7 +194,7 @@
     pbox[3] = 0;
   }
 
-  plot = astPlot(frameSet, gbox, pbox, option_);
+  plot = astPlot(frameSet, gbox, pbox, "%s", option_);
 
   // and now create astGrid
   astGrid2dPtr = this;
--- saods9/tksao/frame/fitsimage.C.orig	2017-02-14 16:35:48.818004510 +0100
+++ saods9/tksao/frame/fitsimage.C	2017-02-14 16:36:44.349032792 +0100
@@ -3215,7 +3215,7 @@
 
   ostringstream str;
   str << "Format(" << id << ")=" << format << ends;
-  astSet(aa, str.str().c_str());
+  astSet(aa, "%s", str.str().c_str());
 }
 
 void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
--- saods9/tksao/frame/grid25d.C.orig	2017-02-14 16:37:22.409737572 +0100
+++ saods9/tksao/frame/grid25d.C	2017-02-14 16:38:26.440923253 +0100
@@ -113,7 +113,7 @@
   // and now create astGrid
   astGrid25dPtr = this;
 
-  AstPlot* plot = astPlot(frameSet, gbox, pbox, option_);
+  AstPlot* plot = astPlot(frameSet, gbox, pbox, "%s", option_);
   astGrid(plot);
 
   astEnd; // now, clean up memory
@@ -132,7 +132,7 @@
   AstCmpMap* cmap = astCmpMap(mm, sm, 1, "");
 
   AstFrame* in = astFrame(2,"Domain=REF");
-  AstFrame* out = astFrame(2,str);
+  AstFrame* out = astFrame(2,"%s",str);
 
   AstFrameSet* frameSet = astFrameSet(in,"");
   astAddFrame(frameSet,AST__CURRENT,cmap,out);
--- saods9/tksao/frame/grid2d.C.orig	2017-02-14 16:39:19.341902834 +0100
+++ saods9/tksao/frame/grid2d.C	2017-02-14 16:40:02.322698720 +0100
@@ -123,7 +123,7 @@
   // and now create astGrid
   astGrid2dPtr = this;
 
-  plot = astPlot(frameSet, gbox, pbox, option_);
+  plot = astPlot(frameSet, gbox, pbox, "%s", option_);
   astGrid(plot);
 
   astEnd; // now, clean up memory
@@ -151,7 +151,7 @@
   if (!(cmp = astCmpMap(mm, sm, 1, "")))
     return 0;
 
-  astAddFrame(frameSet, AST__CURRENT, cmp, astFrame(2, str));
+  astAddFrame(frameSet, AST__CURRENT, cmp, astFrame(2, "%s", str));
 
   return 1;
 }
204c204
<   AstFrame* out = astFrame(3,str);
---
>   AstFrame* out = astFrame(3,"%s",str);
--- saods9/tksao/frame/grid3d.C.orig	2017-02-14 17:06:25.824227626 +0100
+++ saods9/tksao/frame/grid3d.C	2017-02-14 17:06:49.204669332 +0100
@@ -201,7 +201,7 @@
     return NULL;
 
   AstFrame* in = astFrame(3,"Domain=REF");
-  AstFrame* out = astFrame(3,str);
+  AstFrame* out = astFrame(3,"%s",str);
 
   double uu =.5;
   AstShiftMap* mapz = astShiftMap(1,&uu,"");