Patch for bbapm-0.0.1

[Jason Arias Willis]

Hey everyone,

 I saw that a short while ago someone asked about compilation problems
with bbapm-0.0.1.   I ran into the same troubles as well.    I did some
looking around and read that the alternate keywords like 'or' and 'not'
are part of the ISO C++ standard.  So, I went to Image.cc and changed
the variable name to something else and compiled.  I tried it out and
everything seems to be working okay now.   Hope this helps.

   Jason W. 

*** /home/jwillis/ProggyTarballs/temp/bbapm-0.0.1/Image.cc	Sun Aug 15 07:43:55 1999
--- ./Image.cc	Sat Jan 12 18:24:37 2002
***************
*** 224,236 ****
        return 0;
      }
  
    if (control->doDither()) {
!     short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
!     unsigned short *ort, *ogt, *obt;
!     
!     control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
  			      &ort, &ogt, &obt);
!     if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
  	(! ort) || (! ogt) || (! obt)) {
        fprintf(stderr,
  	      "BImage::renderXImage: error getting dither information\n");
--- 224,237 ----
        return 0;
      }
  
+ 
+ 
    if (control->doDither()) {
!     short er, eg, eb, *zor, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;    unsigned short *ort, *ogt, *obt;
!   
!     control->getDitherBuffers(width + 2, &zor, &og, &ob, &nor, &nog, &nob,
  			      &ort, &ogt, &obt);
!     if ((! zor) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
  	(! ort) || (! ogt) || (! obt)) {
        fprintf(stderr,
  	      "BImage::renderXImage: error getting dither information\n");
***************
*** 240,246 ****
      
      x = width;
  
!     por = or;
      pog = og;
      pob = ob;
  
--- 241,247 ----
      
      x = width;
  
!     por = zor;
      pog = og;
      pob = ob;
  
***************
*** 271,284 ****
        }
        
        for (x = 0; x < width; x++) {
! 	if (*(or + x) > 255) *(or + x) = 255;
! 	else if (*(or + x) < 0) *(or + x) = 0;
  	if (*(og + x) > 255) *(og + x) = 255;
  	else if (*(og + x) < 0) *(og + x) = 0;
  	if (*(ob + x) > 255) *(ob + x) = 255;
  	else if (*(ob + x) < 0) *(ob + x) = 0;
  	
! 	r = *(tr + *(or + x));
  	g = *(tg + *(og + x));
  	b = *(tb + *(ob + x));
  	
--- 272,285 ----
        }
        
        for (x = 0; x < width; x++) {
! 	if (*(zor + x) > 255) *(zor + x) = 255;
! 	else if (*(zor + x) < 0) *(zor + x) = 0;
  	if (*(og + x) > 255) *(og + x) = 255;
  	else if (*(og + x) < 0) *(og + x) = 0;
  	if (*(ob + x) > 255) *(ob + x) = 255;
  	else if (*(ob + x) < 0) *(ob + x) = 0;
  	
! 	r = *(tr + *(zor + x));
  	g = *(tg + *(og + x));
  	b = *(tb + *(ob + x));
  	
***************
*** 340,350 ****
  	  return 0;
  	}
  
! 	er = *(or + x) - *(ort + *(or + x));
  	eg = *(og + x) - *(ogt + *(og + x));
  	eb = *(ob + x) - *(obt + *(ob + x));
  	
! 	*(or + x + 1) += er;
  	*(og + x + 1) += eg;
  	*(ob + x + 1) += eb;
  	
--- 341,351 ----
  	  return 0;
  	}
  
! 	er = *(zor + x) - *(ort + *(zor + x));
  	eg = *(og + x) - *(ogt + *(og + x));
  	eb = *(ob + x) - *(obt + *(ob + x));
  	
! 	*(zor + x + 1) += er;
  	*(og + x + 1) += eg;
  	*(ob + x + 1) += eb;
  	
***************
*** 360,366 ****
        off += image->width;
        idata = (pd += image->bytes_per_line);
        
!       por = or; or = nor; nor = por;
        pog = og; og = nog; nog = pog;
        pob = ob; ob = nob; nob = pob;
      }
--- 361,367 ----
        off += image->width;
        idata = (pd += image->bytes_per_line);
        
!       por = zor; zor = nor; nor = por;
        pog = og; og = nog; nog = pog;
        pob = ob; ob = nob; nob = pob;
      }