head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.54
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.52
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.50
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.46
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.36
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.34
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.32
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.30
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.28
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.26
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.24
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	buildlink2-base:1.2
	comdex-fall-1999:1.1;
locks; strict;
comment	@# @;


1.2
date	99.12.12.00.08.51;	author mjl;	state dead;
branches;
next	1.1;

1.1
date	99.09.13.03.33.35;	author simonb;	state Exp;
branches;
next	;


desc
@@


1.2
log
@*** empty log message ***
@
text
@$NetBSD: patch-aj,v 1.1 1999/09/13 03:33:35 simonb Exp $

--- l3bitstream.c.orig	Sat Jul 24 07:50:33 1999
+++ l3bitstream.c	Mon Sep 13 12:53:24 1999
@@@@ -160,8 +160,8 @@@@
  /*	BF_FlushBitstream( frameData, frameResults ); */
 }
 
-static unsigned slen1_tab[16] = { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 };
-static unsigned slen2_tab[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 };
+static unsigned int slen1_tab[16] = { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 };
+static unsigned int slen2_tab[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 };
 
 static void encodeMainData( int l3_enc[2][2][576],
 														III_side_info_t  *si,
@@@@ -185,8 +185,8 @@@@
 	  {
 			BitHolder **pph = &scaleFactorsPH[gr][ch];		
 			gr_info *gi = &(si->gr[gr].ch[ch].tt);
-			unsigned slen1 = slen1_tab[ gi->scalefac_compress ];
-			unsigned slen2 = slen2_tab[ gi->scalefac_compress ];
+			unsigned int slen1 = slen1_tab[ gi->scalefac_compress ];
+			unsigned int slen2 = slen2_tab[ gi->scalefac_compress ];
 			int *ix = &l3_enc[gr][ch][0];
 
 			if ( (gi->window_switching_flag == 1) && (gi->block_type == 2) )
@@@@ -349,7 +349,7 @@@@
      */
   int bytesToSend = lengthInBits / 8;
   int remainingBits = lengthInBits % 8;
-  unsigned wrd;
+  unsigned int wrd;
   int i;
 
   userFrameDataPH->nrEntries = 0;
@@@@ -436,7 +436,7 @@@@
 
 	    for ( sfb = 0; sfb < 13; sfb++ )
 	    {
-				unsigned tableindex = 100;
+				unsigned int tableindex = 100;
 				start = scalefac[ sfb ];
 				end   = scalefac[ sfb+1 ];
 
@@@@ -464,7 +464,7 @@@@
 		else if ( gi->mixed_block_flag && gi->block_type == 2 )
 	  {  /* Mixed blocks long, short */
 			int sfb, window, line, start, end;
-			unsigned tableindex;
+			unsigned int tableindex;
 			I192_3 *ix_s;
 			int *scalefac = &sfBandIndex[fr_ps->header->sampling_frequency].s[0];
 		
@@@@ -507,7 +507,7 @@@@
     else
     { /* Long blocks */
 			int *scalefac = &sfBandIndex[fr_ps->header->sampling_frequency].l[0];
-			unsigned scalefac_index = 100;
+			unsigned int scalefac_index = 100;
 		
 			if ( gi->mixed_block_flag )
 			{
@@@@ -523,7 +523,7 @@@@
 			}
 			for ( i = 0; i < bigvalues; i += 2 )
 			{
-		    unsigned tableindex = 100;
+		    unsigned int tableindex = 100;
 		    /* get table pointer */
 		    if ( i < region1Start )
 		    {
@@@@ -647,7 +647,7 @@@@
   */
 int HuffmanCode( int table_select, int x, int y, unsigned int *code, unsigned int *ext, int *cbits, int *xbits )
 {
-  unsigned signx, signy, linbitsx, linbitsy, linbits, xlen, ylen, idx;
+  unsigned int signx, signy, linbitsx, linbitsy, linbits, xlen, ylen, idx;
   struct huffcodetab *h;
 
   *cbits = 0;
@


1.1
log
@Use the source-code version of bladeenc (0.82-stable2), which should
work on all architectures.  Tested on pmax, i386 and alpha (no
big-endian machines!) and gives identical results, although not
identical to the binary-only 0.76.  If there's any big-endian people
who want to test this, please let me know.

Lots of patches because 64-bit longs just "Don't Work(tm)" - just use
ints everywhere.  I'm in communication with the author on how to fix
this at his end.
@
text
@d1 1
a1 1
$NetBSD$
@