File no-return-in-nonvoid-function.patch of Package ds9

Overview Repositories Revisions Requests Users Attributes Meta

File no-return-in-nonvoid-function.patch of Package ds9 (Revision 69093325c7690b8ad9b440869525a8ab)

Currently displaying revision 69093325c7690b8ad9b440869525a8ab , Show latest

tksao: fix no-return-in-nonvoid-function

While this doesn't break the _actual_ build, openSUSE runs additional
checks on the output of gcc's warnings -- resulting in package builds
failing because of upstream bugs.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Index: b/tksao/frame/context.C
===================================================================
--- a/tksao/frame/context.C
+++ b/tksao/frame/context.C
@@ -837,6 +837,7 @@ FitsZBound* Context::getDataParams(FrSca
   case FrScale::CROPSEC:
     return &cparams;
   }
+  return NULL;
 }
 
 Vector Context::getMinMax()
Index: b/tksao/frame/fitsdata.C
===================================================================
--- a/tksao/frame/fitsdata.C
+++ b/tksao/frame/fitsdata.C
@@ -143,6 +143,7 @@ int FitsData::calcIncr()
   case FrScale::SAMPLE:
     return minmaxSample_;
   }
+  return -1;
 }
 
 // AutoCut
@@ -290,6 +291,7 @@ double FitsData::min()
     else
       return 0;
   }
+  return 0;
 }
 
 double FitsData::max()
@@ -310,6 +312,7 @@ double FitsData::max()
       return irafmax_;
     return 0;
   }
+  return 0;
 }
 
 // FitsDatam
Index: b/tksao/frame/marker.C
===================================================================
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -352,6 +352,7 @@ GC Marker::renderXGC(RenderMode mode)
     renderXLineDash(gcxor);
     return gcxor;
   }
+  return gc;
 }
 
 void Marker::renderXLineDash(GC lgc)
@@ -1188,6 +1189,7 @@ double Marker::calcAngle()
   case Coord::YY:
     return -angle + parent->getRotation();
   }
+  return 0;
 }
 
 Vector Marker::modifyArrow(const Vector& p1, const Vector& p2, 
Index: b/tksao/frame/projection.C
===================================================================
--- a/tksao/frame/projection.C
+++ b/tksao/frame/projection.C
@@ -75,6 +75,7 @@ GC Projection::renderXGC(RenderMode mode
     renderXLineDash(gcxor);
     return gcxor;
   }
+  return gc;
 }
 
 void Projection::renderPS(PSColorSpace mode)
diff -Pdur SAOImageDS9.orig/fitsy/compress.C SAOImageDS9/fitsy/compress.C
--- SAOImageDS9.orig/fitsy/compress.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/fitsy/compress.C	2021-05-27 13:51:51.900192671 +0200
@@ -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 -Pdur SAOImageDS9.orig/tksao/frame/marker.C SAOImageDS9/tksao/frame/marker.C
--- SAOImageDS9.orig/tksao/frame/marker.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/marker.C	2021-05-27 13:57:29.599430571 +0200
@@ -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);
@@ -1074,6 +1076,7 @@
 {
   switch (parent->getOrientation()) {
   case Coord::NORMAL:
+  default:
   case Coord::XY:
     return angle + parent->getRotation();
   case Coord::XX:
@@ -1100,6 +1103,7 @@
 {
   switch (parent->frameType()) {
   case Base::F2D:
+  default:
     return arrow2D(p1,p2,sys);
   case Base::F3D:
     return arrow3D(p1,p2,sys);
diff -Pdur SAOImageDS9.orig/tksao/frame/frmap.C SAOImageDS9/tksao/frame/frmap.C
--- SAOImageDS9.orig/tksao/frame/frmap.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/frmap.C	2021-05-27 13:55:51.434490340 +0200
@@ -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();
   }

Places

File no-return-in-nonvoid-function.patch of Package ds9 (Revision 69093325c7690b8ad9b440869525a8ab)

Places