about summary refs log tree commit diff
path: root/converter
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-19 03:25:42 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-19 03:25:42 +0000
commit5e3a1ff09e327f6e1de32ae3d4718f3579559f32 (patch)
treebd1c2dea327ed56bf4fad12cf9d873c4b659da83 /converter
parent1f2aae5b55e42ed8fa247785ee896f750042a12d (diff)
downloadnetpbm-mirror-5e3a1ff09e327f6e1de32ae3d4718f3579559f32.tar.gz
netpbm-mirror-5e3a1ff09e327f6e1de32ae3d4718f3579559f32.tar.xz
netpbm-mirror-5e3a1ff09e327f6e1de32ae3d4718f3579559f32.zip
Remove VMS code. Who are we kidding?
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1216 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r--converter/other/fiasco/getopt.c7
-rw-r--r--converter/other/pamtotiff.c6
-rw-r--r--converter/other/sgitopnm.c34
-rw-r--r--converter/other/tiff.c6
-rw-r--r--converter/other/tifftopnm.c6
5 files changed, 7 insertions, 52 deletions
diff --git a/converter/other/fiasco/getopt.c b/converter/other/fiasco/getopt.c
index 0b2d1b75..f5baf7d3 100644
--- a/converter/other/fiasco/getopt.c
+++ b/converter/other/fiasco/getopt.c
@@ -73,13 +73,6 @@
 #include <unistd.h>
 #endif	/* GNU C library.  */
 
-#ifdef VMS
-#include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
-#endif
-
 #if defined (WIN32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
diff --git a/converter/other/pamtotiff.c b/converter/other/pamtotiff.c
index 59261a99..b0cab9a9 100644
--- a/converter/other/pamtotiff.c
+++ b/converter/other/pamtotiff.c
@@ -27,12 +27,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#ifdef VMS
-#ifdef SYSV
-#undef SYSV
-#endif
-#include <tiffioP.h>
-#endif
 /* tiffio.h has a weird problem on AIX.  tiffio.h wrongly typedefs
    "int32".  That's wrong because such a name is likely to be used in
    other parts of the program that includes tiffio.h.  And in fact, on
diff --git a/converter/other/sgitopnm.c b/converter/other/sgitopnm.c
index 0d26bb9c..63814fdb 100644
--- a/converter/other/sgitopnm.c
+++ b/converter/other/sgitopnm.c
@@ -16,19 +16,10 @@
 ** 08Feb94: minor bugfix
 ** 29Jul00: added -channel option (smar@reptiles.org)
 */
+#include <unistd.h>
+#include "mallocvar.h"
 #include "pnm.h"
 #include "sgi.h"
-#include "mallocvar.h"
-#ifndef VMS
-#include <unistd.h>
-#endif
-
-/*#define DEBUG*/
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
 
 /* entry in RLE offset table */
 typedef struct {
@@ -60,6 +51,7 @@ static void       rle_decompress ARGS((ScanElem *src, int srclen, ScanElem *dest
 static short verbose = 0;
 
 
+
 int
 main(argc, argv)
     int argc;
@@ -199,10 +191,6 @@ read_header(ifp, channel)
         pm_message("compression: %d = %s", head->storage, compression_name(head->storage));
         head->name[79] = '\0';  /* just to be safe */
         pm_message("Image name: \"%s\"", head->name);
-#ifdef DEBUG
-        pm_message("bpc: %d    dimension: %d    zsize: %d", head->bpc, head->dimension, head->zsize);
-        pm_message("pixmin: %ld    pixmax: %ld    colormap: %ld", head->pixmin, head->pixmax, head->colormap);
-#endif
     }
 
     return head;
@@ -219,10 +207,6 @@ read_table(ifp, tablen)
 
     MALLOCARRAY_NOFAIL(table, tablen);
 
-#ifdef DEBUG
-    pm_message("reading offset table");
-#endif
-
     for( i = 0; i < tablen; i++ )
         table[i].start = get_big_long(ifp);
     for( i = 0; i < tablen; i++ )
@@ -243,13 +227,9 @@ read_channels(ifp, head, table, func, ochan)
 {
     ScanLine *image;
     ScanElem *temp;
-    int channel, maxchannel, row, sgi_index, i;
+    int channel, maxchannel, sgi_index, i;
     long offset, length;
 
-#ifdef DEBUG
-    pm_message("reading channels");
-#endif
-
     if (ochan < 0) {
         maxchannel = (head->zsize < 3) ? head->zsize : 3;
         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
@@ -261,9 +241,7 @@ read_channels(ifp, head, table, func, ochan)
         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
 
     for( channel = 0; channel < maxchannel;  channel++ ) {
-#ifdef DEBUG
-        pm_message("    channel %d", channel);
-#endif
+        unsigned int row;
         for( row = 0; row < head->ysize; row++ ) {
             int iindex;
 
@@ -300,6 +278,7 @@ read_channels(ifp, head, table, func, ochan)
 }
 
 
+
 static void
 image_to_pnm(Header *head, ScanLine *image, xelval maxval, int channel)
 {
@@ -335,6 +314,7 @@ image_to_pnm(Header *head, ScanLine *image, xelval maxval, int channel)
 }
 
 
+
 static void
 rle_decompress(src, srcleft, dest, destleft)
     ScanElem *src;
diff --git a/converter/other/tiff.c b/converter/other/tiff.c
index 90d50710..d0cbbd74 100644
--- a/converter/other/tiff.c
+++ b/converter/other/tiff.c
@@ -10,12 +10,6 @@
 
 #include <string.h>
 
-#ifdef VMS
-#ifdef SYSV
-#undef SYSV
-#endif
-#include <tiffioP.h>
-#endif
 #include <tiffio.h>
 
 #include "pm_c_util.h"
diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c
index 1cf869fb..756b55e9 100644
--- a/converter/other/tifftopnm.c
+++ b/converter/other/tifftopnm.c
@@ -59,12 +59,6 @@
 #include "nstring.h"
 #include "pnm.h"
 
-#ifdef VMS
-#ifdef SYSV
-#undef SYSV
-#endif
-#include <tiffioP.h>
-#endif
 /* See warning about tiffio.h in pamtotiff.c */
 #include <tiffio.h>