head 1.2; access; symbols pkgsrc-2026Q2:1.2.0.184 pkgsrc-2026Q2-base:1.2 pkgsrc-2026Q1:1.2.0.182 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.180 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.178 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.176 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.174 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.172 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.170 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.168 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.166 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.164 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.162 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.160 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.158 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.156 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.154 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.152 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.150 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.148 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.146 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.144 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.142 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.140 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.138 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.134 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.114 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.136 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.132 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.130 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.128 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.126 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.124 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.122 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.120 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.118 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.116 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.112 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.110 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.108 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.106 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.104 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.102 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.100 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.98 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.96 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.94 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.92 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.90 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.88 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.86 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.84 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.82 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.80 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.78 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.76 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.74 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.72 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.70 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.68 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.66 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.64 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.62 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.60 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.58 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.56 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.54 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-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 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.4 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2003.12.03.17.41.21; author gson; state Exp; branches; next 1.1; 1.1 date 2002.09.07.20.22.54; author jschauma; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.09.07.20.22.54; author jschauma; state Exp; branches; next ; desc @@ 1.2 log @bbapm did not build on -current because g++ now treats "or" as a reserved word. Also added a missing #include . @ text @$NetBSD$ --- Image.cc.orig 1999-08-15 07:43:55.000000000 -0700 +++ Image.cc @@@@ -50,6 +50,17 @@@@ BImage::BImage(BImageControl *c, unsigned int w, unsigned int h) { control = c; + colors = NULL; + red = NULL; + green = NULL; + blue = NULL; + tr = NULL; + tg = NULL; + tb = NULL; + + from.allocated = 0; + to.allocated = 0; + width = ((signed) w > 0) ? w : 1; height = ((signed) h > 0) ? h : 1; @@@@ -225,12 +236,12 @@@@ } if (control->doDither()) { - short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob; + 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, + control->getDitherBuffers(width + 2, &oR, &og, &ob, &nor, &nog, &nob, &ort, &ogt, &obt); - if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) || + if ((! oR) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) || (! ort) || (! ogt) || (! obt)) { fprintf(stderr, "BImage::renderXImage: error getting dither information\n"); @@@@ -240,7 +251,7 @@@@ x = width; - por = or; + por = oR; pog = og; pob = ob; @@@@ -271,14 +282,14 @@@@ } for (x = 0; x < width; x++) { - if (*(or + x) > 255) *(or + x) = 255; - else if (*(or + x) < 0) *(or + x) = 0; + 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)); + r = *(tr + *(oR + x)); g = *(tg + *(og + x)); b = *(tb + *(ob + x)); @@@@ -340,11 +351,11 @@@@ return 0; } - er = *(or + x) - *(ort + *(or + x)); + er = *(oR + x) - *(ort + *(oR + x)); eg = *(og + x) - *(ogt + *(og + x)); eb = *(ob + x) - *(obt + *(ob + x)); - *(or + x + 1) += er; + *(oR + x + 1) += er; *(og + x + 1) += eg; *(ob + x + 1) += eb; @@@@ -360,7 +371,7 @@@@ off += image->width; idata = (pd += image->bytes_per_line); - por = or; or = nor; nor = por; + por = oR; oR = nor; nor = por; pog = og; og = nog; nog = pog; pob = ob; ob = nob; nob = pob; } @@@@ -843,7 +854,14 @@@@ window = blackbox->getRootWindow(); screen_number = blackbox->getScreenNumber(); - colors = 0; + colors = NULL; + red_err = NULL; + green_err = NULL; + blue_err = NULL; + next_red_err = NULL; + next_green_err = NULL; + next_blue_err = NULL; + cache = NULL; colors_per_channel = ncolors = 0; int count; @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- Image.cc.orig Sun Aug 15 07:43:55 1999 +++ Image.cc Sat Aug 4 20:52:40 2001 d23 66 @ 1.1.1.1 log @Initial import of x11/bbapm into pkgsrc. bapm is an APM meter for Blackbox, which shows the battery status of your laptop in a decorated window, simulating the look of the Blackbox toolbar. bbapm is based on bbsload. This package is based on the FreeBSD port and the OpenBSD patches posted to http://bbtools.windsofstorm.net written by Michael Henson (mike at axl dot net). Various changes by yours truly. @ text @@