*** xv.c Fri Oct 16 14:20:08 1992 --- xv.c.orig Wed Apr 29 16:01:47 1992 *************** *** 125,135 **** /* yech! */ - #ifdef HAVE_G3 - #define G3 10 - #endif /* HAVE_G3 */ static int revvideo = 0; /* true if we should reverse video */ static int dfltkludge = 0; /* true if we're viewing dfltpic */ static int keeparound = 1; /* if true, don't quit after del. last image */ --- 125,133 ---- /* yech! */ + static int revvideo = 0; /* true if we should reverse video */ static int dfltkludge = 0; /* true if we're viewing dfltpic */ static int keeparound = 1; /* if true, don't quit after del. last image */ *************** *** 175,183 **** static void smoothResize(); #endif - #ifdef HAVE_G3 - int highresg3 = 0; - #endif /* HAVE_G3 */ /*******************************************/ int main(argc, argv) --- 173,178 ---- *************** *** 569,580 **** else if (!argcmp(argv[i],"-nolimits",3)) /* waitloop */ nolimits++; ! ! #ifdef HAVE_G3 ! else if (!argcmp(argv[i],"-highresg3",4)) /* High Resolution Fax */ ! highresg3++; ! #endif /* HAVE_G3 */ ! else Syntax(); } --- 564,570 ---- else if (!argcmp(argv[i],"-nolimits",3)) /* waitloop */ nolimits++; ! else Syntax(); } *************** *** 1023,1031 **** printoption("[-wait seconds]"); printoption("[-white color]"); printoption("[-wloop]"); - #ifdef HAVE_G3 - printoption("[-highresg3]"); - #endif /* HAVE_G3 */ printoption("[filename ...]"); fprintf(stderr,"\n\n"); Quit(1); --- 1013,1018 ---- *************** *** 1336,1348 **** filetype = PDSVICAR; #endif - #ifdef HAVE_G3 - else if (magicno[0]==0 && magicno[1]==1 && - magicno[2]==77 && magicno[3]==154 && - magicno[4]==128 && magicno[5]==0 && - magicno[6]==1 && magicno[7]==77) - filetype = G3; - #endif /* HAVE_G3 */ if (filetype == UNKNOWN) { SetISTR(ISTR_INFO,"'%s' not in a recognized format.", basefname); --- 1323,1328 ---- *************** *** 1372,1381 **** #ifdef HAVE_PDS case PDSVICAR: i = LoadPDS(filename, ncols); break; #endif - - #ifdef HAVE_G3 - case G3: i = LoadG3 (filename,ncols); break; - #endif /* HAVE_G3 */ } --- 1352,1357 ----