diff options
| -rw-r--r-- | Programmer/iff_lib.fd | 8 | ||||
| -rw-r--r-- | Source/CompressBlock.S | 12 | ||||
| -rw-r--r-- | Source/DecodePic.S | 7 | ||||
| -rw-r--r-- | Source/DecompressBlock.S | 7 | ||||
| -rw-r--r-- | Source/FindChunk.S | 7 | ||||
| -rw-r--r-- | Source/GetBMHD.S | 7 | ||||
| -rw-r--r-- | Source/GetColorTab.S | 7 | ||||
| -rw-r--r-- | Source/GetViewModes.S | 43 | ||||
| -rw-r--r-- | Source/IFFError.S | 7 | ||||
| -rw-r--r-- | Source/ModifyFrame.S | 7 | ||||
| -rw-r--r-- | Source/SaveBitMap.S | 7 | ||||
| -rw-r--r-- | Source/SaveClip.S | 7 | ||||
| -rw-r--r-- | Source/WriteChunkBytes.S | 7 |
13 files changed, 62 insertions, 71 deletions
diff --git a/Programmer/iff_lib.fd b/Programmer/iff_lib.fd index 070c6c9..edba2db 100644 --- a/Programmer/iff_lib.fd +++ b/Programmer/iff_lib.fd @@ -1,11 +1,11 @@ ** -** $Id: iff_lib.fd,v 21.1 92/05/15 03:42:08 chris Exp $ -** $Revision: 21.1 $ +** $Id: iff_lib.fd,v 22.1 92/06/02 23:52:12 chris Exp $ +** $Revision: 22.1 $ ** ** $Filename: iff_lib.fd $ ** $Author: Christian A. Weber $ -** $Release: 22.1 $ -** $Date: 92/05/15 03:42:08 $ +** $Release: 23.2 $ +** $Date: 92/06/02 23:52:12 $ ** ** fd file for iff.library ** diff --git a/Source/CompressBlock.S b/Source/CompressBlock.S index 502e32d..52dab5b 100644 --- a/Source/CompressBlock.S +++ b/Source/CompressBlock.S @@ -1,11 +1,10 @@ ** -** $Id: CompressBlock.S,v 21.2 92/05/17 03:29:11 chris Exp $ -** $Revision: 21.2 $ +** $Id: CompressBlock.S,v 21.3 92/05/18 02:20:39 chris Exp $ +** $Revision: 21.3 $ ** ** $Filename: CompressBlock.S $ ** $Author: chris $ -** $Release: $ -** $Date: 92/05/17 03:29:11 $ +** $Date: 92/05/18 02:20:39 $ ** ** iff.library/IFFL_CompressBlock ** @@ -59,6 +58,11 @@ * IFFL_IFFError() returns IFFL_ERROR_BADCOMPRESSION if you ask for * an unsupported compression mode. * +* BUGS +* In IFFL_COMPR_BYTERUN1, if the compressed data would become longer, +* the buffer will be overwritten, and no error is returned. So be +* sure to supply a destination buffer which is big enough! +* * SEE ALSO * IFFL_DecompressBlock() * diff --git a/Source/DecodePic.S b/Source/DecodePic.S index e238047..67f4cd7 100644 --- a/Source/DecodePic.S +++ b/Source/DecodePic.S @@ -1,11 +1,10 @@ ** -** $Id: DecodePic.S,v 21.2 92/05/18 02:16:02 chris Exp $ -** $Revision: 21.2 $ +** $Id: DecodePic.S,v 21.3 92/10/12 20:40:00 chris Exp $ +** $Revision: 21.3 $ ** ** $Filename: DecodePic.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/18 02:16:02 $ +** $Date: 92/10/12 20:40:00 $ ** ** iff.library/IFFL_DecodePic ** diff --git a/Source/DecompressBlock.S b/Source/DecompressBlock.S index 9a50da0..b3c2764 100644 --- a/Source/DecompressBlock.S +++ b/Source/DecompressBlock.S @@ -1,11 +1,10 @@ ** -** $Id: DecompressBlock.S,v 21.1 92/05/15 03:23:32 chris Exp $ -** $Revision: 21.1 $ +** $Id: DecompressBlock.S,v 21.2 92/05/17 03:27:44 chris Exp $ +** $Revision: 21.2 $ ** ** $Filename: DecompressBlock.S $ ** $Author: chris $ -** $Release: $ -** $Date: 92/05/15 03:23:32 $ +** $Date: 92/05/17 03:27:44 $ ** ** iff.library/IFFL_DecompressBlock ** diff --git a/Source/FindChunk.S b/Source/FindChunk.S index 0b065a0..dbd0f64 100644 --- a/Source/FindChunk.S +++ b/Source/FindChunk.S @@ -1,11 +1,10 @@ ** -** $Id: FindChunk.S,v 1.1 92/05/12 22:26:33 chris Exp $ -** $Revision: 1.1 $ +** $Id: FindChunk.S,v 21.1 92/05/15 03:21:10 chris Exp $ +** $Revision: 21.1 $ ** ** $Filename: FindChunk.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/12 22:26:33 $ +** $Date: 92/05/15 03:21:10 $ ** ** iff.library/IFFL_FindChunk ** diff --git a/Source/GetBMHD.S b/Source/GetBMHD.S index af18de4..4ec0f86 100644 --- a/Source/GetBMHD.S +++ b/Source/GetBMHD.S @@ -1,11 +1,10 @@ ** -** $Id: GetBMHD.S,v 1.1 92/05/12 22:26:34 chris Exp $ -** $Revision: 1.1 $ +** $Id: GetBMHD.S,v 21.1 92/05/15 03:21:31 chris Exp $ +** $Revision: 21.1 $ ** ** $Filename: GetBMHD.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/12 22:26:34 $ +** $Date: 92/05/15 03:21:31 $ ** ** iff.library/IFFL_GetBMHD ** diff --git a/Source/GetColorTab.S b/Source/GetColorTab.S index 7512653..18f2aad 100644 --- a/Source/GetColorTab.S +++ b/Source/GetColorTab.S @@ -1,11 +1,10 @@ ** -** $Id: GetColorTab.S,v 1.1 92/05/12 22:26:12 chris Exp $ -** $Revision: 1.1 $ +** $Id: GetColorTab.S,v 21.1 92/05/15 03:22:16 chris Exp $ +** $Revision: 21.1 $ ** ** $Filename: GetColorTab.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/12 22:26:12 $ +** $Date: 92/05/15 03:22:16 $ ** ** iff.library/IFFL_GetColorTab ** diff --git a/Source/GetViewModes.S b/Source/GetViewModes.S index ff98a82..c59900a 100644 --- a/Source/GetViewModes.S +++ b/Source/GetViewModes.S @@ -1,11 +1,10 @@ ** -** $Id: GetViewModes.S,v 21.1 92/05/15 03:22:48 chris Exp $ -** $Revision: 21.1 $ +** $Id: GetViewModes.S,v 21.2 92/05/18 02:18:15 chris Exp $ +** $Revision: 21.2 $ ** ** $Filename: GetViewModes.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/15 03:22:48 $ +** $Date: 92/05/18 02:18:15 $ ** ** iff.library/IFFL_GetViewModes ** @@ -20,6 +19,7 @@ IDNT IFFL_GetViewModes SECTION text,CODE + INCLUDE "graphics/view.i" INCLUDE "IffLib.i" XREF FindChunkFunc,GetBMHDFunc @@ -67,16 +67,8 @@ * ***************************************************************************** - *** Flags, die nur in graphics/view.h aber nicht .i sind (!) -HAM: EQU $0800 -SPRITES: EQU $4000 -VP_HIDE: EQU $2000 -GENLOCK_AUDIO: EQU $0100 -GENLOCK_VIDEO: EQU $0002 -EXTRA_HALFBRITE: EQU $0080 - -MODESMASK: EQU ~(SPRITES|VP_HIDE|GENLOCK_AUDIO|GENLOCK_VIDEO) +MODESMASK EQU ~(V_SPRITES|V_VP_HIDE|GENLOCK_AUDIO|GENLOCK_VIDEO) GetViewModesFunc: move.l a2,-(SP) @@ -84,24 +76,28 @@ GetViewModesFunc: movea.l a1,a2 ; A2 : IFFFile move.l #'CAMG',d0 bsr FindChunkFunc ; setzt Z-Flag wenn not found - beq.s CalcEm ; not found ---> Berechnen + beq.b CalcEm ; not found ---> Berechnen movea.l d0,a0 ; Zeiger auf CAMG.... move.l 8(a0),d0 ; ViewModes + tst.w 8(a0) ; Oberes WORD == 0 ? + bne.b 1$ ; Nein ---> Nix ausmaskieren andi.l #MODESMASK,d0 ; Verbotene Bits ausmaskieren - bra.s Ende ; ---> +1$: bra.b Ende ; ---> - *** ViewModes aus BMHD berechnen, 0 falls kein CAMG + *** ViewModes aus BMHD berechnen, 0 falls kein BMHD CalcEm: movea.l a2,a1 ; IFFFile bsr GetBMHDFunc ; BitMapHeader suchen ;; tst.l d0 ; nicht gefunden? - beq.s Ende ; dann 0 zurückgeben + beq.b Ende ; dann 0 zurückgeben movea.l d0,a0 ; A0 : BMHD-Struktur - bsr.s CalcViewModes ; ViewModes nach D0 + bsr.b CalcViewModes ; ViewModes nach D0 + IFD OLDBADHAMPICTURES cmpi.b #6,bmh_nPlanes(a0) ; 6 Bitplanes ? - blt.s Ende ; nein ---> + blt.b Ende ; nein ---> bset #11,d0 ; ViewModes |= HAM + ENDC Ende: movea.l (SP)+,a2 rts @@ -130,7 +126,8 @@ Ende: * viewmodes - ULONG containing the view modes (LACE, HIRES) * * BUGS -* too many to mention +* Knows nothing about Monitor IDs or new View modes like SUPERHIRES +* or HAM8. You should not use this function in new code. * * SEE ALSO * IFFL_GetViewModes(), IFFL_SaveClip() @@ -140,14 +137,14 @@ Ende: CalcViewModes: moveq.l #0,d0 ; D0 : ViewModes cmpi.b #4,bmh_nPlanes(a0) ; mehr als 4 Planes ? - bgt.s NotHiRes ; ja ---> nicht HiRes + bgt.b NotHiRes ; ja ---> nicht HiRes cmpi.w #400,bmh_Width(a0) ; Bildbreite > 400 ? - ble.s NotHiRes ; nein ---> + ble.b NotHiRes ; nein ---> bset #15,d0 ; ViewModes |= HiRes NotHiRes: cmpi.w #320,bmh_Height(a0) ; Bildhöhe > 320 ? - blt.s NotInterlace ; nein ---> + blt.b NotInterlace ; nein ---> bset #2,d0 ; ViewModes |= Interlace NotInterlace: rts diff --git a/Source/IFFError.S b/Source/IFFError.S index 28936a0..a4d51b9 100644 --- a/Source/IFFError.S +++ b/Source/IFFError.S @@ -1,11 +1,10 @@ ** -** $Id: IFFError.S,v 1.1 92/05/12 22:26:38 chris Exp $ -** $Revision: 1.1 $ +** $Id: IFFError.S,v 21.1 92/05/15 03:21:40 chris Exp $ +** $Revision: 21.1 $ ** ** $Filename: IFFError.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/12 22:26:38 $ +** $Date: 92/05/15 03:21:40 $ ** ** iff.library/IFFL_IFFError ** diff --git a/Source/ModifyFrame.S b/Source/ModifyFrame.S index d29f300..228ecb4 100644 --- a/Source/ModifyFrame.S +++ b/Source/ModifyFrame.S @@ -1,11 +1,10 @@ ** -** $Id: ModifyFrame.S,v 1.1 92/05/12 22:26:40 chris Exp $ -** $Revision: 1.1 $ +** $Id: ModifyFrame.S,v 21.1 92/05/15 03:21:45 chris Exp $ +** $Revision: 21.1 $ ** ** $Filename: ModifyFrame.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/12 22:26:40 $ +** $Date: 92/05/15 03:21:45 $ ** ** iff.library/IFFL_ModifyFrame ** diff --git a/Source/SaveBitMap.S b/Source/SaveBitMap.S index 36574b4..ee71892 100644 --- a/Source/SaveBitMap.S +++ b/Source/SaveBitMap.S @@ -1,11 +1,10 @@ ** -** $Id: SaveBitMap.S,v 21.1 92/05/15 03:23:02 chris Exp $ -** $Revision: 21.1 $ +** $Id: SaveBitMap.S,v 21.2 92/05/18 02:15:32 chris Exp $ +** $Revision: 21.2 $ ** ** $Filename: SaveBitMap.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/15 03:23:02 $ +** $Date: 92/05/18 02:15:32 $ ** ** iff.library/IFFL_SaveBitMap ** diff --git a/Source/SaveClip.S b/Source/SaveClip.S index 6fb8fb5..9cada73 100644 --- a/Source/SaveClip.S +++ b/Source/SaveClip.S @@ -1,11 +1,10 @@ ** -** $Id: SaveClip.S,v 21.2 92/05/18 02:16:29 chris Exp $ -** $Revision: 21.2 $ +** $Id: SaveClip.S,v 21.3 92/06/21 00:18:30 chris Exp $ +** $Revision: 21.3 $ ** ** $Filename: SaveClip.S $ ** $Author: chris $ -** $Release: 19.1 $ -** $Date: 92/05/18 02:16:29 $ +** $Date: 92/06/21 00:18:30 $ ** ** iff.library/IFFL_SaveClip ** diff --git a/Source/WriteChunkBytes.S b/Source/WriteChunkBytes.S index 1de3168..5cfa7df 100644 --- a/Source/WriteChunkBytes.S +++ b/Source/WriteChunkBytes.S @@ -1,11 +1,10 @@ ** -** $Id: WriteChunkBytes.S,v 21.1 92/05/15 03:24:59 chris Exp $ -** $Revision: 21.1 $ +** $Id: WriteChunkBytes.S,v 21.2 92/05/18 02:19:53 chris Exp $ +** $Revision: 21.2 $ ** ** $Filename: WriteChunkBytes.S $ ** $Author: chris $ -** $Release: 21.1 $ -** $Date: 92/05/15 03:24:59 $ +** $Date: 92/05/18 02:19:53 $ ** ** iff.library/IFFL_WriteChunkBytes ** |