openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File ds9.patch of Package ds9 (Revision 59f774da5afb24501bca866454a74214)

Currently displaying revision 59f774da5afb24501bca866454a74214 , Show latest

diff -ur SAOImageDS9.orig/ast/plot.h SAOImageDS9/ast/plot.h
--- SAOImageDS9.orig/ast/plot.h	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/ast/plot.h	2021-03-06 13:26:17.079561956 +0100
@@ -696,7 +696,7 @@
 #if defined(astCLASS)            /* Protected. */
 AstPlot *astPlot_( void *, const float *, const double *, const char *, int *, ...);
 #else
-AstPlot *astPlotId_( void *, const float [], const double [], const char *, ... )__attribute__((format(printf,4,5)));
+AstPlot *astPlotId_( void *, const float [], const double [], const char *, ... );
 #endif
 
 #if defined(astCLASS)            /* Protected */
diff -ur SAOImageDS9.orig/fitsy/compress.C SAOImageDS9/fitsy/compress.C
--- SAOImageDS9.orig/fitsy/compress.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/fitsy/compress.C	2021-03-06 13:06:08.881399223 +0100
@@ -628,6 +628,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -647,6 +648,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -674,6 +676,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -693,6 +696,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -722,6 +726,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -742,6 +748,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -770,6 +778,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -790,6 +800,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
diff -ur SAOImageDS9.orig/libxml2/Makefile.am SAOImageDS9/libxml2/Makefile.am
--- SAOImageDS9.orig/libxml2/Makefile.am	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/libxml2/Makefile.am	2021-03-06 15:05:56.956765628 +0100
@@ -218,7 +218,7 @@
 
 asan:
 	@echo '## rebuilding for ASAN'
-	./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff  ; $(MAKE) clean ; $(MAKE)
+	./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff  ; $(MAKE) clean ; $(MAKE)
 
 testall : tests SVGtests SAXtests
 
diff -ur SAOImageDS9.orig/tksao/frame/context.C SAOImageDS9/tksao/frame/context.C
--- SAOImageDS9.orig/tksao/frame/context.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/tksao/frame/context.C	2021-03-06 13:06:34.709612929 +0100
@@ -765,6 +765,7 @@
   case FrScale::DATASEC:
     return &iparams;
   case FrScale::CROPSEC:
+  default:
     return &cparams;
   }
 }
diff -ur SAOImageDS9.orig/tksao/frame/fitsdata.C SAOImageDS9/tksao/frame/fitsdata.C
--- SAOImageDS9.orig/tksao/frame/fitsdata.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/tksao/frame/fitsdata.C	2021-03-06 13:07:48.502235523 +0100
@@ -153,6 +153,7 @@
   case FrScale::IRAFMIN:
     return 1;
   case FrScale::SAMPLE:
+  default:
     return minmaxSample_;
   }
 }
@@ -288,6 +289,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     return min_;
 
   case FrScale::DATAMIN:
@@ -309,6 +311,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     return max_;
 
   case FrScale::DATAMIN:
diff -ur SAOImageDS9.orig/tksao/frame/frmap.C SAOImageDS9/tksao/frame/frmap.C
--- SAOImageDS9.orig/tksao/frame/frmap.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/tksao/frame/frmap.C	2021-03-06 13:08:34.166621501 +0100
@@ -100,6 +100,7 @@
   case Coord::MAGNIFIER:
     return vv * refToMagnifier;
   case Coord::PS:
+  default:
     // should not happen
     return Vector();
   }
@@ -123,6 +124,7 @@
   case Coord::MAGNIFIER:
     return vv * magnifierToRef;
   case Coord::PS:
+  default:
     // should not happen
     return Vector();
   }
diff -ur SAOImageDS9.orig/tksao/frame/marker.C SAOImageDS9/tksao/frame/marker.C
--- SAOImageDS9.orig/tksao/frame/marker.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/tksao/frame/marker.C	2021-03-06 13:48:19.655183040 +0100
@@ -278,6 +278,7 @@
     GC lgc;
     switch (mode) {
     case SRC:
+    default:
       lgc = gc;
       XSetForeground(display, gc, color);
       break;
@@ -343,6 +344,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     if ((properties & SOURCE) && !(properties & DASH))
       renderXLineNoDash(gc);
@@ -1168,6 +1170,7 @@
   switch (parent->getOrientation()) {
   case Coord::NORMAL:
   case Coord::XY:
+  default:
     return angle + parent->getRotation();
   case Coord::XX:
   case Coord::YY:
@@ -1193,6 +1196,7 @@
 {
   switch (parent->frameType()) {
   case Base::F2D:
+  default:
     return arrow2D(p1,p2,sys);
   case Base::F3D:
     return arrow3D(p1,p2,sys);
diff -ur SAOImageDS9.orig/tksao/frame/projection.C SAOImageDS9/tksao/frame/projection.C
--- SAOImageDS9.orig/tksao/frame/projection.C	2021-01-12 19:17:40.000000000 +0100
+++ SAOImageDS9/tksao/frame/projection.C	2021-03-06 13:10:18.651501350 +0100
@@ -65,6 +65,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     renderXLineNoDash(gc);
     return gc;

Places

File ds9.patch of Package ds9 (Revision 59f774da5afb24501bca866454a74214)

Places