diff -c -r ImageMagick/Imakefile /alpha/home/cristy/ImageMagick/Imakefile *** ImageMagick/Imakefile Fri Nov 22 17:25:12 1991 --- /alpha/home/cristy/ImageMagick/Imakefile Fri Nov 22 17:34:59 1991 *************** *** 1,3 **** --- 1,28 ---- + # + # Imakefile for display, animate, montage, XtoPS, and import. + # + # Copyright 1991 E. I. du Pont de Nemours & Company + # + # Permission to use, copy, modify, distribute, and sell this software and + # its documentation for any purpose is hereby granted without fee, + # provided that the above Copyright notice appear in all copies and that + # both that Copyright notice and this permission notice appear in + # supporting documentation, and that the name of E. I. du Pont de Nemours + # & Company not be used in advertising or publicity pertaining to + # distribution of the software without specific, written prior + # permission. E. I. du Pont de Nemours & Company makes no representations + # about the suitability of this software for any purpose. It is provided + # "as is" without express or implied warranty. + # + # E. I. du Pont de Nemours & Company disclaims all warranties with regard + # to this software, including all implied warranties of merchantability + # and fitness, in no event shall E. I. du Pont de Nemours & Company be + # liable for any special, indirect or consequential damages or any + # damages whatsoever resulting from loss of use, data or profits, whether + # in an action of contract, negligence or other tortious action, arising + # out of or in connection with the use or performance of this software. + # + EXTRA_LIBRARIES = -lX11 -lm PROGRAMS= display import XtoPS animate montage SRCS= display.c X.c image.c rotate.c quantize.c colors.c compress.c\ *************** *** 28,30 **** --- 53,63 ---- SingleProgramTarget(montage,$(MontageObjects), , ) InstallProgram(montage,$(BINDIR)) InstallManPage(montage,$(MANDIR)) + + #define IHaveSubdirs + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + + SUBDIRS = filters xtp + + MakeSubdirs($(SUBDIRS)) + DependSubdirs($(SUBDIRS)) diff -c -r ImageMagick/Make.com /alpha/home/cristy/ImageMagick/Make.com *** ImageMagick/Make.com Fri Nov 22 17:25:14 1991 --- /alpha/home/cristy/ImageMagick/Make.com Fri Nov 22 17:34:59 1991 *************** *** 73,80 **** $link'link_options' animate,X,image,rotate,quantize,colors,compress,PreRvIcccm,sys$input:/opt sys$share:decw$xlibshr.exe/share $ ! $display:==$'f$environment("default")'display ! $write sys$output "..symbol DISPLAY defined." $ $SkipAnimate: $if ((p1.nes."").and.(p1.nes."Montage")) then goto SkipMontage --- 73,80 ---- $link'link_options' animate,X,image,rotate,quantize,colors,compress,PreRvIcccm,sys$input:/opt sys$share:decw$xlibshr.exe/share $ ! $animate:==$'f$environment("default")'animate ! $write sys$output "..symbol ANIMATE defined." $ $SkipAnimate: $if ((p1.nes."").and.(p1.nes."Montage")) then goto SkipMontage *************** *** 91,98 **** $link'link_options' montage,X,image,rotate,quantize,colors,compress,PreRvIcccm,sys$input:/opt sys$share:decw$xlibshr.exe/share $ ! $display:==$'f$environment("default")'display ! $write sys$output "..symbol DISPLAY defined." $ $SkipMontage: $type sys$input --- 91,98 ---- $link'link_options' montage,X,image,rotate,quantize,colors,compress,PreRvIcccm,sys$input:/opt sys$share:decw$xlibshr.exe/share $ ! $montage:==$'f$environment("default")'montage ! $write sys$output "..symbol MONTAGE defined." $ $SkipMontage: $type sys$input diff -c -r ImageMagick/Manifest.ps /alpha/home/cristy/ImageMagick/Manifest.ps *** ImageMagick/Manifest.ps Fri Nov 22 17:25:21 1991 --- /alpha/home/cristy/ImageMagick/Manifest.ps Fri Nov 22 17:36:16 1991 *************** *** 2,8 **** %%Title: (Directory map of ImageMagick) %%Creator: pstree, (C) 1990 Gisle Aas, NR %%DocumentFonts: Times-Roman ! %%BoundingBox: 60 712 305 742 60.0 0 translate /s {show} bind def /m {moveto} bind def --- 2,8 ---- %%Title: (Directory map of ImageMagick) %%Creator: pstree, (C) 1990 Gisle Aas, NR %%DocumentFonts: Times-Roman ! %%BoundingBox: 60 672 310 742 60.0 0 translate /s {show} bind def /m {moveto} bind def *************** *** 12,190 **** 90 722 m(Imakefile)s 90 712 m(Make.com)s 90 702 m(Makefile)s ! 90 692 m(Makefile.bak)s ! 90 682 m(Manifest.ps)s ! 90 672 m(PreRvIcccm.c)s ! 90 662 m(PreRvIcccm.h)s ! 90 652 m(README)s ! 90 642 m(X.c)s ! 90 632 m(X.h)s ! 90 622 m(XtoPS.c)s ! 90 612 m(XtoPS.man)s ! 90 602 m(animate.c)s ! 90 592 m(animate.h)s ! 90 582 m(animate.man)s ! 90 572 m(colors.c)s ! 90 562 m(compress.c)s ! 90 552 m(display.c)s ! 90 542 m(display.h)s ! 90 532 m(display.man)s ! 180 522 m(AVStoMIFF.c)s ! 180 512 m(GIFtoMIFF.c)s ! 180 502 m(GRAYtoMIFF.c)s ! 180 492 m(Imakefile)s 180 482 m(MIFFtoAVS.c)s 180 472 m(MIFFtoGIF.c)s 180 462 m(MIFFtoGRAY.c)s ! 180 452 m(MIFFtoMTV.c)s ! 180 442 m(MIFFtoPPM.c)s ! 180 432 m(MIFFtoRGB.c)s ! 180 422 m(MIFFtoSUN.c)s ! 180 412 m(MIFFtoTIFF.c)s ! 180 402 m(MIFFtoXBM.c)s ! 180 392 m(MIFFtoXWD.c)s ! 180 382 m(MTVtoMIFF.c)s ! 180 372 m(Makefile)s ! 180 362 m(PPMtoMIFF.c)s ! 180 352 m(README)s ! 180 342 m(RGBtoMIFF.c)s ! 180 332 m(SUNtoMIFF.c)s ! 180 322 m(TIFFtoMIFF.c)s ! 180 312 m(TIFFtoSUN.c)s ! 180 302 m(XBMtoMIFF.c)s ! 180 292 m(XWDtoMIFF.c)s ! 90 407 m(filters)s ! (filters) stringwidth pop 91.0 add 410.3 m ! [ 525.3 515.3 505.3 495.3 485.3 475.3 465.3 455.3 445.3 435.3 425.3 415.3 405.3 395.3 385.3 375.3 365.3 355.3 345.3 335.3 325.3 315.3 305.3 295.3] ! {gsave 176.0 exch lineto stroke grestore} forall ! 90 282 m(image.c)s ! 90 272 m(image.h)s ! 180 262 m(dna.miff)s ! 180 252 m(mandrill.miff)s ! 180 242 m(swan.miff)s ! 180 232 m(table.miff)s ! 90 247 m(images)s ! (images) stringwidth pop 91.0 add 250.3 m ! [ 265.3 255.3 245.3 235.3] {gsave 176.0 exch lineto stroke grestore} forall ! 90 222 m(import.c)s ! 90 212 m(import.man)s ! 90 202 m(kolb.c (deleted))s ! 90 192 m(montage)s ! 90 182 m(montage.c)s ! 90 172 m(montage.man)s ! 90 162 m(quantize.c)s ! 90 152 m(rotate.c)s ! 180 142 m(dna.1)s ! 180 132 m(dna.10)s ! 180 122 m(dna.11)s ! 180 112 m(dna.12)s ! 180 102 m(dna.13)s ! 180 92 m(dna.14)s ! 180 82 m(dna.15)s ! 180 72 m(dna.16)s ! 180 62 m(dna.17)s ! 90 102 m(scenes)s ! (scenes) stringwidth pop 91.0 add 105.3 m ! [ 145.3 135.3 125.3 115.3 105.3 95.3 85.3 75.3 65.3] {gsave 176.0 exch lineto stroke grestore} forall ! 0 417 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 420.3 m ! [ 735.3 725.3 715.3 705.3 695.3 685.3 675.3 665.3 655.3 645.3 635.3 625.3 615.3 605.3 595.3 585.3 575.3 565.3 555.3 545.3 535.3 410.3 285.3 275.3 250.3 225.3 215.3 205.3 195.3 185.3 175.3 165.3 155.3 105.3] {gsave 86.0 exch lineto stroke grestore} forall showpage 60.0 0 translate ! 180 732 m(dna.18)s ! 180 722 m(dna.19)s ! 180 712 m(dna.2)s ! 180 702 m(dna.20)s ! 180 692 m(dna.21)s ! 180 682 m(dna.22)s ! 180 672 m(dna.23)s ! 180 662 m(dna.24)s ! 180 652 m(dna.25)s ! 180 642 m(dna.26)s ! 180 632 m(dna.27)s ! 180 622 m(dna.28)s ! 180 612 m(dna.29)s ! 180 602 m(dna.3)s ! 180 592 m(dna.30)s ! 180 582 m(dna.31)s ! 180 572 m(dna.32)s ! 180 562 m(dna.33)s ! 180 552 m(dna.34)s ! 180 542 m(dna.35)s ! 180 532 m(dna.36)s ! 180 522 m(dna.37)s ! 180 512 m(dna.38)s ! 180 502 m(dna.39)s ! 180 492 m(dna.4)s ! 180 482 m(dna.40)s ! 180 472 m(dna.41)s ! 180 462 m(dna.42)s ! 180 452 m(dna.43)s ! 180 442 m(dna.44)s ! 180 432 m(dna.45)s ! 180 422 m(dna.46)s ! 180 412 m(dna.47)s ! 180 402 m(dna.48)s ! 180 392 m(dna.49)s ! 180 382 m(dna.5)s ! 180 372 m(dna.50)s ! 180 362 m(dna.51)s ! 180 352 m(dna.52)s ! 180 342 m(dna.53)s ! 180 332 m(dna.54)s ! 180 322 m(dna.55)s ! 180 312 m(dna.56)s ! 180 302 m(dna.57)s ! 180 292 m(dna.58)s ! 180 282 m(dna.59)s ! 180 272 m(dna.6)s ! 180 262 m(dna.60)s ! 180 252 m(dna.61)s ! 180 242 m(dna.62)s ! 180 232 m(dna.63)s ! 180 222 m(dna.64)s ! 180 212 m(dna.65)s ! 180 202 m(dna.66)s ! 180 192 m(dna.67)s ! 180 182 m(dna.68)s ! 180 172 m(dna.69)s ! 180 162 m(dna.7)s ! 180 152 m(dna.70)s ! 180 142 m(dna.71)s ! 180 132 m(dna.72)s ! 180 122 m(dna.8)s ! 180 112 m(dna.9)s ! 90 422 m(scenes)s ! (scenes) stringwidth pop 91.0 add 425.3 m ! [ 735.3 725.3 715.3 705.3 695.3 685.3 675.3 665.3 655.3 645.3 635.3 625.3 615.3 605.3 595.3 585.3 575.3 565.3 555.3 545.3 535.3 525.3 515.3 505.3 495.3 485.3 475.3 465.3 455.3 445.3 435.3 425.3 415.3 405.3 395.3 385.3 375.3 365.3 355.3 345.3 335.3 325.3 315.3 305.3 295.3 285.3 275.3 265.3 255.3 245.3 235.3 225.3 215.3 205.3 195.3 185.3 175.3 165.3 155.3 145.3 135.3 125.3 115.3] {gsave 176.0 exch lineto stroke grestore} forall ! 180 102 m(Imakefile)s ! 180 92 m(Makefile)s ! 180 82 m(README)s ! 180 72 m(regular.c)s ! 180 62 m(regular.h)s ! 90 82 m(xtp)s ! (xtp) stringwidth pop 91.0 add 85.3 m ! [ 105.3 95.3 85.3 75.3 65.3] ! {gsave 176.0 exch lineto stroke grestore} forall ! 0 252 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 255.3 m ! [ 425.3 85.3] {gsave 86.0 exch lineto stroke grestore} forall showpage 60.0 0 translate ! 180 732 m(xtp.1)s ! 180 722 m(xtp.c)s ! 180 712 m(xtp.man)s ! 90 722 m(xtp)s ! (xtp) stringwidth pop 91.0 add 725.3 m ! [ 735.3 725.3 715.3] {gsave 176.0 exch lineto stroke grestore} forall ! 0 722 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 725.3 m ! [ 725.3] {gsave 86.0 exch lineto stroke grestore} forall showpage --- 12,190 ---- 90 722 m(Imakefile)s 90 712 m(Make.com)s 90 702 m(Makefile)s ! 90 692 m(Manifest.ps)s ! 90 682 m(PreRvIcccm.c)s ! 90 672 m(PreRvIcccm.h)s ! 90 662 m(README)s ! 90 652 m(X.c)s ! 90 642 m(X.h)s ! 90 632 m(XtoPS.c)s ! 90 622 m(XtoPS.man)s ! 90 612 m(animate.c)s ! 90 602 m(animate.h)s ! 90 592 m(animate.man)s ! 90 582 m(colors.c)s ! 90 572 m(compress.c)s ! 90 562 m(display.c)s ! 90 552 m(display.h)s ! 90 542 m(display.man)s ! 180 532 m(AVStoMIFF.c)s ! 180 522 m(GIFtoMIFF.c)s ! 180 512 m(GRAYtoMIFF.c)s ! 180 502 m(Imakefile)s ! 180 492 m(JPEGtoMIFF.c)s 180 482 m(MIFFtoAVS.c)s 180 472 m(MIFFtoGIF.c)s 180 462 m(MIFFtoGRAY.c)s ! 180 452 m(MIFFtoJPEG.c)s ! 180 442 m(MIFFtoMTV.c)s ! 180 432 m(MIFFtoPPM.c)s ! 180 422 m(MIFFtoPS.c)s ! 180 412 m(MIFFtoRGB.c)s ! 180 402 m(MIFFtoSTEREO.c)s ! 180 392 m(MIFFtoSUN.c)s ! 180 382 m(MIFFtoTIFF.c)s ! 180 372 m(MIFFtoXBM.c)s ! 180 362 m(MIFFtoXWD.c)s ! 180 352 m(MTVtoMIFF.c)s ! 180 342 m(Makefile)s ! 180 332 m(PPMtoMIFF.c)s ! 180 322 m(PStoMIFF)s ! 180 312 m(README)s ! 180 302 m(RGBtoMIFF.c)s ! 180 292 m(SUNtoMIFF.c)s ! 180 282 m(TIFFtoMIFF.c)s ! 180 272 m(VORTtoMIFF)s ! 180 262 m(VORTtoMIFF.c)s ! 180 252 m(XBMtoMIFF.c)s ! 180 242 m(XWDtoMIFF.c)s ! 180 232 m(displayGIF)s ! 90 382 m(filters)s ! (filters) stringwidth pop 91.0 add 385.3 m ! [ 535.3 525.3 515.3 505.3 495.3 485.3 475.3 465.3 455.3 445.3 435.3 425.3 415.3 405.3 395.3 385.3 375.3 365.3 355.3 345.3 335.3 325.3 315.3 305.3 295.3 285.3 275.3 265.3 255.3 245.3 235.3] {gsave 176.0 exch lineto stroke grestore} forall ! 90 222 m(image.c)s ! 90 212 m(image.h)s ! 180 202 m(README)s ! 180 192 m(aquarium.miff)s ! 180 182 m(dna.miff)s ! 180 172 m(stereo.miff)s ! 180 162 m(swan.miff)s ! 180 152 m(table.miff)s ! 90 177 m(images)s ! (images) stringwidth pop 91.0 add 180.3 m ! [ 205.3 195.3 185.3 175.3 165.3 155.3] {gsave 176.0 exch lineto stroke grestore} forall ! 90 142 m(import.c)s ! 90 132 m(import.man)s ! 90 122 m(montage.c)s ! 90 112 m(montage.man)s ! 90 102 m(quantize.c)s ! 90 92 m(rotate.c)s ! 180 82 m(dna.1)s ! 180 72 m(dna.10)s ! 180 62 m(dna.12)s ! 90 72 m(scenes)s ! (scenes) stringwidth pop 91.0 add 75.3 m ! [ 85.3 75.3 65.3] ! {gsave 176.0 exch lineto stroke grestore} forall ! 0 402 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 405.3 m ! [ 735.3 725.3 715.3 705.3 695.3 685.3 675.3 665.3 655.3 645.3 635.3 625.3 615.3 605.3 595.3 585.3 575.3 565.3 555.3 545.3 385.3 225.3 215.3 180.3 145.3 135.3 125.3 115.3 105.3 95.3 75.3] {gsave 86.0 exch lineto stroke grestore} forall showpage 60.0 0 translate ! 180 732 m(dna.13)s ! 180 722 m(dna.14)s ! 180 712 m(dna.15)s ! 180 702 m(dna.16)s ! 180 692 m(dna.17)s ! 180 682 m(dna.18)s ! 180 672 m(dna.19)s ! 180 662 m(dna.2)s ! 180 652 m(dna.20)s ! 180 642 m(dna.21)s ! 180 632 m(dna.22)s ! 180 622 m(dna.23)s ! 180 612 m(dna.24)s ! 180 602 m(dna.25)s ! 180 592 m(dna.26)s ! 180 582 m(dna.27)s ! 180 572 m(dna.28)s ! 180 562 m(dna.29)s ! 180 552 m(dna.3)s ! 180 542 m(dna.30)s ! 180 532 m(dna.31)s ! 180 522 m(dna.32)s ! 180 512 m(dna.33)s ! 180 502 m(dna.34)s ! 180 492 m(dna.35)s ! 180 482 m(dna.36)s ! 180 472 m(dna.37)s ! 180 462 m(dna.38)s ! 180 452 m(dna.39)s ! 180 442 m(dna.4)s ! 180 432 m(dna.40)s ! 180 422 m(dna.41)s ! 180 412 m(dna.42)s ! 180 402 m(dna.43)s ! 180 392 m(dna.44)s ! 180 382 m(dna.45)s ! 180 372 m(dna.46)s ! 180 362 m(dna.47)s ! 180 352 m(dna.48)s ! 180 342 m(dna.49)s ! 180 332 m(dna.5)s ! 180 322 m(dna.50)s ! 180 312 m(dna.51)s ! 180 302 m(dna.52)s ! 180 292 m(dna.53)s ! 180 282 m(dna.54)s ! 180 272 m(dna.55)s ! 180 262 m(dna.56)s ! 180 252 m(dna.57)s ! 180 242 m(dna.58)s ! 180 232 m(dna.59)s ! 180 222 m(dna.6)s ! 180 212 m(dna.60)s ! 180 202 m(dna.61)s ! 180 192 m(dna.62)s ! 180 182 m(dna.63)s ! 180 172 m(dna.64)s ! 180 162 m(dna.65)s ! 180 152 m(dna.66)s ! 180 142 m(dna.67)s ! 180 132 m(dna.68)s ! 180 122 m(dna.69)s ! 180 112 m(dna.7)s ! 180 102 m(dna.70)s ! 180 92 m(dna.71)s ! 180 82 m(dna.72)s ! 180 72 m(dna.8)s ! 180 62 m(dna.9)s ! 90 397 m(scenes)s ! (scenes) stringwidth pop 91.0 add 400.3 m ! [ 735.3 725.3 715.3 705.3 695.3 685.3 675.3 665.3 655.3 645.3 635.3 625.3 615.3 605.3 595.3 585.3 575.3 565.3 555.3 545.3 535.3 525.3 515.3 505.3 495.3 485.3 475.3 465.3 455.3 445.3 435.3 425.3 415.3 405.3 395.3 385.3 375.3 365.3 355.3 345.3 335.3 325.3 315.3 305.3 295.3 285.3 275.3 265.3 255.3 245.3 235.3 225.3 215.3 205.3 195.3 185.3 175.3 165.3 155.3 145.3 135.3 125.3 115.3 105.3 95.3 85.3 75.3 65.3] {gsave 176.0 exch lineto stroke grestore} forall ! 0 397 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 400.3 m ! [ 400.3] {gsave 86.0 exch lineto stroke grestore} forall showpage 60.0 0 translate ! 180 732 m(Imakefile)s ! 180 722 m(Makefile)s ! 180 712 m(README)s ! 180 702 m(regular.c)s ! 180 692 m(regular.h)s ! 180 682 m(xtp.c)s ! 180 672 m(xtp.man)s ! 90 702 m(xtp)s ! (xtp) stringwidth pop 91.0 add 705.3 m ! [ 735.3 725.3 715.3 705.3 695.3 685.3 675.3] {gsave 176.0 exch lineto stroke grestore} forall ! 0 702 m(ImageMagick)s ! (ImageMagick) stringwidth pop 1.0 add 705.3 m ! [ 705.3] {gsave 86.0 exch lineto stroke grestore} forall showpage diff -c -r ImageMagick/README /alpha/home/cristy/ImageMagick/README *** ImageMagick/README Fri Nov 22 17:25:30 1991 --- /alpha/home/cristy/ImageMagick/README Fri Nov 22 17:34:59 1991 *************** *** 26,33 **** Finally type: ! display images/mandrill.miff ! display -monochrome -dither images/mandrill.miff You can find other example images in the 'images' directory. --- 26,33 ---- Finally type: ! display images/table.miff ! display -monochrome -dither images/table.miff You can find other example images in the 'images' directory. *************** *** 53,64 **** or displayTIFF to display GIF or TIFF images respectively. The TIFFtoMIFF and MIFFtoTIFF filters require Sam Leffler's TIFF ! software available via FTP as sgi.com:/graphics/tiff/v2.4.tar.Z. The PPMtoMIFF and MIFFtoPPM filters require Jef Poskanzer's PBMPLUS software available via FTP as export.lcs.mit.edu:contrib/pbmplus.tar.Z. VMS COMPILATION Type --- 53,67 ---- or displayTIFF to display GIF or TIFF images respectively. The TIFFtoMIFF and MIFFtoTIFF filters require Sam Leffler's TIFF ! software available via FTP as ucbvax.berkeley.edu:/pub/tiff/v2.4.tar.Z. The PPMtoMIFF and MIFFtoPPM filters require Jef Poskanzer's PBMPLUS software available via FTP as export.lcs.mit.edu:contrib/pbmplus.tar.Z. + The JPEGtoMIFF and MIFFtoJPEG filters require Independent JPEG Group's + software available via FTP as uunet.uu.net:graphics/jpeg/jpegsrc.v1.tar.Z. + VMS COMPILATION Type *************** *** 70,77 **** Finally type: ! display images/mandrill.miff ! display -monochrome -dither images/mandrill.miff ANIMATION --- 73,80 ---- Finally type: ! display images/table.miff ! display -monochrome -dither images/table.miff ANIMATION *************** *** 165,176 **** in your X resource file. To get ImageMagick to work on our SGI I had to comment out ! ! #include in X.h and include ! #define XEventsQueued(display,QueuedAfterFlush) XPending(display) I also included -DSYSV on the cc command line. --- 168,179 ---- in your X resource file. To get ImageMagick to work on our SGI I had to comment out ! ! #include in X.h and include ! #define XEventsQueued(display,QueuedAfterFlush) XPending(display) I also included -DSYSV on the cc command line. diff -c -r ImageMagick/X.c /alpha/home/cristy/ImageMagick/X.c *** ImageMagick/X.c Fri Nov 22 17:25:54 1991 --- /alpha/home/cristy/ImageMagick/X.c Fri Nov 22 17:35:00 1991 *************** *** 564,571 **** /* Look for an icon size that maintains the aspect ratio of image. */ ! scale_factor=Min((icon_size->max_width << 14)/image->columns, ! (icon_size->max_height << 14)/image->rows); icon_width=icon_size->min_width; while (icon_width < icon_size->max_width) { --- 564,572 ---- /* Look for an icon size that maintains the aspect ratio of image. */ ! scale_factor=(icon_size->max_width << 14)/image->columns; ! if (scale_factor > ((icon_size->max_height << 14)/image->rows)) ! scale_factor=(icon_size->max_height << 14)/image->rows; icon_width=icon_size->min_width; while (icon_width < icon_size->max_width) { *************** *** 1329,1335 **** byte=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { byte>>=1; if (p->index == foreground_pixel) --- 1330,1336 ---- byte=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { byte>>=1; if (p->index == foreground_pixel) *************** *** 1380,1386 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1381,1387 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1434,1440 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1435,1441 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1473,1479 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index]; ! for (j=0; j <= p->length; j++) { *q++=(unsigned char) pixel; x++; --- 1474,1480 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index]; ! for (j=0; j <= ((int) p->length); j++) { *q++=(unsigned char) pixel; x++; *************** *** 1510,1516 **** channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= p->length; j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; --- 1511,1517 ---- channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= ((int) p->length); j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; *************** *** 1546,1552 **** { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1547,1553 ---- { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1601,1607 **** { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1602,1608 ---- { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1640,1646 **** for (i=0; i < image->packets; i++) { pixel=XStandardPixel(map_info,(*p),8); ! for (j=0; j <= p->length; j++) { *q++=(unsigned char) pixel; x++; --- 1641,1647 ---- for (i=0; i < image->packets; i++) { pixel=XStandardPixel(map_info,(*p),8); ! for (j=0; j <= ((int) p->length); j++) { *q++=(unsigned char) pixel; x++; *************** *** 1669,1675 **** */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=p->blue; *q++=p->green; --- 1670,1676 ---- */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=p->blue; *q++=p->green; *************** *** 1702,1708 **** channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= p->length; j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; --- 1703,1709 ---- channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= ((int) p->length); j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; *************** *** 1814,1820 **** byte=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { byte<<=1; if (p->index == foreground_pixel) --- 1815,1821 ---- byte=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { byte<<=1; if (p->index == foreground_pixel) *************** *** 1865,1871 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1866,1872 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1919,1925 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 1920,1926 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index] & 0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 1957,1963 **** for (i=0; i < image->packets; i++) { pixel=pixels[p->index]; ! for (j=0; j <= p->length; j++) { *q++=(unsigned char) pixel; x++; --- 1958,1964 ---- for (i=0; i < image->packets; i++) { pixel=pixels[p->index]; ! for (j=0; j <= ((int) p->length); j++) { *q++=(unsigned char) pixel; x++; *************** *** 1994,2000 **** channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= p->length; j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; --- 1995,2001 ---- channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= ((int) p->length); j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; *************** *** 2030,2036 **** { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 2031,2037 ---- { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 2085,2091 **** { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= p->length; j++) { switch (nibble) { --- 2086,2092 ---- { pixel=XStandardPixel(map_info,(*p),8); pixel&=0xf; ! for (j=0; j <= ((int) p->length); j++) { switch (nibble) { *************** *** 2123,2129 **** for (i=0; i < image->packets; i++) { pixel=XStandardPixel(map_info,(*p),8); ! for (j=0; j <= p->length; j++) { *q++=(unsigned char) pixel; x++; --- 2124,2130 ---- for (i=0; i < image->packets; i++) { pixel=XStandardPixel(map_info,(*p),8); ! for (j=0; j <= ((int) p->length); j++) { *q++=(unsigned char) pixel; x++; *************** *** 2152,2158 **** */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=0; *q++=p->red; --- 2153,2159 ---- */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=0; *q++=p->red; *************** *** 2185,2191 **** channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= p->length; j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; --- 2186,2192 ---- channel[k]=(unsigned char) pixel; pixel>>=8; } ! for (j=0; j <= ((int) p->length); j++) { for (k=0; k < bytes_per_pixel; k++) *q++=channel[k]; *************** *** 2688,2693 **** --- 2689,2695 ---- *size_hints; XTextProperty + icon_name, name; /* *************** *** 2769,2775 **** name.value=(unsigned char *) window_info->name; name.encoding=XA_STRING; name.format=8; ! name.nitems=strlen(window_info->name); if (window_info->icon_geometry != (char *) NULL) { int --- 2771,2785 ---- name.value=(unsigned char *) window_info->name; name.encoding=XA_STRING; name.format=8; ! name.nitems=0; ! if (window_info->name != (char *) NULL) ! name.nitems=strlen(window_info->name); ! icon_name.value=(unsigned char *) window_info->icon_name; ! icon_name.encoding=XA_STRING; ! icon_name.format=8; ! icon_name.nitems=0; ! if (window_info->icon_name != (char *) NULL) ! icon_name.nitems=strlen(window_info->icon_name); if (window_info->icon_geometry != (char *) NULL) { int *************** *** 2788,2795 **** if ((flags & XValue) && (flags & YValue)) manager_hints->flags|=IconPositionHint; } ! XSetWMProperties(display,window_info->id,&name,&name,argv,argc,size_hints, ! manager_hints,class_hint); XSetWMProtocols(display,window_info->id,&property,1); XFree((void *) size_hints); } --- 2798,2805 ---- if ((flags & XValue) && (flags & YValue)) manager_hints->flags|=IconPositionHint; } ! XSetWMProperties(display,window_info->id,&name,&icon_name,argv,argc, ! size_hints,manager_hints,class_hint); XSetWMProtocols(display,window_info->id,&property,1); XFree((void *) size_hints); } *************** *** 3057,3063 **** Wait for next event. */ XMaskEvent(display,ButtonPressMask | ButtonMotionMask | ButtonReleaseMask | ! EnterWindowMask | LeaveWindowMask,&event); switch (event.type) { case ButtonPress: --- 3067,3073 ---- Wait for next event. */ XMaskEvent(display,ButtonPressMask | ButtonMotionMask | ButtonReleaseMask | ! EnterWindowMask | LeaveWindowMask,&event); switch (event.type) { case ButtonPress: diff -c -r ImageMagick/X.h /alpha/home/cristy/ImageMagick/X.h *** ImageMagick/X.h Fri Nov 22 17:25:56 1991 --- /alpha/home/cristy/ImageMagick/X.h Fri Nov 22 17:35:00 1991 *************** *** 137,142 **** --- 137,143 ---- char *name, *geometry, + *icon_name, *icon_geometry, *clip_geometry; diff -c -r ImageMagick/animate.c /alpha/home/cristy/ImageMagick/animate.c *** ImageMagick/animate.c Fri Nov 22 17:26:31 1991 --- /alpha/home/cristy/ImageMagick/animate.c Fri Nov 22 17:35:01 1991 *************** *** 685,692 **** superclass_window.font_info=font_info; superclass_window.cursor=arrow_cursor; superclass_window.busy_cursor=watch_cursor; ! superclass_window.name="ImageMagick SuperClass"; superclass_window.geometry=(char *) NULL; superclass_window.icon_geometry=resource_info->icon_geometry; superclass_window.clip_geometry=(char *) NULL; superclass_window.flags=PSize; --- 685,693 ---- superclass_window.font_info=font_info; superclass_window.cursor=arrow_cursor; superclass_window.busy_cursor=watch_cursor; ! superclass_window.name=(char *) NULL; superclass_window.geometry=(char *) NULL; + superclass_window.icon_name=(char *) NULL; superclass_window.icon_geometry=resource_info->icon_geometry; superclass_window.clip_geometry=(char *) NULL; superclass_window.flags=PSize; *************** *** 711,717 **** superclass_window.attributes.do_not_propagate_mask=NoEventMask; superclass_window.attributes.event_mask=NoEventMask; superclass_window.attributes.override_redirect=False; ! superclass_window.attributes.save_under=False; superclass_window.attributes.win_gravity=NorthWestGravity; superclass_window.graphic_context=(GC) NULL; superclass_window.ximage=(XImage *) NULL; --- 712,718 ---- superclass_window.attributes.do_not_propagate_mask=NoEventMask; superclass_window.attributes.event_mask=NoEventMask; superclass_window.attributes.override_redirect=False; ! superclass_window.attributes.save_under=True; superclass_window.attributes.win_gravity=NorthWestGravity; superclass_window.graphic_context=(GC) NULL; superclass_window.ximage=(XImage *) NULL; *************** *** 728,737 **** graphic_context_value.line_width=2; graphic_context_value.graphics_exposures=False; graphic_context_value.plane_mask=AllPlanes; - graphic_context_value.subwindow_mode=IncludeInferiors; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | GCFont | GCForeground | GCFunction | GCGraphicsExposures | GCLineWidth | ! GCPlaneMask | GCSubwindowMode,&graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.graphic_context=graphic_context; --- 729,737 ---- graphic_context_value.line_width=2; graphic_context_value.graphics_exposures=False; graphic_context_value.plane_mask=AllPlanes; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | GCFont | GCForeground | GCFunction | GCGraphicsExposures | GCLineWidth | ! GCPlaneMask,&graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.graphic_context=graphic_context; *************** *** 747,753 **** Initialize icon window. */ icon_window=superclass_window; - icon_window.name="ImageMagick Icon"; XBestIconSize(display,&icon_window,images[0]); icon_window.attributes.event_mask=ExposureMask | StructureNotifyMask; manager_hints->flags=InputHint | StateHint | WindowGroupHint; --- 747,752 ---- *************** *** 768,777 **** */ image_window=superclass_window; image_window.name=(char *) malloc(256); ! if (image_window.name == NULL) Error("unable to create image window","memory allocation failed"); if (resource_info->title != (char *) NULL) ! (void) strcpy(image_window.name,resource_info->title); else { register char --- 767,780 ---- */ image_window=superclass_window; image_window.name=(char *) malloc(256); ! image_window.icon_name=(char *) malloc(256); ! if ((image_window.name == NULL) || (image_window.icon_name == NULL)) Error("unable to create image window","memory allocation failed"); if (resource_info->title != (char *) NULL) ! { ! (void) strcpy(image_window.name,resource_info->title); ! (void) strcpy(image_window.icon_name,resource_info->title); ! } else { register char *************** *** 789,794 **** --- 792,808 ---- } p++; } + (void) strcpy(image_window.icon_name,images[0]->filename); + p=image_window.icon_name; + while (*p != (char) NULL) + { + if (*p == '.') + { + *p=(char) NULL; + break; + } + p++; + } } image_window.geometry=resource_info->image_geometry; image_window.width=images[0]->columns; *************** *** 872,878 **** Initialize menu window. */ popup_window=superclass_window; ! popup_window.name="ImageMagick Popup"; popup_window.flags=PSize | PPosition; popup_window.attributes.override_redirect=True; popup_window.attributes.save_under=True; --- 886,892 ---- Initialize menu window. */ popup_window=superclass_window; ! popup_window.name="ImageMagick Menu"; popup_window.flags=PSize | PPosition; popup_window.attributes.override_redirect=True; popup_window.attributes.save_under=True; *************** *** 1261,1266 **** --- 1275,1281 ---- XDestroyWindow(display,popup_window.id); XDestroyWindow(display,image_window.id); (void) free((char *) image_window.name); + (void) free((char *) image_window.icon_name); if (resource_info->backdrop) XDestroyWindow(display,backdrop_window.id); XDestroyWindow(display,icon_window.id); diff -c -r ImageMagick/colors.c /alpha/home/cristy/ImageMagick/colors.c *** ImageMagick/colors.c Fri Nov 22 17:26:36 1991 --- /alpha/home/cristy/ImageMagick/colors.c Fri Nov 22 17:35:01 1991 *************** *** 246,252 **** (p->blue > node->mid_blue) << 2; if (node->child[id] == (Node *) NULL) { ! bisect=(1 << (MaxTreeDepth-level)) >> 1; node->child[id]=InitializeNode( node->mid_red+(id & 1 ? bisect : -bisect), node->mid_green+(id & 2 ? bisect : -bisect), --- 246,252 ---- (p->blue > node->mid_blue) << 2; if (node->child[id] == (Node *) NULL) { ! bisect=(unsigned int) (1 << (MaxTreeDepth-level)) >> 1; node->child[id]=InitializeNode( node->mid_red+(id & 1 ? bisect : -bisect), node->mid_green+(id & 2 ? bisect : -bisect), diff -c -r ImageMagick/compress.c /alpha/home/cristy/ImageMagick/compress.c *** ImageMagick/compress.c Fri Nov 22 17:26:39 1991 --- /alpha/home/cristy/ImageMagick/compress.c Fri Nov 22 17:35:01 1991 *************** *** 44,51 **** % % Procedures QEncodeImage and QDecodeImage is based on the document % "JPEG-9-R6 Working Draft for Development of JPEG CD", January 1991. ! % These routines do not yet fully implement the lossless JPEG compression, ! % but will some time in the future. % % Images are compressed using a simple predictive method. The predictor % combines three neighboring samples (A, B, and C) to form a prediction --- 44,52 ---- % % Procedures QEncodeImage and QDecodeImage is based on the document % "JPEG-9-R6 Working Draft for Development of JPEG CD", January 1991. ! % These routines only implement the lossless JPEG compression algorithm in ! % a non-standard fashion. They can only be used to code and decode MIFF ! % images. % % Images are compressed using a simple predictive method. The predictor % combines three neighboring samples (A, B, and C) to form a prediction *************** *** 179,185 **** *decision; { interval+=probability[probability_estimate[state]]; ! if (((code >> 16) & 0xffff) < interval) { code-=(interval << 16); interval=(-probability[probability_estimate[state]]); --- 180,186 ---- *decision; { interval+=probability[probability_estimate[state]]; ! if (((code >> 16) & 0xffff) < ((int) interval)) { code-=(interval << 16); interval=(-probability[probability_estimate[state]]); *************** *** 293,299 **** else { code&=0x01ffffff; ! if (interval > code) { /* Add eight bits from Code register to compressed data string. --- 294,300 ---- else { code&=0x01ffffff; ! if ((int) interval > code) { /* Add eight bits from Code register to compressed data string. diff -c -r ImageMagick/display.c /alpha/home/cristy/ImageMagick/display.c *** ImageMagick/display.c Fri Nov 22 17:26:52 1991 --- /alpha/home/cristy/ImageMagick/display.c Fri Nov 22 17:35:02 1991 *************** *** 985,994 **** graphic_context_value.function=GXcopy; graphic_context_value.line_width=WindowBorderWidth; graphic_context_value.plane_mask=AllPlanes; - graphic_context_value.subwindow_mode=IncludeInferiors; graphic_context=XCreateGC(display,image_window->id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask | ! GCSubwindowMode,&graphic_context_value); if (graphic_context == (GC) NULL) return(False); /* --- 985,993 ---- graphic_context_value.function=GXcopy; graphic_context_value.line_width=WindowBorderWidth; graphic_context_value.plane_mask=AllPlanes; graphic_context=XCreateGC(display,image_window->id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask, ! &graphic_context_value); if (graphic_context == (GC) NULL) return(False); /* *************** *** 1876,1883 **** superclass_window.font_info=font_info; superclass_window.cursor=arrow_cursor; superclass_window.busy_cursor=watch_cursor; ! superclass_window.name="ImageMagick SuperClass"; superclass_window.geometry=(char *) NULL; superclass_window.icon_geometry=resource_info->icon_geometry; superclass_window.clip_geometry=(char *) NULL; superclass_window.flags=PSize; --- 1875,1884 ---- superclass_window.font_info=font_info; superclass_window.cursor=arrow_cursor; superclass_window.busy_cursor=watch_cursor; ! superclass_window.graphic_context=(GC) NULL; ! superclass_window.name=(char *) NULL; superclass_window.geometry=(char *) NULL; + superclass_window.icon_name=(char *) NULL; superclass_window.icon_geometry=resource_info->icon_geometry; superclass_window.clip_geometry=(char *) NULL; superclass_window.flags=PSize; *************** *** 1891,1896 **** --- 1892,1898 ---- superclass_window.height_inc=1; superclass_window.border_width=2; superclass_window.immutable=True; + superclass_window.ximage=(XImage *) NULL; superclass_window.attributes.background_pixel= pixel_info.background_color.pixel; superclass_window.attributes.background_pixmap=(Pixmap) NULL; *************** *** 1902,1911 **** superclass_window.attributes.do_not_propagate_mask=NoEventMask; superclass_window.attributes.event_mask=NoEventMask; superclass_window.attributes.override_redirect=False; ! superclass_window.attributes.save_under=False; superclass_window.attributes.win_gravity=NorthWestGravity; - superclass_window.graphic_context=(GC) NULL; - superclass_window.ximage=(XImage *) NULL; /* Initialize graphic context. */ --- 1904,1911 ---- superclass_window.attributes.do_not_propagate_mask=NoEventMask; superclass_window.attributes.event_mask=NoEventMask; superclass_window.attributes.override_redirect=False; ! superclass_window.attributes.save_under=True; superclass_window.attributes.win_gravity=NorthWestGravity; /* Initialize graphic context. */ *************** *** 1918,1927 **** graphic_context_value.function=GXcopy; graphic_context_value.line_width=2; graphic_context_value.plane_mask=AllPlanes; - graphic_context_value.subwindow_mode=IncludeInferiors; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask | ! GCSubwindowMode,&graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.graphic_context=graphic_context; --- 1918,1926 ---- graphic_context_value.function=GXcopy; graphic_context_value.line_width=2; graphic_context_value.plane_mask=AllPlanes; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask, ! &graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.graphic_context=graphic_context; *************** *** 1928,1935 **** graphic_context_value.background=pixel_info.foreground_color.pixel; graphic_context_value.foreground=pixel_info.background_color.pixel; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask | ! GCSubwindowMode,&graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.highlight_context=graphic_context; --- 1927,1934 ---- graphic_context_value.background=pixel_info.foreground_color.pixel; graphic_context_value.foreground=pixel_info.background_color.pixel; graphic_context=XCreateGC(display,superclass_window.id,GCBackground | ! GCFont | GCForeground | GCFunction | GCLineWidth | GCPlaneMask, ! &graphic_context_value); if (graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); superclass_window.highlight_context=graphic_context; *************** *** 1937,1943 **** Initialize icon window. */ icon_window=superclass_window; - icon_window.name="ImageMagick Icon"; XBestIconSize(display,&icon_window,image); icon_window.attributes.event_mask=ExposureMask | StructureNotifyMask; manager_hints->flags=InputHint | StateHint | WindowGroupHint; --- 1936,1941 ---- *************** *** 1951,1964 **** */ image_window=superclass_window; image_window.name=(char *) malloc(256); ! if (image_window.name == NULL) Error("unable to create image window","memory allocation failed"); if (resource_info->title != (char *) NULL) ! (void) strcpy(image_window.name,resource_info->title); else { (void) strcpy(image_window.name,"ImageMagick: "); (void) strcat(image_window.name,image->filename); } image_window.geometry=resource_info->image_geometry; image_window.width=image->columns; --- 1949,1967 ---- */ image_window=superclass_window; image_window.name=(char *) malloc(256); ! image_window.icon_name=(char *) malloc(256); ! if ((image_window.name == NULL) || (image_window.icon_name == NULL)) Error("unable to create image window","memory allocation failed"); if (resource_info->title != (char *) NULL) ! { ! (void) strcpy(image_window.name,resource_info->title); ! (void) strcpy(image_window.icon_name,resource_info->title); ! } else { (void) strcpy(image_window.name,"ImageMagick: "); (void) strcat(image_window.name,image->filename); + (void) strcpy(image_window.icon_name,image->filename); } image_window.geometry=resource_info->image_geometry; image_window.width=image->columns; *************** *** 2578,2583 **** --- 2581,2587 ---- XDestroyWindow(display,image_window.id); XDestroyImage(image_window.ximage); (void) free((char *) image_window.name); + (void) free((char *) image_window.icon_name); if (resource_info->backdrop) XDestroyWindow(display,backdrop_window.id); XDestroyWindow(display,icon_window.id); *************** *** 2956,2971 **** graphic_context_value.fill_style=FillSolid; graphic_context_value.function=GXcopy; graphic_context_value.plane_mask=AllPlanes; - graphic_context_value.subwindow_mode=IncludeInferiors; image_window.graphic_context=XCreateGC(display,image_window.id, ! GCBackground | GCFillStyle | GCForeground | GCFunction | GCPlaneMask | ! GCSubwindowMode,&graphic_context_value); if (image_window.graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); graphic_context_value.background=pixel_info.foreground_color.pixel; graphic_context_value.foreground=pixel_info.background_color.pixel; image_window.highlight_context=XCreateGC(display,image_window.id, ! GCBackground | GCForeground | GCFunction | GCPlaneMask | GCSubwindowMode, &graphic_context_value); if (image_window.highlight_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); --- 2960,2974 ---- graphic_context_value.fill_style=FillSolid; graphic_context_value.function=GXcopy; graphic_context_value.plane_mask=AllPlanes; image_window.graphic_context=XCreateGC(display,image_window.id, ! GCBackground | GCFillStyle | GCForeground | GCFunction | GCPlaneMask, ! &graphic_context_value); if (image_window.graphic_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); graphic_context_value.background=pixel_info.foreground_color.pixel; graphic_context_value.foreground=pixel_info.background_color.pixel; image_window.highlight_context=XCreateGC(display,image_window.id, ! GCBackground | GCForeground | GCFunction | GCPlaneMask, &graphic_context_value); if (image_window.highlight_context == (GC) NULL) Error("unable to create graphic context",(char *) NULL); *************** *** 4848,4854 **** (void) GrayImage(image); if ((image->class == DirectClass) || (image->colors > 2)) (void) QuantizeImage(image,2,tree_depth,dither,True); ! bit=Intensity(image->colormap[0]) > Intensity(image->colormap[1]); image->colormap[bit].red=0; image->colormap[bit].green=0; image->colormap[bit].blue=0; --- 4851,4858 ---- (void) GrayImage(image); if ((image->class == DirectClass) || (image->colors > 2)) (void) QuantizeImage(image,2,tree_depth,dither,True); ! bit=(unsigned int) Intensity(image->colormap[0]) > ! Intensity(image->colormap[1]); image->colormap[bit].red=0; image->colormap[bit].green=0; image->colormap[bit].blue=0; Common subdirectories: ImageMagick/filters and /alpha/home/cristy/ImageMagick/filters diff -c -r ImageMagick/image.c /alpha/home/cristy/ImageMagick/image.c *** ImageMagick/image.c Fri Nov 22 17:27:13 1991 --- /alpha/home/cristy/ImageMagick/image.c Fri Nov 22 17:36:00 1991 *************** *** 83,88 **** --- 83,91 ---- /* Initialize Image structure. */ + *allocated_image->filename=(char) NULL; + *allocated_image->magick=(char) NULL; + allocated_image->comments=(char *) NULL; allocated_image->id=UnknownId; allocated_image->class=DirectClass; allocated_image->compression=RunlengthEncodedCompression; *************** *** 93,99 **** allocated_image->scene=0; allocated_image->colormap=(ColorPacket *) NULL; allocated_image->pixels=(RunlengthPacket *) NULL; ! allocated_image->comments=(char *) NULL; allocated_image->next=(Image *) NULL; return(allocated_image); } --- 96,102 ---- allocated_image->scene=0; allocated_image->colormap=(ColorPacket *) NULL; allocated_image->pixels=(RunlengthPacket *) NULL; ! allocated_image->packet=(RunlengthPacket *) NULL; allocated_image->next=(Image *) NULL; return(allocated_image); } *************** *** 1417,1436 **** max_intensity=p->red; for (i=0; i < image->packets; i++) { ! if (p->red < min_intensity) min_intensity=p->red; else ! if (p->red > max_intensity) max_intensity=p->red; ! if (p->green < min_intensity) min_intensity=p->green; else ! if (p->green > max_intensity) max_intensity=p->green; ! if (p->blue < min_intensity) min_intensity=p->blue; else ! if (p->blue > max_intensity) max_intensity=p->blue; p++; } --- 1420,1439 ---- max_intensity=p->red; for (i=0; i < image->packets; i++) { ! if (((int) p->red) < min_intensity) min_intensity=p->red; else ! if (((int) p->red) > max_intensity) max_intensity=p->red; ! if (((int) p->green) < min_intensity) min_intensity=p->green; else ! if (((int) p->green) > max_intensity) max_intensity=p->green; ! if (((int) p->blue) < min_intensity) min_intensity=p->blue; else ! if (((int) p->blue) > max_intensity) max_intensity=p->blue; p++; } *************** *** 1475,1494 **** max_intensity=image->colormap[0].red; for (i=0; i < image->colors; i++) { ! if (image->colormap[i].red < min_intensity) min_intensity=image->colormap[i].red; else ! if (image->colormap[i].red > max_intensity) max_intensity=image->colormap[i].red; ! if (image->colormap[i].green < min_intensity) min_intensity=image->colormap[i].green; else ! if (image->colormap[i].green > max_intensity) max_intensity=image->colormap[i].green; ! if (image->colormap[i].blue < min_intensity) min_intensity=image->colormap[i].blue; else ! if (image->colormap[i].blue > max_intensity) max_intensity=image->colormap[i].blue; } if ((min_intensity == 0) && (max_intensity == MaxRgb)) --- 1478,1497 ---- max_intensity=image->colormap[0].red; for (i=0; i < image->colors; i++) { ! if (((int) image->colormap[i].red) < min_intensity) min_intensity=image->colormap[i].red; else ! if (((int) image->colormap[i].red) > max_intensity) max_intensity=image->colormap[i].red; ! if (((int) image->colormap[i].green) < min_intensity) min_intensity=image->colormap[i].green; else ! if (((int) image->colormap[i].green) > max_intensity) max_intensity=image->colormap[i].green; ! if (((int) image->colormap[i].blue) < min_intensity) min_intensity=image->colormap[i].blue; else ! if (((int) image->colormap[i].blue) > max_intensity) max_intensity=image->colormap[i].blue; } if ((min_intensity == 0) && (max_intensity == MaxRgb)) *************** *** 1716,1722 **** " % index: index into the colormap.", " % length: number of pixels minus one of this color (optional).", " %", - " %", " currentfile byte readhexstring pop 0 get", " /offset exch 3 mul def", " /color_packet colormap offset 3 getinterval def", --- 1719,1724 ---- *************** *** 1899,1905 **** /* Output image data. */ - x=0; p=image->pixels; switch (image->class) { --- 1901,1906 ---- *************** *** 1925,1930 **** --- 1926,1932 ---- /* Dump runlength-encoded DirectColor packets. */ + x=0; for (i=0; i < image->packets; i++) { x++; *************** *** 1944,1952 **** /* Dump uncompressed DirectColor packets. */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { x++; (void) fprintf(image->file,"%02x%02x%02x",p->red,p->green, --- 1946,1955 ---- /* Dump uncompressed DirectColor packets. */ + x=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { x++; (void) fprintf(image->file,"%02x%02x%02x",p->red,p->green, *************** *** 1993,1998 **** --- 1996,2002 ---- /* Dump runlength-encoded PseudoColor packets. */ + x=0; for (i=0; i < image->packets; i++) { x++; *************** *** 2011,2019 **** /* Dump uncompressed PseudoColor packets. */ for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { x++; (void) fprintf(image->file,"%02x",p->index); --- 2015,2024 ---- /* Dump uncompressed PseudoColor packets. */ + x=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { x++; (void) fprintf(image->file,"%02x",p->index); *************** *** 2067,2073 **** % o size: Specifies an integer representing the length of an % individual item to be read from the file. % ! % o numer_items: Specifies an integer representing the number of items % to read from the file. % % o file: Specifies a file to read the data. --- 2072,2078 ---- % o size: Specifies an integer representing the length of an % individual item to be read from the file. % ! % o number_items: Specifies an integer representing the number of items % to read from the file. % % o file: Specifies a file to read the data. *************** *** 2183,2189 **** /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 2188,2194 ---- /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) *************** *** 2196,2203 **** /* Decode image header; header terminates one character beyond a ':'. */ ! do { c=fgetc(image->file); } while (isspace(c)); ! while ((c > 0) && (c != ':')) { register char *p; --- 2201,2213 ---- /* Decode image header; header terminates one character beyond a ':'. */ ! c=fgetc(image->file); ! if (c == EOF) ! { ! (void) DestroyImage(image); ! return((Image *) NULL); ! } ! while (isgraph(c) && (c != ':')) { register char *p; *************** *** 2317,2323 **** } (void) fgetc(image->file); /* ! Verify that required image information is valid. */ if ((image->id == UnknownId) || (image->class == UnknownClass) || --- 2327,2333 ---- } (void) fgetc(image->file); /* ! Verify that required image information is defined. */ if ((image->id == UnknownId) || (image->class == UnknownClass) || *************** *** 2364,2371 **** DestroyImage(image); return((Image *) NULL); } ! status=ReadData((char *) pixels,(int) packet_size,(int) ! image->packets,image->file); if (status == False) { Warning("insufficient image data in file",image->filename); --- 2374,2381 ---- DestroyImage(image); return((Image *) NULL); } ! status=ReadData((char *) pixels,(int) packet_size, ! (int) image->packets,image->file); if (status == False) { Warning("insufficient image data in file",image->filename); *************** *** 3477,3483 **** q++; right_image->runlength=q->length; } ! r->red=(p->red*12) >> 4; r->green=0; r->blue=q->blue; r->index=0; --- 3487,3493 ---- q++; right_image->runlength=q->length; } ! r->red=(unsigned int) (p->red*12) >> 4; r->green=0; r->blue=q->blue; r->index=0; *************** *** 3712,3718 **** /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 3722,3728 ---- /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 3757,3763 **** q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=p->red; *q++=p->green; --- 3767,3773 ---- q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=p->red; *q++=p->green; *************** *** 3788,3794 **** q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=p->red; *q++=p->green; --- 3798,3804 ---- q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=p->red; *q++=p->green; *************** *** 3875,3881 **** if (image->colors <= 256) for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) *q++=(unsigned char) p->index; count+=(p->length+1); p++; --- 3885,3891 ---- if (image->colors <= 256) for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) *q++=(unsigned char) p->index; count+=(p->length+1); p++; *************** *** 3890,3896 **** { xff00=(unsigned char) (p->index >> 8); xff=(unsigned char) p->index; ! for (j=0; j <= p->length; j++) { *q++=xff00; *q++=xff; --- 3900,3906 ---- { xff00=(unsigned char) (p->index >> 8); xff=(unsigned char) p->index; ! for (j=0; j <= ((int) p->length); j++) { *q++=xff00; *q++=xff; *************** *** 3928,3934 **** if (image->colors <= 256) for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) *q++=(unsigned char) p->index; count+=(p->length+1); p++; --- 3938,3944 ---- if (image->colors <= 256) for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) *q++=(unsigned char) p->index; count+=(p->length+1); p++; *************** *** 3943,3949 **** { xff00=(unsigned char) (p->index >> 8); xff=(unsigned char) p->index; ! for (j=0; j <= p->length; j++) { *q++=xff00; *q++=xff; --- 3953,3959 ---- { xff00=(unsigned char) (p->index >> 8); xff=(unsigned char) p->index; ! for (j=0; j <= ((int) p->length); j++) { *q++=xff00; *q++=xff; *************** *** 4101,4108 **** % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ! % Function UncompressImage compresses an image to the minimum number of ! % runlength-encoded packets. % % The format of the UncompressImage routine is: % --- 4111,4118 ---- % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ! % Function UncompressImage uncompresses runlength-encoded pixels packets to ! % a rectangular array of pixels. % % The format of the UncompressImage routine is: % *************** *** 4143,4149 **** q=uncompressed_pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { q->red=p->red; q->green=p->green; --- 4153,4159 ---- q=uncompressed_pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { q->red=p->red; q->green=p->green; *************** *** 4268,4276 **** { p++; image->runlength=p->length; ! s->red=(p->red+(s-1)->red) >> 1; ! s->green=(p->green+(s-1)->green) >> 1; ! s->blue=(p->blue+(s-1)->blue) >> 1; } s++; } --- 4278,4286 ---- { p++; image->runlength=p->length; ! s->red=(unsigned int) (p->red+(s-1)->red) >> 1; ! s->green=(unsigned int) (p->green+(s-1)->green) >> 1; ! s->blue=(unsigned int) (p->blue+(s-1)->blue) >> 1; } s++; } *************** *** 4305,4313 **** { p++; image->runlength=p->length; ! s->red=(p->red+(s-1)->red) >> 1; ! s->green=(p->green+(s-1)->green) >> 1; ! s->blue=(p->blue+(s-1)->blue) >> 1; } s++; } --- 4315,4323 ---- { p++; image->runlength=p->length; ! s->red=(unsigned int) (p->red+(s-1)->red) >> 1; ! s->green=(unsigned int) (p->green+(s-1)->green) >> 1; ! s->blue=(unsigned int) (p->blue+(s-1)->blue) >> 1; } s++; } *************** *** 4330,4338 **** */ for (x=0; x < zoomed_image->columns; x++) { ! q->red=(cs->red+ns->red) >> 1; ! q->green=(cs->green+ns->green) >> 1; ! q->blue=(cs->blue+ns->blue) >> 1; q->index=0; q->length=0; q++; --- 4340,4348 ---- */ for (x=0; x < zoomed_image->columns; x++) { ! q->red=(unsigned int) (cs->red+ns->red) >> 1; ! q->green=(unsigned int) (cs->green+ns->green) >> 1; ! q->blue=(unsigned int) (cs->blue+ns->blue) >> 1; q->index=0; q->length=0; q++; diff -c -r ImageMagick/image.h /alpha/home/cristy/ImageMagick/image.h *** ImageMagick/image.h Fri Nov 22 17:27:14 1991 --- /alpha/home/cristy/ImageMagick/image.h Fri Nov 22 17:35:03 1991 *************** *** 1,8 **** /* Image define declarations. */ ! #define Intensity(color) \ ! (((color).red*77+(color).green*150+(color).blue*29) >> 8) #define MaxColormapSize 65535 #define MaxImageSize (4096*4096) #define MaxRgb 255 --- 1,8 ---- /* Image define declarations. */ ! #define Intensity(color) (unsigned int) \ ! ((unsigned int) ((color).red*77+(color).green*150+(color).blue*29) >> 8) #define MaxColormapSize 65535 #define MaxImageSize (4096*4096) #define MaxRgb 255 *************** *** 63,69 **** *file; char ! filename[256]; char *comments; --- 63,70 ---- *file; char ! filename[256], ! magick[10]; char *comments; *************** *** 86,92 **** runlength; RunlengthPacket ! *pixels; unsigned int scene; --- 87,94 ---- runlength; RunlengthPacket ! *pixels, ! *packet; unsigned int scene; Common subdirectories: ImageMagick/images and /alpha/home/cristy/ImageMagick/images diff -c -r ImageMagick/montage.man /alpha/home/cristy/ImageMagick/montage.man *** ImageMagick/montage.man Fri Nov 22 17:27:31 1991 --- /alpha/home/cristy/ImageMagick/montage.man Fri Nov 22 17:35:03 1991 *************** *** 9,15 **** .SH DESCRIPTION \fIMontage\fP creates a composite image by combining several separate images. The images are tiled on the composite image with the name of the image ! appearing just above the individual tile. The composite image is constructed in the following manner. First, each image specified on the command line, except for the last, is --- 9,15 ---- .SH DESCRIPTION \fIMontage\fP creates a composite image by combining several separate images. The images are tiled on the composite image with the name of the image ! optionally appearing just above the individual tile. The composite image is constructed in the following manner. First, each image specified on the command line, except for the last, is diff -c -r ImageMagick/quantize.c /alpha/home/cristy/ImageMagick/quantize.c *** ImageMagick/quantize.c Fri Nov 22 17:27:37 1991 --- /alpha/home/cristy/ImageMagick/quantize.c Fri Nov 22 17:35:04 1991 *************** *** 550,556 **** Set colors of new node to contain pixel. */ node->children|=1 << id; ! bisect=(1 << (MaxTreeDepth-level)) >> 1; node->child[id]=InitializeNode(id,level,node, node->mid_red+(id & 1 ? bisect : -bisect), node->mid_green+(id & 2 ? bisect : -bisect), --- 550,556 ---- Set colors of new node to contain pixel. */ node->children|=1 << id; ! bisect=(unsigned int) (1 << (MaxTreeDepth-level)) >> 1; node->child[id]=InitializeNode(id,level,node, node->mid_red+(id & 1 ? bisect : -bisect), node->mid_green+(id & 2 ? bisect : -bisect), diff -c -r ImageMagick/rotate.c /alpha/home/cristy/ImageMagick/rotate.c *** ImageMagick/rotate.c Fri Nov 22 17:27:39 1991 --- /alpha/home/cristy/ImageMagick/rotate.c Fri Nov 22 17:35:04 1991 *************** *** 212,218 **** q=p-step*source_columns; for (i=0; i < length; i++) { ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 212,218 ---- q=p-step*source_columns; for (i=0; i < length; i++) { ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 221,227 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; --- 221,227 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; *************** *** 230,236 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; --- 230,236 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; *************** *** 246,252 **** /* Set old column to background color. */ ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 246,252 ---- /* Set old column to background color. */ ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 255,262 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+background.green* ! int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else --- 255,262 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+ ! background.green*int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else *************** *** 264,271 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+background.blue* ! int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else --- 264,271 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+ ! background.blue*int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else *************** *** 289,295 **** { q-=source_columns; p-=source_columns; ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 289,295 ---- { q-=source_columns; p-=source_columns; ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 298,304 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; --- 298,304 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; *************** *** 307,313 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; --- 307,313 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; *************** *** 322,328 **** Set old column to background color. */ q-=source_columns; ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 322,328 ---- Set old column to background color. */ q-=source_columns; ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 331,338 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+background.green* ! int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else --- 331,338 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+ ! background.green*int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else *************** *** 340,347 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+background.blue* ! int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else --- 340,347 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+ ! background.blue*int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else *************** *** 708,714 **** q=p-step; for (i=0; i < length; i++) { ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 708,714 ---- q=p-step; for (i=0; i < length; i++) { ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 717,723 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; --- 717,723 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; *************** *** 726,732 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; --- 726,732 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; *************** *** 742,748 **** /* Set old row to background color. */ ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 742,748 ---- /* Set old row to background color. */ ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 751,758 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+background.green* ! int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else --- 751,758 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+ ! background.green*int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; else *************** *** 760,767 **** q->green=0; else q->green=(unsigned ) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+background.blue* ! int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else --- 760,767 ---- q->green=0; else q->green=(unsigned ) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+ ! background.blue*int_fractional_step) >> 14; if (blue > MaxRgb) q->blue=MaxRgb; else *************** *** 785,791 **** { p--; q--; ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; --- 785,791 ---- { p--; q--; ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+p->red* int_fractional_step) >> 14; if (red > MaxRgb) q->red=MaxRgb; *************** *** 794,800 **** q->red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; --- 794,800 ---- q->red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+p->green* int_fractional_step) >> 14; if (green > MaxRgb) q->green=MaxRgb; *************** *** 803,809 **** q->green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) blue=MaxRgb; --- 803,809 ---- q->green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+p->blue* int_fractional_step) >> 14; if (blue > MaxRgb) blue=MaxRgb; *************** *** 818,824 **** Set old row to background color. */ q--; ! red=(last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) red=MaxRgb; --- 818,824 ---- Set old row to background color. */ q--; ! red=(long) (last_pixel.red*((1 << 14)-int_fractional_step)+background.red* int_fractional_step) >> 14; if (red > MaxRgb) red=MaxRgb; *************** *** 827,834 **** red=0; else q->red=(unsigned char) red; ! green=(last_pixel.green*((1 << 14)-int_fractional_step)+background.green* ! int_fractional_step) >> 14; if (green > MaxRgb) green=MaxRgb; else --- 827,834 ---- red=0; else q->red=(unsigned char) red; ! green=(long) (last_pixel.green*((1 << 14)-int_fractional_step)+ ! background.green*int_fractional_step) >> 14; if (green > MaxRgb) green=MaxRgb; else *************** *** 836,843 **** green=0; else q->green=(unsigned char) green; ! blue=(last_pixel.blue*((1 << 14)-int_fractional_step)+background.blue* ! int_fractional_step) >> 14; if (blue > MaxRgb) blue=MaxRgb; else --- 836,843 ---- green=0; else q->green=(unsigned char) green; ! blue=(long) (last_pixel.blue*((1 << 14)-int_fractional_step)+ ! background.blue*int_fractional_step) >> 14; if (blue > MaxRgb) blue=MaxRgb; else Common subdirectories: ImageMagick/xtp and /alpha/home/cristy/ImageMagick/xtp diff -c -r ImageMagick/filters/AVStoMIFF.c /alpha/home/cristy/ImageMagick/filters/AVStoMIFF.c *** ImageMagick/filters/AVStoMIFF.c Fri Nov 22 17:27:43 1991 --- /alpha/home/cristy/ImageMagick/filters/AVStoMIFF.c Fri Nov 22 17:35:04 1991 *************** *** 174,185 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 174,185 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/GRAYtoMIFF.c /alpha/home/cristy/ImageMagick/filters/GRAYtoMIFF.c *** ImageMagick/filters/GRAYtoMIFF.c Fri Nov 22 17:27:55 1991 --- /alpha/home/cristy/ImageMagick/filters/GRAYtoMIFF.c Fri Nov 22 17:35:04 1991 *************** *** 165,176 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 165,176 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/Imakefile /alpha/home/cristy/ImageMagick/filters/Imakefile *** ImageMagick/filters/Imakefile Fri Nov 22 17:27:56 1991 --- /alpha/home/cristy/ImageMagick/filters/Imakefile Fri Nov 22 17:38:29 1991 *************** *** 1,5 **** --- 1,31 ---- + # + # Imakefile for image filters to and from the MIFF format. + # + # Copyright 1991 E. I. du Pont de Nemours & Company + # + # Permission to use, copy, modify, distribute, and sell this software and + # its documentation for any purpose is hereby granted without fee, + # provided that the above Copyright notice appear in all copies and that + # both that Copyright notice and this permission notice appear in + # supporting documentation, and that the name of E. I. du Pont de Nemours + # & Company not be used in advertising or publicity pertaining to + # distribution of the software without specific, written prior + # permission. E. I. du Pont de Nemours & Company makes no representations + # about the suitability of this software for any purpose. It is provided + # "as is" without express or implied warranty. + # + # E. I. du Pont de Nemours & Company disclaims all warranties with regard + # to this software, including all implied warranties of merchantability + # and fitness, in no event shall E. I. du Pont de Nemours & Company be + # liable for any special, indirect or consequential damages or any + # damages whatsoever resulting from loss of use, data or profits, whether + # in an action of contract, negligence or other tortious action, arising + # out of or in connection with the use or performance of this software. + # + EXTRA_INCLUDES= -I/usr/local/include -I.. EXTRA_LIBRARIES= -lX11 -lm + JPEG_LIBRARIES= /usr/local/lib/libjpeg.a PPM_LIBRARIES= /usr/local/lib/libppm.a /usr/local/lib/libpgm.a \ /usr/local/lib/libpbm.a TIFF_LIBRARIES= /usr/local/lib/libtiff.a *************** *** 10,15 **** --- 36,43 ---- GIFtoMIFFObjects= GIFtoMIFF.o image.o compress.o GRAYtoMIFFSources= GRAYtoMIFF.c GRAYtoMIFFObjects= GRAYtoMIFF.o image.o compress.o + JPEGtoMIFFSources= JPEGtoMIFF.c + JPEGtoMIFFObjects= JPEGtoMIFF.o image.o quantize.o colors.o compress.o MIFFtoAVSSources= MIFFtoAVS.c MIFFtoAVSObjects= MIFFtoAVS.o image.o compress.o MIFFtoGIFSources= MIFFtoGIF.c *************** *** 16,23 **** --- 44,55 ---- MIFFtoGIFObjects= MIFFtoGIF.o image.o quantize.o compress.o MIFFtoGRAYSources= MIFFtoGRAY.c MIFFtoGRAYObjects= MIFFtoGRAY.o image.o quantize.o compress.o + MIFFtoJPEGSources= MIFFtoJPEG.c + MIFFtoJPEGObjects= MIFFtoJPEG.o image.o quantize.o compress.o MIFFtoMTVSources= MIFFtoMTV.c MIFFtoMTVObjects= MIFFtoMTV.o image.o rotate.o compress.o + MIFFtoPSSources= MIFFtoPS.c + MIFFtoPSObjects= MIFFtoPS.o image.o compress.o MIFFtoPPMSources= MIFFtoPPM.c MIFFtoPPMObjects= MIFFtoPPM.o image.o compress.o MIFFtoRGBSources= MIFFtoRGB.c *************** *** 48,56 **** XWDtoMIFFObjects= XWDtoMIFF.o image.o compress.o PROGRAMS= AVStoMIFF MIFFtoAVS GIFtoMIFF MIFFtoGIF GRAYtoMIFF MIFFtoGRAY \ ! MTVtoMIFF MIFFtoMTV RGBtoMIFF MIFFtoRGB SUNtoMIFF MIFFtoSUN MIFFtoSTEREO \ ! XBMtoMIFF MIFFtoXBM XWDtoMIFF MIFFtoXWD TIFFtoMIFF MIFFtoTIFF \ ! PPMtoMIFF MIFFtoPPM AllTarget($(PROGRAMS)) --- 80,88 ---- XWDtoMIFFObjects= XWDtoMIFF.o image.o compress.o PROGRAMS= AVStoMIFF MIFFtoAVS GIFtoMIFF MIFFtoGIF GRAYtoMIFF MIFFtoGRAY \ ! MTVtoMIFF MIFFtoMTV MIFFtoPS RGBtoMIFF MIFFtoRGB SUNtoMIFF MIFFtoSUN \ ! MIFFtoSTEREO XBMtoMIFF MIFFtoXBM XWDtoMIFF MIFFtoXWD TIFFtoMIFF MIFFtoTIFF \ ! PPMtoMIFF MIFFtoPPM JPEGtoMIFF MIFFtoJPEG AllTarget($(PROGRAMS)) *************** *** 70,75 **** --- 102,110 ---- InstallProgram(MTVtoMIFF,$(BINDIR)) NormalProgramTarget(MIFFtoMTV,$(MIFFtoMTVObjects), , , ) InstallProgram(MIFFtoMTV,$(BINDIR)) + InstallProgram(PStoMIFF,$(BINDIR)) + NormalProgramTarget(MIFFtoPS,$(MIFFtoPSObjects), , , ) + InstallProgram(MIFFtoPS,$(BINDIR)) NormalProgramTarget(RGBtoMIFF,$(RGBtoMIFFObjects), , , ) InstallProgram(RGBtoMIFF,$(BINDIR)) NormalProgramTarget(MIFFtoRGB,$(MIFFtoRGBObjects), , , ) *************** *** 96,101 **** --- 131,140 ---- InstallProgram(PPMtoMIFF,$(BINDIR)) NormalProgramTarget(MIFFtoPPM,$(MIFFtoPPMObjects), ,$(PPM_LIBRARIES), ) InstallProgram(MIFFtoPPM,$(BINDIR)) + NormalProgramTarget(JPEGtoMIFF,$(JPEGtoMIFFObjects), ,$(JPEG_LIBRARIES), ) + InstallProgram(JPEGtoMIFF,$(BINDIR)) + NormalProgramTarget(MIFFtoJPEG,$(MIFFtoJPEGObjects), ,$(JPEG_LIBRARIES), ) + InstallProgram(MIFFtoJPEG,$(BINDIR)) DependTarget() image.o: diff -c -r ImageMagick/filters/MIFFtoAVS.c /alpha/home/cristy/ImageMagick/filters/MIFFtoAVS.c *** ImageMagick/filters/MIFFtoAVS.c Fri Nov 22 17:27:59 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoAVS.c Fri Nov 22 17:35:05 1991 *************** *** 190,201 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 190,201 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/MIFFtoGIF.c /alpha/home/cristy/ImageMagick/filters/MIFFtoGIF.c *** ImageMagick/filters/MIFFtoGIF.c Fri Nov 22 17:28:02 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoGIF.c Fri Nov 22 17:35:05 1991 *************** *** 184,195 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 184,195 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/MIFFtoGRAY.c /alpha/home/cristy/ImageMagick/filters/MIFFtoGRAY.c *** ImageMagick/filters/MIFFtoGRAY.c Fri Nov 22 17:28:04 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoGRAY.c Fri Nov 22 17:35:05 1991 *************** *** 180,191 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 180,191 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 204,210 **** q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) *q++=p->red; p++; } --- 204,210 ---- q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) *q++=p->red; p++; } diff -c -r ImageMagick/filters/MIFFtoMTV.c /alpha/home/cristy/ImageMagick/filters/MIFFtoMTV.c *** ImageMagick/filters/MIFFtoMTV.c Fri Nov 22 17:28:07 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoMTV.c Fri Nov 22 17:35:05 1991 *************** *** 180,191 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 180,191 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 201,207 **** q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=p->red; *q++=p->green; --- 201,207 ---- q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=p->red; *q++=p->green; diff -c -r ImageMagick/filters/MIFFtoPPM.c /alpha/home/cristy/ImageMagick/filters/MIFFtoPPM.c *** ImageMagick/filters/MIFFtoPPM.c Fri Nov 22 17:28:09 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoPPM.c Fri Nov 22 17:35:05 1991 *************** *** 182,193 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 182,193 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 203,209 **** x=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { PPM_ASSIGN(*q,p->red,p->green,p->blue); q++; --- 203,209 ---- x=0; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { PPM_ASSIGN(*q,p->red,p->green,p->blue); q++; diff -c -r ImageMagick/filters/MIFFtoPS.c /alpha/home/cristy/ImageMagick/filters/MIFFtoPS.c *** ImageMagick/filters/MIFFtoPS.c Fri Nov 22 18:28:33 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoPS.c Fri Nov 22 15:30:13 1991 *************** *** 0 **** --- 1,165 ---- + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % % + % % + % % + % EEEEE X X PPPP OOO RRRR TTTTT % + % E X X P P O O R R T % + % EEE X PPPP O O RRRR T % + % E X X P O O R R T % + % EEEEE X X P OOO R R T % + % % + % % + % Export MIFF image to a Encapsulated Postscript format. % + % % + % % + % % + % Software Design % + % John Cristy % + % July 1991 % + % % + % % + % Copyright 1991 E. I. Dupont de Nemours & Company % + % % + % Permission to use, copy, modify, distribute, and sell this software and % + % its documentation for any purpose is hereby granted without fee, % + % provided that the above Copyright notice appear in all copies and that % + % both that Copyright notice and this permission notice appear in % + % supporting documentation, and that the name of E. I. Dupont de Nemours % + % & Company not be used in advertising or publicity pertaining to % + % distribution of the software without specific, written prior % + % permission. E. I. Dupont de Nemours & Company makes no representations % + % about the suitability of this software for any purpose. It is provided % + % "as is" without express or implied warranty. % + % % + % E. I. Dupont de Nemours & Company disclaims all warranties with regard % + % to this software, including all implied warranties of merchantability % + % and fitness, in no event shall E. I. Dupont de Nemours & Company be % + % liable for any special, indirect or consequential damages or any % + % damages whatsoever resulting from loss of use, data or profits, whether % + % in an action of contract, negligence or other tortious action, arising % + % out of or in connection with the use or performance of this software. % + % % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % + % Command syntax: + % + % export image.miff image.ps + % + % Specify 'image.miff' as '-' for standard input. + % Specify 'image.ps' as '-' for standard output. + % + % + */ + + #include "display.h" + #include "image.h" + #include "X.h" + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % % + % % + % % + % E r r o r % + % % + % % + % % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % + % Function Error displays an error message and then terminates the program. + % + % The format of the Error routine is: + % + % Error(message,qualifier) + % + % A description of each parameter follows: + % + % o message: Specifies the message to display before terminating the + % program. + % + % o qualifier: Specifies any qualifier to the message. + % + % + */ + static void Error(message,qualifier) + char + *message, + *qualifier; + { + (void) fprintf(stderr,"%s: %s",application_name,message); + if (qualifier != (char *) NULL) + (void) fprintf(stderr," %s",qualifier); + (void) fprintf(stderr,".\n"); + exit(1); + } + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % % + % % + % % + % U s a g e % + % % + % % + % % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % + % Procedure Usage displays the program usage; + % + % The format of the Usage routine is: + % + % Usage(message) + % + % A description of each parameter follows: + % + % message: Specifies a specific message to display to the user. + % + */ + static void Usage(message) + char + *message; + { + if (message != (char *) NULL) + (void) fprintf(stderr,"Can't continue, %s\n\n",message); + (void) fprintf(stderr,"Usage: %s image.miff image.ps\n\n",application_name); + (void) fprintf(stderr,"Specify 'image.miff' as '-' for standard input.\n"); + (void) fprintf(stderr,"Specify 'image.ps' as '-' for standard output.\n"); + exit(1); + } + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % % + % % + % % + % M a i n % + % % + % % + % % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % + % + */ + int main(argc,argv) + int + argc; + + char + *argv[]; + { + Image + *image; + + application_name=argv[0]; + if (argc < 3) + Usage((char *) NULL); + image=ReadImage(argv[1]); + if (image == (Image *) NULL) + exit(1); + (void) strcpy(image->filename,argv[2]); + PrintImage(image,(char *) NULL); + (void) fprintf(stderr,"%s=> %s %dx%d\n",argv[1],argv[2],image->columns, + image->rows); + return(False); + } diff -c -r ImageMagick/filters/MIFFtoRGB.c /alpha/home/cristy/ImageMagick/filters/MIFFtoRGB.c *** ImageMagick/filters/MIFFtoRGB.c Fri Nov 22 17:28:10 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoRGB.c Fri Nov 22 17:35:05 1991 *************** *** 180,191 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 180,191 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 201,207 **** q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { *q++=p->red; *q++=p->green; --- 201,207 ---- q=pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { *q++=p->red; *q++=p->green; diff -c -r ImageMagick/filters/MIFFtoSUN.c /alpha/home/cristy/ImageMagick/filters/MIFFtoSUN.c *** ImageMagick/filters/MIFFtoSUN.c Fri Nov 22 17:28:20 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoSUN.c Fri Nov 22 17:35:05 1991 *************** *** 259,270 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 259,270 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/MIFFtoTIFF.c /alpha/home/cristy/ImageMagick/filters/MIFFtoTIFF.c *** ImageMagick/filters/MIFFtoTIFF.c Fri Nov 22 17:28:25 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoTIFF.c Fri Nov 22 17:35:06 1991 *************** *** 232,238 **** x++; if (x == image->columns) { ! if (TIFFWriteScanline(file,(char *) scanline,y) < 0) break; q=scanline; x=0; --- 232,238 ---- x++; if (x == image->columns) { ! if (TIFFWriteScanline(file,(unsigned char *) scanline,y,0) < 0) break; q=scanline; x=0; *************** *** 275,281 **** x++; if (x == image->columns) { ! if (TIFFWriteScanline(file,(char *) scanline,y) < 0) break; q=scanline; x=0; --- 275,281 ---- x++; if (x == image->columns) { ! if (TIFFWriteScanline(file,(unsigned char *) scanline,y,0) < 0) break; q=scanline; x=0; *************** *** 288,294 **** (void) free((char *) scanline); (void) TIFFFlushData(file); if (verbose) ! TIFFPrintDirectory(file,stderr,False,False,False); (void) TIFFClose(file); return(True); } --- 288,294 ---- (void) free((char *) scanline); (void) TIFFFlushData(file); if (verbose) ! TIFFPrintDirectory(file,stderr,False); (void) TIFFClose(file); return(True); } *************** *** 323,328 **** if (image == (Image *) NULL) exit(1); (void) strcpy(image->filename,argv[2]); ! WriteTiffImage(image,True); DestroyImage(image); } --- 323,328 ---- if (image == (Image *) NULL) exit(1); (void) strcpy(image->filename,argv[2]); ! WriteTiffImage(image,(unsigned int) True); DestroyImage(image); } diff -c -r ImageMagick/filters/MIFFtoXBM.c /alpha/home/cristy/ImageMagick/filters/MIFFtoXBM.c *** ImageMagick/filters/MIFFtoXBM.c Fri Nov 22 17:28:27 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoXBM.c Fri Nov 22 17:35:06 1991 *************** *** 191,202 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 191,202 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 205,211 **** Write X bitmap header. */ (void) strcpy(name,image->filename); ! q=strchr(name,'.'); if (q) *q=(char) NULL; (void) fprintf(image->file,"#define %s_width %d\n",name,image->columns); --- 205,211 ---- Write X bitmap header. */ (void) strcpy(name,image->filename); ! q=(char *) strchr(name,'.'); if (q) *q=(char) NULL; (void) fprintf(image->file,"#define %s_width %d\n",name,image->columns); *************** *** 230,236 **** (void) fprintf(image->file," "); for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { byte>>=1; if (p->index == foreground_pixel) --- 230,236 ---- (void) fprintf(image->file," "); for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { byte>>=1; if (p->index == foreground_pixel) diff -c -r ImageMagick/filters/MIFFtoXWD.c /alpha/home/cristy/ImageMagick/filters/MIFFtoXWD.c *** ImageMagick/filters/MIFFtoXWD.c Fri Nov 22 17:28:31 1991 --- /alpha/home/cristy/ImageMagick/filters/MIFFtoXWD.c Fri Nov 22 17:35:06 1991 *************** *** 290,301 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) --- 290,301 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"compress -c > %s\0",image->filename); image->file=(FILE *) popen(command,"w"); } if (image->file == (FILE *) NULL) *************** *** 388,394 **** q=xwd_pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= p->length; j++) { if (image->class == PseudoClass) *q++=p->index; --- 388,394 ---- q=xwd_pixels; for (i=0; i < image->packets; i++) { ! for (j=0; j <= ((int) p->length); j++) { if (image->class == PseudoClass) *q++=p->index; diff -c -r ImageMagick/filters/MTVtoMIFF.c /alpha/home/cristy/ImageMagick/filters/MTVtoMIFF.c *** ImageMagick/filters/MTVtoMIFF.c Fri Nov 22 17:28:34 1991 --- /alpha/home/cristy/ImageMagick/filters/MTVtoMIFF.c Fri Nov 22 17:35:06 1991 *************** *** 164,175 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 164,175 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/PPMtoMIFF.c /alpha/home/cristy/ImageMagick/filters/PPMtoMIFF.c *** ImageMagick/filters/PPMtoMIFF.c Fri Nov 22 17:28:37 1991 --- /alpha/home/cristy/ImageMagick/filters/PPMtoMIFF.c Fri Nov 22 17:35:06 1991 *************** *** 167,178 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 167,178 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) *************** *** 180,186 **** /* Read PPM image. */ ! pixels=ppm_readppm(image->file,&image->columns,&image->rows,&max_value); /* Create image. */ --- 180,187 ---- /* Read PPM image. */ ! pixels=ppm_readppm(image->file,(int *) &image->columns,(int *) &image->rows, ! (pixval *) &max_value); /* Create image. */ diff -c -r ImageMagick/filters/PStoMIFF /alpha/home/cristy/ImageMagick/filters/PStoMIFF *** ImageMagick/filters/PStoMIFF Fri Nov 22 18:28:38 1991 --- /alpha/home/cristy/ImageMagick/filters/PStoMIFF Fri Nov 22 15:47:25 1991 *************** *** 0 **** --- 1,49 ---- + #!/bin/csh + # + # PStoMIFF: convert postscript to the MIFF image format. + # + # Copyright 1991 E. I. du Pont de Nemours & Company + # + # Permission to use, copy, modify, distribute, and sell this software and + # its documentation for any purpose is hereby granted without fee, + # provided that the above Copyright notice appear in all copies and that + # both that Copyright notice and this permission notice appear in + # supporting documentation, and that the name of E. I. du Pont de Nemours + # & Company not be used in advertising or publicity pertaining to + # distribution of the software without specific, written prior + # permission. E. I. du Pont de Nemours & Company makes no representations + # about the suitability of this software for any purpose. It is provided + # "as is" without express or implied warranty. + # + # E. I. du Pont de Nemours & Company disclaims all warranties with regard + # to this software, including all implied warranties of merchantability + # and fitness, in no event shall E. I. du Pont de Nemours & Company be + # liable for any special, indirect or consequential damages or any + # damages whatsoever resulting from loss of use, data or profits, whether + # in an action of contract, negligence or other tortious action, arising + # out of or in connection with the use or performance of this software. + # + if ( $#argv != 2 ) then + echo "Usage: PStoMIFF image.ps image.miff" + exit 1 + endif + set postscript_file = $1:r + if ( ! -e $postscript_file.ps ) then + echo "PStoMIFF: unable to open file ($postscript_file.ps)." + exit 1 + endif + set miff_file = $2 + gs -dNODISPLAY pstoppm.ps > /dev/null << EOF + ($postscript_file) ppm24run + EOF + if ( -e $postscript_file.ppm ) then + PPMtoMIFF $postscript_file.ppm $miff_file + /bin/rm -f $postscript_file.ppm + else + @ x = 1 + while ( -e $postscript_file.$x'ppm' ) + PPMtoMIFF $postscript_file.$x'ppm' $miff_file:r.$x + /bin/rm -f $postscript_file.$x'ppm' + @ x++ + end + endif diff -c -r ImageMagick/filters/README /alpha/home/cristy/ImageMagick/filters/README *** ImageMagick/filters/README Fri Nov 22 17:28:38 1991 --- /alpha/home/cristy/ImageMagick/filters/README Fri Nov 22 17:35:06 1991 *************** *** 16,26 **** display image.miff The TIFFtoMIFF and MIFFtoTIFF filters require Sam Leffler's TIFF ! software available via FTP as sgi.com:graphics/tiff/v2.4.tar.Z. The PPMtoMIFF and MIFFtoPPM filters require Jef Poskanzer's PBMPLUS software available via FTP as export.lcs.mit.edu:contrib/pbmplus.tar.Z. To succesfully compile the PPMtoMIFF and MIFFtoPPM filters, first compile the pbmplus routines. Next copy pbmplus.h, pbm/pbm.h, pgm/pgm.h, ppm/ppm.h, and pnm/pnm.h to /usr/local/include. Change --- 16,29 ---- display image.miff The TIFFtoMIFF and MIFFtoTIFF filters require Sam Leffler's TIFF ! software available via FTP as ucbvax.berkeley.edu:pub/tiff/v2.4.tar.Z. The PPMtoMIFF and MIFFtoPPM filters require Jef Poskanzer's PBMPLUS software available via FTP as export.lcs.mit.edu:contrib/pbmplus.tar.Z. + The JPEGtoMIFF and MIFFtoJPEG filters require Independent JPEG Group's + software available via FTP as uunet.uu.net:graphics/jpeg/jpegsrc.v1.tar.Z. + To succesfully compile the PPMtoMIFF and MIFFtoPPM filters, first compile the pbmplus routines. Next copy pbmplus.h, pbm/pbm.h, pgm/pgm.h, ppm/ppm.h, and pnm/pnm.h to /usr/local/include. Change *************** *** 40,45 **** --- 43,59 ---- make PPMtoMIFF make MIFFtoPPM + + To succesfully compile the JPEGtoMIFF and MIFFtoJPEG filters, first compile + the jpeg routines. Next copy jconfig.h, jinclude.h, jpegdata.h to + /usr/local/include. + + Next copy libjpeg.a to /usr/local/lib. + + Finally, type + + make JPEGtoMIFF + make MIFFtoJPEG Use MTVtoMIFF to convert Rayshade images to MIFF. The filter can accept multiple Rayshade animation frames from a single MTV image file. diff -c -r ImageMagick/filters/RGBtoMIFF.c /alpha/home/cristy/ImageMagick/filters/RGBtoMIFF.c *** ImageMagick/filters/RGBtoMIFF.c Fri Nov 22 17:28:46 1991 --- /alpha/home/cristy/ImageMagick/filters/RGBtoMIFF.c Fri Nov 22 17:35:06 1991 *************** *** 164,175 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 164,175 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/SUNtoMIFF.c /alpha/home/cristy/ImageMagick/filters/SUNtoMIFF.c *** ImageMagick/filters/SUNtoMIFF.c Fri Nov 22 17:28:49 1991 --- /alpha/home/cristy/ImageMagick/filters/SUNtoMIFF.c Fri Nov 22 17:35:07 1991 *************** *** 246,257 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 246,257 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) *************** *** 268,280 **** MSBFirstOrder((char *) &sun_header,sizeof(sun_header)); if (sun_header.magic != 0x59a66a95) Error("not a SUN raster,",image->filename); - printf("%d\n",sun_header.length,sun_header.depth); - printf("%d\n",sun_header.maplength,sun_header.depth); switch (sun_header.maptype) { case RMT_NONE: { - puts("none"); if (sun_header.depth < 24) { /* --- 268,277 ---- *************** *** 299,305 **** unsigned char *sun_colormap; - puts("rgb"); /* Read Sun raster colormap. */ --- 296,301 ---- *************** *** 331,337 **** /* Read Sun raster colormap. */ - puts("raw"); sun_colormap=(unsigned char *) malloc((unsigned int) sun_header.maplength*sizeof(unsigned char)); if (sun_colormap == (unsigned char *) NULL) --- 327,332 ---- *************** *** 353,359 **** Error("memory allocation error",(char *) NULL); (void) ReadData((char *) sun_data,1,sun_header.length,image->file); sun_pixels=sun_data; - printf("%d\n",sun_header.type); if (sun_header.type == RT_ENCODED) { register int --- 348,353 ---- diff -c -r ImageMagick/filters/TIFFtoMIFF.c /alpha/home/cristy/ImageMagick/filters/TIFFtoMIFF.c *** ImageMagick/filters/TIFFtoMIFF.c Fri Nov 22 17:28:53 1991 --- /alpha/home/cristy/ImageMagick/filters/TIFFtoMIFF.c Fri Nov 22 17:35:07 1991 *************** *** 158,163 **** --- 158,167 ---- unsigned char *scanline; + unsigned long + image_height, + image_width; + unsigned short bits_per_sample, fill_order, *************** *** 165,174 **** planar_configuration, samples_per_pixel; - unsigned long - image_length, - image_width; - /* Allocate image structure. */ --- 169,174 ---- *************** *** 183,189 **** if (file == (TIFF *) NULL) exit(1); if (verbose) ! TIFFPrintDirectory(file,stderr,False,False,False); /* Verify this image is acceptable. */ --- 183,189 ---- if (file == (TIFF *) NULL) exit(1); if (verbose) ! TIFFPrintDirectory(file,stderr,False); /* Verify this image is acceptable. */ *************** *** 204,210 **** if (!TIFFGetField(file,TIFFTAG_PHOTOMETRIC,&photometric)) photometric=PHOTOMETRIC_PALETTE; TIFFGetField(file,TIFFTAG_IMAGEWIDTH,&image_width); ! TIFFGetField(file,TIFFTAG_IMAGELENGTH,&image_length); image->comments=(char *) malloc((unsigned int) (strlen(image->filename)+256)); if (image->comments == (char *) NULL) Error("unable to allocate memory",(char *) NULL); --- 204,210 ---- if (!TIFFGetField(file,TIFFTAG_PHOTOMETRIC,&photometric)) photometric=PHOTOMETRIC_PALETTE; TIFFGetField(file,TIFFTAG_IMAGEWIDTH,&image_width); ! TIFFGetField(file,TIFFTAG_IMAGELENGTH,&image_height); image->comments=(char *) malloc((unsigned int) (strlen(image->filename)+256)); if (image->comments == (char *) NULL) Error("unable to allocate memory",(char *) NULL); *************** *** 212,218 **** image->filename); image->class=(photometric == PHOTOMETRIC_RGB ? DirectClass : PseudoClass); image->columns=image_width; ! image->rows=image_length; image->colors=1 << bits_per_sample; if (image->class == PseudoClass) { --- 212,218 ---- image->filename); image->class=(photometric == PHOTOMETRIC_RGB ? DirectClass : PseudoClass); image->columns=image_width; ! image->rows=image_height; image->colors=1 << bits_per_sample; if (image->class == PseudoClass) { *************** *** 295,301 **** if (TIFFReadScanline(file,p,y,0) < 0) Error("unable to read TIFF scanline",(char *) NULL); if (planar_configuration != PLANARCONFIG_CONTIG) ! for (i=1; i < samples_per_pixel; i++) if (TIFFReadScanline(file,p+i*TIFFScanlineSize(file),y,i) < 0) Error("unable to read TIFF scanline",(char *) NULL); switch (photometric) --- 295,301 ---- if (TIFFReadScanline(file,p,y,0) < 0) Error("unable to read TIFF scanline",(char *) NULL); if (planar_configuration != PLANARCONFIG_CONTIG) ! for (i=1; i < ((int) samples_per_pixel); i++) if (TIFFReadScanline(file,p+i*TIFFScanlineSize(file),y,i) < 0) Error("unable to read TIFF scanline",(char *) NULL); switch (photometric) diff -c -r ImageMagick/filters/XBMtoMIFF.c /alpha/home/cristy/ImageMagick/filters/XBMtoMIFF.c *** ImageMagick/filters/XBMtoMIFF.c Fri Nov 22 17:28:54 1991 --- /alpha/home/cristy/ImageMagick/filters/XBMtoMIFF.c Fri Nov 22 17:35:07 1991 *************** *** 169,180 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 169,180 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/filters/XWDtoMIFF.c /alpha/home/cristy/ImageMagick/filters/XWDtoMIFF.c *** ImageMagick/filters/XWDtoMIFF.c Fri Nov 22 17:28:58 1991 --- /alpha/home/cristy/ImageMagick/filters/XWDtoMIFF.c Fri Nov 22 17:35:07 1991 *************** *** 288,299 **** else { char ! command[256]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) --- 288,299 ---- else { char ! command[1024]; /* Image file is compressed-- uncompress it. */ ! (void) sprintf(command,"uncompress -c %s\0",image->filename); image->file=(FILE *) popen(command,"r"); } if (image->file == (FILE *) NULL) diff -c -r ImageMagick/images/README /alpha/home/cristy/ImageMagick/images/README *** ImageMagick/images/README Fri Nov 22 17:29:00 1991 --- /alpha/home/cristy/ImageMagick/images/README Fri Nov 22 17:35:07 1991 *************** *** 1,5 **** All images except swan.miff was rendered with rayshade 4.0. I created the table image script by combining the pool.ray and teapot.ray from ! the rayshade distribution. I also created the DNA script. The aquarium image was rendered from a script written by kilian@cray.com and Jerome A. Farm. --- 1,6 ---- All images except swan.miff was rendered with rayshade 4.0. I created the table image script by combining the pool.ray and teapot.ray from ! the rayshade distribution. I also created the DNA script. You will ! need red-blue stereo glasses to properly view stereo.miff. The aquarium image was rendered from a script written by kilian@cray.com and Jerome A. Farm. diff -c -r ImageMagick/xtp/Imakefile /alpha/home/cristy/ImageMagick/xtp/Imakefile *** ImageMagick/xtp/Imakefile Fri Nov 22 17:29:02 1991 --- /alpha/home/cristy/ImageMagick/xtp/Imakefile Fri Nov 22 17:35:07 1991 *************** *** 1,3 **** --- 1,28 ---- + # + # Imakefile for xtp. + # + # Copyright 1991 E. I. du Pont de Nemours & Company + # + # Permission to use, copy, modify, distribute, and sell this software and + # its documentation for any purpose is hereby granted without fee, + # provided that the above Copyright notice appear in all copies and that + # both that Copyright notice and this permission notice appear in + # supporting documentation, and that the name of E. I. du Pont de Nemours + # & Company not be used in advertising or publicity pertaining to + # distribution of the software without specific, written prior + # permission. E. I. du Pont de Nemours & Company makes no representations + # about the suitability of this software for any purpose. It is provided + # "as is" without express or implied warranty. + # + # E. I. du Pont de Nemours & Company disclaims all warranties with regard + # to this software, including all implied warranties of merchantability + # and fitness, in no event shall E. I. du Pont de Nemours & Company be + # liable for any special, indirect or consequential damages or any + # damages whatsoever resulting from loss of use, data or profits, whether + # in an action of contract, negligence or other tortious action, arising + # out of or in connection with the use or performance of this software. + # + BINDIR = $(DESTDIR)/usr/local/bin PROGRAMS= xtp SRCS= xtp.c regular.c *************** *** 6,9 **** AllTarget($(PROGRAMS)) ComplexProgramTarget(xtp) - --- 31,33 ----