@@ -14,7 +14,7 @@ const version_id = '7.11.x',
1414
1515/** @summary version date
1616 * @desc Release date in format day/month/year like '14/04/2022' */
17- version_date = '1/06 /2026',
17+ version_date = '23/07 /2026',
1818
1919/** @summary version id and date
2020 * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -93172,9 +93172,10 @@ class TCanvasPainter extends TPadPainter {
9317293172
9317393173 this.forEachPainterInPad(pp => {
9317493174 const pad = pp.getRootPad(true);
93175- if (pp.getNumPainters() && pad?.fPrimitives && !pad.fPrimitives.arr.length) {
93175+ if (pp.getNumPainters() && pad && !pad.fPrimitives?.arr.length) {
93176+ prims.push(pad, pad.fPrimitives); // remember old value
9317693177 // create list of primitives when missing
93177- prims.push( pad.fPrimitives);
93178+ pad.fPrimitives = create$1(clTList );
9317893179 pp.forEachPainterInPad(p => {
9317993180 // ignore all secondary painters
9318093181 if (p.isSecondary())
@@ -93233,7 +93234,8 @@ class TCanvasPainter extends TPadPainter {
9323393234 e.hist.fMaximum = e.max;
9323493235 });
9323593236
93236- prims.forEach(lst => lst.Clear());
93237+ for (let k = 0; k < prims.length; k += 2)
93238+ prims[k].fPrimitives = prims[k + 1];
9323793239
9323893240 return res;
9323993241 }
@@ -104609,10 +104611,10 @@ function getTF1Value(func, x, skip_eval = undefined) {
104609104611
104610104612 if (func.evalPar && !iserr) {
104611104613 try {
104612- return func.evalPar(x);
104614+ const res = func.evalPar(x);
104615+ if (Number.isFinite(res))
104616+ return res;
104613104617 } catch {
104614- /* eslint-disable-next-line no-useless-assignment */
104615- iserr = true;
104616104618 }
104617104619 }
104618104620
@@ -170614,7 +170616,7 @@ function readStyleFromURL(url) {
170614170616
170615170617 const b = d.get('batch');
170616170618 if (b !== undefined) {
170617- setBatchMode(d !== 'off');
170619+ setBatchMode(b !== 'off');
170618170620 if (b === 'png')
170619170621 internals.batch_png = true;
170620170622 }
@@ -175401,12 +175403,14 @@ class TF1Painter extends TH1Painter$2 {
175401175403 let y = 0;
175402175404 try {
175403175405 y = tf1.evalPar(x);
175406+ if (!Number.isFinite(y))
175407+ iserror = true;
175404175408 } catch {
175405175409 iserror = true;
175406175410 }
175407175411
175408175412 if (!iserror)
175409- hist.setBinContent(n + 1, Number.isFinite(y) ? y : 0 );
175413+ hist.setBinContent(n + 1, y );
175410175414 }
175411175415
175412175416 if (iserror)
@@ -177194,12 +177198,14 @@ class TF2Painter extends TH2Painter {
177194177198
177195177199 try {
177196177200 z = func.evalPar(x, y);
177201+ if (!Number.isFinite(z))
177202+ iserror = true;
177197177203 } catch {
177198177204 iserror = true;
177199177205 }
177200177206
177201177207 if (!iserror)
177202- hist.setBinContent(hist.getBin(i + 1, j + 1), Number.isFinite(z) ? z : 0 );
177208+ hist.setBinContent(hist.getBin(i + 1, j + 1), z );
177203177209 }
177204177210 }
177205177211
@@ -177559,10 +177565,16 @@ class TF3Painter extends TH2Painter {
177559177565 let z = 0;
177560177566
177561177567 try {
177562- for (let k = 0; k < npz; ++k)
177568+ for (let k = 0; k < npz; ++k) {
177563177569 arrv[k] = func.evalPar(x, y, arrz[k]);
177570+ if (!Number.isFinite(arrv[k])) {
177571+ iserror = true;
177572+ break;
177573+ }
177574+ }
177564177575
177565- z = findZValue(arrz, arrv);
177576+ if (!iserror)
177577+ z = findZValue(arrz, arrv);
177566177578 } catch {
177567177579 iserror = true;
177568177580 }
0 commit comments