[SCM] imview packaging branch, master, updated. debian/1.1.9c-11-5-g19733e6

[Anton Gladky]

The following commit has been merged in the master branch:
commit 19733e6a26cfaff9feb62a5062ea57e86b492915
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Feb 12 20:46:19 2013 +0100

    Update patch.

diff --git a/debian/patches/04_disable_ics-reader.patch b/debian/patches/04_disable_ics-reader.patch
index 05af762..ddfd9f5 100644
--- a/debian/patches/04_disable_ics-reader.patch
+++ b/debian/patches/04_disable_ics-reader.patch
@@ -14,3 +14,66 @@ Last-Update: 2013-02-12
  	readpnm.cxx \
  	cpostscript.cxx \
  	savetiff.cxx \
+--- a/imageIO.cxx
++++ b/imageIO.cxx
+@@ -78,7 +78,6 @@
+ #include "io/readgif.hxx"
+ #include "io/readtiff.hxx"
+ #include "io/readZimage.hxx"
+-#include "io/readics.hxx"
+ #include "io/readpnm.hxx"
+ #include "io/readsocket.hxx"
+ #include "io/readraw.hxx"
+@@ -188,14 +187,6 @@
+     // then try our luck with SCILimage and MetaImage (mha/mhd)
+     strcpy(tmpfilename, filename);
+     if ((tp = strrchr(tmpfilename, '.')) != 0) {
+-        if ((strncmp(tp, ".ics", 4) == 0)
+-            || (strncmp(tp, ".ids", 4) == 0)) {
+-            if (access(tmpfilename, R_OK) == 0) {
+-                return IMAGEIO_SCILIMAGE;
+-            } else {
+-                return IMAGEIO_UNREADABLE;
+-            }
+-        }
+         if ((strncmp(tp, ".mha", 4) == 0)
+             || (strncmp(tp, ".mhd", 4) == 0)) {
+             if (access(tmpfilename, R_OK) == 0) {
+@@ -205,14 +196,6 @@
+             }
+         }
+     }
+-    strcat(tmpfilename, ".ics");
+-    if (access(tmpfilename, F_OK) == 0) {
+-        if (access(tmpfilename, R_OK) == 0) {
+-            return IMAGEIO_SCILIMAGE;
+-        } else {
+-            return IMAGEIO_UNREADABLE;
+-        }
+-    }
+ 
+     
+ 
+@@ -328,11 +311,6 @@
+             rv = readZImage(filename, frame);
+             break;
+ 
+-        case IMAGEIO_SCILIMAGE:
+-            dbgprintf("Input image is SCIL\n");
+-            rv = readICSImage(filename);
+-            break;
+-
+         case IMAGEIO_METAIMAGE:
+             dbgprintf("Input image is META (ITK)\n");
+             rv = readMETAImage(filename, frame);
+@@ -441,10 +419,6 @@
+         rv = zimagenbsubfiles(fname);
+         break;
+ 
+-    case IMAGEIO_SCILIMAGE:
+-        rv = icsnbsubfiles(fname);
+-        break;
+-
+     case IMAGEIO_METAIMAGE:
+         rv = metanbsubfiles(fname);
+         break;

-- 
imview packaging