[Debian-med-packaging] [SCM] lipsia branch, master, updated. upstream/1.6.0-55-gcb6c1b5

[Michael Hanke]

The following commit has been merged in the master branch:
commit 01af8093d7cbdb9eb45c09434f6f8b4b8b78effd
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Wed Jul 21 15:26:58 2010 -0400

    Revert feature branches in favor of quilt patches.

diff --git a/src/anatov/CMakeLists.txt b/src/anatov/CMakeLists.txt
index 5d57fcc..8ba4272 100644
--- a/src/anatov/CMakeLists.txt
+++ b/src/anatov/CMakeLists.txt
@@ -4,9 +4,8 @@ ADD_EXECUTABLE(anatov anatov.c tools.c)
 TARGET_LINK_LIBRARIES(anatov lipsia ${VIA_LIBRARY})
 
 SET_TARGET_PROPERTIES(anatov
-# tools.c uses 'popen' which is not part of ANSI C
-#    COMPILE_FLAGS -ansi
-    PROPERTIES LINK_FLAGS -Wl)
+    PROPERTIES COMPILE_FLAGS -ansi
+    LINK_FLAGS -Wl)
 
 INSTALL(TARGETS anatov
         RUNTIME DESTINATION ${LIPSIA_INSTALL_BIN_DIR}
diff --git a/src/anatov/anatov.c b/src/anatov/anatov.c
index fbbae07..7b639d9 100755
--- a/src/anatov/anatov.c
+++ b/src/anatov/anatov.c
@@ -93,9 +93,7 @@ int set_aux_hdr_values(VImage img, char** lines, int nlines, int dl) {
 
   for (i = 0; i < nlines; i++) {
 
-    /* 'index' is not part of ISO C */
-    /*val = (char *)index(lines[i], 58);*/
-    val = (char *)strchr(lines[i], 58);	/* perl -e'print ord ":"' */
+    val = (char *)index(lines[i], 58);	/* perl -e'print ord ":"' */
     if (val != NULL) {
       keylen = strlen(lines[i]) - strlen(val) + 1;
 
diff --git a/src/brutov2/brutov2.C b/src/brutov2/brutov2.C
index 566de2b..0371ba7 100755
--- a/src/brutov2/brutov2.C
+++ b/src/brutov2/brutov2.C
@@ -27,7 +27,6 @@
 
 
 /* global includes */
-#include <cstdio>
 #include <string>
 #include <sstream>
 #include <vector>
diff --git a/src/lib_lipsia/GetVersion.c b/src/lib_lipsia/GetVersion.c
index 99de71d..aae6a32 100644
--- a/src/lib_lipsia/GetVersion.c
+++ b/src/lib_lipsia/GetVersion.c
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <viaio/Vlib.h>
 
 char * getLipsiaVersion() {
 
diff --git a/src/vgauss/vgauss.c b/src/vgauss/vgauss.c
index 50e025a..d514e97 100755
--- a/src/vgauss/vgauss.c
+++ b/src/vgauss/vgauss.c
@@ -25,8 +25,6 @@
 
 static int verbose=0; 
 extern char * getLipsiaVersion();
-extern VImage VGaussianConv (VImage src, VImage dest, VBand band,
-                             double sigma, int filter_size);
 
 int main (int argc, char **argv)
 {
diff --git a/src/vsendserv/vsendserv.C b/src/vsendserv/vsendserv.C
index 6e57193..0cd9fe4 100644
--- a/src/vsendserv/vsendserv.C
+++ b/src/vsendserv/vsendserv.C
@@ -26,7 +26,6 @@
  *****************************************************************/
  
 #include <iostream>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <unistd.h>
diff --git a/src/vspectral/vspectral.c b/src/vspectral/vspectral.c
index 8710fea..76afbda 100755
--- a/src/vspectral/vspectral.c
+++ b/src/vspectral/vspectral.c
@@ -68,7 +68,6 @@ extern void CovarianceSequence(VImage*,double*,double*,int,int);
 extern double p2t(double,double);
 extern double p2z(double);
 extern char * getLipsiaVersion();
-extern VImage VLabelImage3d(VImage,VImage,int,VRepnKind,int *);
 
 int 
 main (int argc,char *argv[])

-- 
Leipzig Image Processing and Statistical Inference Algorithms (LIPSIA)