diff -urNbB bbuname-0.2.orig/Image.cc bbuname-0.2/Image.cc --- bbuname-0.2.orig/Image.cc Mon May 3 23:24:53 1999 +++ bbuname-0.2/Image.cc Mon Feb 9 22:28:49 2004 @@ -225,12 +225,13 @@ } if (control->doDither()) { - short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob; + short er, eg, eb, *sor, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob; unsigned short *ort, *ogt, *obt; - control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob, + control->getDitherBuffers(width + 2, &sor, &og, &ob, &nor, &nog, &nob, &ort, &ogt, &obt); - if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) || + + if((! sor) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) || (! ort) || (! ogt) || (! obt)) { fprintf(stderr, "BImage::renderXImage: error getting dither information\n"); @@ -240,7 +241,7 @@ x = width; - por = or; + por = sor; pog = og; pob = ob; @@ -271,14 +272,14 @@ } for (x = 0; x < width; x++) { - if (*(or + x) > 255) *(or + x) = 255; - else if (*(or + x) < 0) *(or + x) = 0; + if (*(sor + x) > 255) *(sor + x) = 255; + else if (*(sor + x) < 0) *(sor + 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)); + r = *(tr + *(sor + x)); g = *(tg + *(og + x)); b = *(tb + *(ob + x)); @@ -340,11 +341,11 @@ return 0; } - er = *(or + x) - *(ort + *(or + x)); + er = *(sor + x) - *(ort + *(sor + x)); eg = *(og + x) - *(ogt + *(og + x)); eb = *(ob + x) - *(obt + *(ob + x)); - *(or + x + 1) += er; + *(sor + x + 1) += er; *(og + x + 1) += eg; *(ob + x + 1) += eb; @@ -360,7 +361,7 @@ off += image->width; idata = (pd += image->bytes_per_line); - por = or; or = nor; nor = por; + por = sor; sor = nor; nor = por; pog = og; og = nog; nog = pog; pob = ob; ob = nob; nob = pob; } diff -urNbB bbuname-0.2.orig/LinkedList.hh bbuname-0.2/LinkedList.hh --- bbuname-0.2.orig/LinkedList.hh Mon May 3 23:24:53 1999 +++ bbuname-0.2/LinkedList.hh Mon Feb 9 21:16:56 2004 @@ -63,7 +63,7 @@ int elements; __llist_node *_first, *_last; - friend __llist_iterator; + friend class __llist_iterator; protected: diff -urNbB bbuname-0.2.orig/bbuname.cc bbuname-0.2/bbuname.cc --- bbuname-0.2.orig/bbuname.cc Fri Sep 13 04:27:26 2002 +++ bbuname-0.2/bbuname.cc Mon Feb 9 21:24:55 2004 @@ -208,7 +208,7 @@ if (redraw) Redraw(); - exit; + exit(0); if ((tmp = time(NULL)) != -1) {