# HG changeset patch # User Claus Gittinger # Date 828837640 -7200 # Node ID 2c42532d4492fa5f40aa3496730cc90d52176d96 # Parent 1b37daf6b557125b4440be14e02f03ab1e0ad93a *** empty log message *** diff -r 1b37daf6b557 -r 2c42532d4492 Make.proto --- a/Make.proto Fri Mar 29 04:43:40 1996 +0100 +++ b/Make.proto Sun Apr 07 02:40:40 1996 +0200 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.14 1996-03-29 03:43:40 cg Exp $ +# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.15 1996-04-07 00:40:36 cg Exp $ # # -------------- no need to change anything below ---------- @@ -16,28 +16,31 @@ # # less frequently used/needed +# if you want them included, uncomment the next lines: # -moreObjs= SunReader.$(O) \ +AUTOLOADEDOBJS= \ + SunReader.$(O) \ WinIconRdr.$(O) \ + PBMReader.$(O) \ PCXReader.$(O) \ XPMReader.$(O) \ XWDReader.$(O) \ STFormRdr.$(O) \ TargaReader.$(O) \ - FaceReader.$(O) - -# if you want them included, uncomment the next line: -# MOREOBJS=$(moreObjs) -# + FaceReader.$(O) \ + BlitImgRdr.$(O) \ + JPEGReader.$(O) \ + PrintConv.$(O) \ + ConvValue.$(O) UNCRITICALOBJS= \ - ClrValue.$(O) \ - Icon.$(O) \ - InputView.$(O) \ - BlockValue.$(O) \ - EventListener.$(O) \ - ActiveHelp.$(O) \ - ActiveHelpView.$(O) + ClrValue.$(O) \ + Icon.$(O) \ + InputView.$(O) \ + BlockValue.$(O) \ + EventListener.$(O) \ + ActiveHelp.$(O) \ + ActiveHelpView.$(O) OBJS= \ ClrValue.$(O) \ @@ -68,7 +71,7 @@ TIFFRdr.$(O) \ GIFReader.$(O) \ XBMReader.$(O) \ - $(MOREOBJS) + $(AUTOLOADEDOBJS) cleanjunk:: -rm -f *.c *.H diff -r 1b37daf6b557 -r 2c42532d4492 PCXReader.st --- a/PCXReader.st Fri Mar 29 04:43:40 1996 +0100 +++ b/PCXReader.st Sun Apr 07 02:40:40 1996 +0200 @@ -36,7 +36,7 @@ ! version - ^ '$Header: /cvs/stx/stx/libview2/PCXReader.st,v 1.10 1995-11-11 16:04:48 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/PCXReader.st,v 1.11 1996-04-07 00:40:40 cg Exp $' ! documentation @@ -205,11 +205,9 @@ ]. value := buffer at:bufferIndex. bufferIndex := bufferIndex + 1. - value notNil ifTrue:[ - idx2 := ((dstIndex + nByte) min:endIndex) - 1. - dataBytes from:dstIndex to:idx2 put:value. - dstIndex := dstIndex + nByte. - ] + idx2 := ((dstIndex + nByte) min:endIndex) - 1. + dataBytes from:dstIndex to:idx2 put:value. + dstIndex := dstIndex + nByte. ]. ]. rowIndex := endIndex.