[4165] in SIPB bug reports
Re: modified xmosaic
daemon@ATHENA.MIT.EDU (Jonathan A. Sheena)
Tue Oct 12 23:33:44 1993
Date: Tue, 12 Oct 93 23:29:24 -0400
From: jsheena@florey.media.mit.edu (Jonathan A. Sheena)
To: Calvin Clark <MIT.EDU!ckclark@plethora.media.mit.edu>
Cc: yandros@mit.edu, ckclark@mit.edu, bug-sipb@mit.edu, bug-outland@mit.edu,
biff@mit.edu, lacsap@media.mit.edu, jsheena@mit.edu, sipb-ec@mit.edu
I appologize for this mess. It seems as though a lack of communication on the
part of both parties didn't help. Had we been told what the "proper channels"
were, we would have been more than happy to follow them, but we did as we were
told, and expected what we were promised at every step.
The intention was *not* to try to coerce a few sipb members to get our way.
Here are the diffs, as requested. The directory permissions have been changed,
(thank you for pointing that out). Please, put the sources where you think
they should go ... they certainly do not need to be in fishwrap.
Apologies again for stepping on any toes unknowingly, Next time just say "make
changes, test them, and send the diffs to bug-sipb" and that's what we'll do.
----------------------
Modified files are:
(diffed against the .orig files ... same as found in
/afs/sipb/project/infoagents/src/xmosaic-media)
xmosaic-media/libwww/HTFormat.h
xmosaic-media/libwww/HTFormat.c
xmosaic-media/libwww/HTFile.c
xmosaic-media/src/gui.c
xmosaic-media/src/mosaic.h
xmosaic-media/src/xresources.h
*** HTFormat.h Fri Oct 8 18:15:53 1993
--- HTFormat.h.orig Fri Oct 8 18:16:03 1993
***************
*** 36,45 ****
#define WWW_TAR 18
#define WWW_CAVE 19
#define WWW_HDF 20
- /*
- * for pasc
- */
- #define WWW_PNP 21
#define WWW_COMPRESSED 32
#define WWW_GZIPPED 33
--- 36,41 ----
*** HTFormat.c Fri Oct 8 18:15:53 1993
--- HTFormat.c.orig Fri Oct 8 18:16:02 1993
***************
*** 198,208 ****
extern char *gif_reader, *jpeg_reader, *audio_reader, *aiff_reader,
*postscript_reader, *dvi_reader, *mpeg_reader, *mime_reader,
*xwd_reader, *sgimovie_reader, *evlmovie_reader, *rgb_reader,
! *tiff_reader, *cave_reader, *hdf_reader,
! /*
! * for pasc
! */
! *pnp_reader;
extern char *uncompress_program, *gunzip_program;
int done = 0, plaintext = 0, impossible = 0;
/* If this is non-zero, we won't do anything special with the document
--- 198,204 ----
extern char *gif_reader, *jpeg_reader, *audio_reader, *aiff_reader,
*postscript_reader, *dvi_reader, *mpeg_reader, *mime_reader,
*xwd_reader, *sgimovie_reader, *evlmovie_reader, *rgb_reader,
! *tiff_reader, *cave_reader, *hdf_reader;
extern char *uncompress_program, *gunzip_program;
int done = 0, plaintext = 0, impossible = 0;
/* If this is non-zero, we won't do anything special with the document
***************
*** 372,384 ****
pipe_to_reader (anchor, file_number, cave_reader);
done = 1;
break;
- /*
- * for pasc
- */
- case WWW_PNP:
- pipe_to_reader (anchor, file_number, pnp_reader);
- done = 1;
- break;
case WWW_UNKNOWN:
case WWW_TAR:
/* We get WWW_UNKNOWN when we know we want to just dump
--- 368,373 ----
*** HTFile.c Fri Oct 8 18:15:52 1993
--- HTFile.c.orig Fri Oct 8 18:16:02 1993
***************
*** 326,337 ****
else if (caseless_equal(".jpeg", extension) ||
caseless_equal(".jpg", extension))
fmt = WWW_JPEG;
- /*
- * for pasc
- * jsheena added 10-8-93
- */
- else if (caseless_equal(".pnp", extension))
- fmt = WWW_PNP;
else if (caseless_equal(".au", extension) ||
caseless_equal(".snd", extension))
fmt = WWW_AUDIO;
--- 326,331 ----
*** gui.c Fri Oct 8 18:16:13 1993
--- gui.c.orig Fri Oct 8 18:16:27 1993
***************
*** 131,140 ****
char *evlmovie_reader;
char *rgb_reader;
char *cave_reader;
- /*
- * For pasc
- */
- char *pnp_reader;
char *uncompress_program;
char *gunzip_program;
--- 131,136 ----
***************
*** 3303,3312 ****
evlmovie_reader = Rdata.evlmovie_viewer_command;
rgb_reader = Rdata.rgb_viewer_command;
cave_reader = Rdata.cave_viewer_command;
- /*
- * for pasc
- */
- pnp_reader = Rdata.pnp_viewer_command;
uncompress_program = Rdata.uncompress_command;
gunzip_program = Rdata.gunzip_command;
--- 3299,3304 ----
*** mosaic.h Fri Oct 8 18:16:23 1993
--- mosaic.h.orig Fri Oct 8 18:16:27 1993
***************
*** 436,445 ****
char *evlmovie_viewer_command;
char *rgb_viewer_command;
char *postscript_viewer_command;
- /*
- * for pasc
- */
- char *pnp_viewer_command;
int colors_per_inlined_image;
Boolean instrument_usage;
--- 436,441 ----
*** xresources.h Fri Oct 8 18:16:25 1993
--- xresources.h.orig Fri Oct 8 18:16:27 1993
***************
*** 162,173 ****
{ "sgimovieViewerCommand", "SgimovieViewerCommand",
XtRString, sizeof (char *),
offset (sgimovie_viewer_command), XtRString, "movieplayer" },
- /*
- * for pasc
- */
- { "pnpViewerCommand", "PnpViewerCommand", XtRString, sizeof (char *),
- offset (pnp_viewer_command), XtRString,
- "/afs/fishwrap.mit.edu/export/bin/common/xfeedback" },
/* Don't even ask what this is; it's a local hack... */
{ "evlmovieViewerCommand", "EvlmovieViewerCommand",
XtRString, sizeof (char *),
--- 162,167 ----