[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

pio is almost working, if not for the crashing


  M +2 -2      configure.in.in   1.4
  M +1 -0      kst/datasources/planck/Makefile.am   1.3
  M +8 -0      kst/datasources/planck/planck.cpp   1.5
  M +2 -0      kst/datasources/planck/planckdata.h   1.3
  M +1 -1      kst/datasources/planck/plancktoi.cpp   1.4


--- kdeextragear-2/kst/configure.in.in  #1.3:1.4
@@ -10,6 +10,6 @@
 KDE_CHECK_HEADER(HL2_PIOLIB/PIOLib.h, AC_DEFINE(HAVE_PIOLIB_H, 1, [If we have piolib headers]) have_piolib_h=yes, , )
 
-KDE_CHECK_LIB(piolib, PIOCloseTOI, KST_LIBS="-lpiolib $KST_LIBS", , )
-AC_SUBST(KST_LIBS)
+KDE_CHECK_LIB(piolib, PIOCloseTOI, PIOLIBS="-lpiolib $PIOLIBS", , )
+AC_SUBST(PIOLIBS)
 
 if test $ac_cv_lib_piolib_PIOCloseTOI = yes; then

--- kdeextragear-2/kst/kst/datasources/planck/Makefile.am  #1.2:1.3
@@ -3,4 +3,5 @@
 kde_module_LTLIBRARIES=kstdata_planck.la
 
+kstdata_planck_la_LIBADD=$(PIOLIBS)
 kstdata_planck_la_LDFLAGS=$(all_libraries) -module -avoid-version
 kstdata_planck_la_SOURCES=planck.cpp planckdata.cpp plancktoi.cpp pparser.cpp

--- kdeextragear-2/kst/kst/datasources/planck/planck.cpp  #1.4:1.5
@@ -101,4 +101,12 @@ int PlanckSource::readField(double *v, c
   QSize sz = _planckTOI->range(split[0], split[1]);
 
+  if (s > sz.height() - sz.width()) {
+    return 0;
+  }
+
+  if (s + n > sz.height() - sz.width()) {
+    n = sz.height() - sz.width() - s;
+  }
+
   if (n < 0) {
     n = 1;

--- kdeextragear-2/kst/kst/datasources/planck/planckdata.h  #1.2:1.3
@@ -24,5 +24,7 @@
 
 #ifdef KST_HAVE_PLANCK
+extern "C" {
 #include <HL2_PIOLIB/PIOLib.h>
+}
 #endif
 

--- kdeextragear-2/kst/kst/datasources/planck/plancktoi.cpp  #1.3:1.4
@@ -169,5 +169,5 @@ int TOI::readObject(const QString& group
     QString range;
 
-    if (start < 0) {
+    if (start < 0 || end < start) {
       // Leave blank
     } else {