Skip to content

Commit

Permalink
Build with I/O fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
linev committed Aug 2, 2024
1 parent 64f4bb7 commit a799bcf
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
15 changes: 10 additions & 5 deletions build/jsroot.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://root.cern/js/ v7.7.2
// https://root.cern/js/ v7.7.x
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
Expand All @@ -7,11 +7,11 @@ typeof define === 'function' && define.amd ? define(['exports'], factory) :

/** @summary version id
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
const version_id = '7.7.2',
const version_id = '7.7.x',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '19/06/2024',
version_date = '2/08/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down Expand Up @@ -76754,7 +76754,7 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
if (draw_colors && (colindx !== null))
item.style('fill', this._color_palette.getColor(colindx));
else if (draw_fill)
item.call('fill', this.createAttFill(gr).func);
item.call(this.createAttFill(gr).func);
else
item.style('fill', 'none');
if (draw_lines)
Expand Down Expand Up @@ -99565,7 +99565,7 @@ class TFile {
* @private */
async readKeys() {
// with the first readbuffer we read bigger amount to create header cache
return this.readBuffer([0, 1024]).then(blob => {
return this.readBuffer([0, 400]).then(blob => {
const buf = new TBuffer(blob, 0, this);
if (buf.substring(0, 4) !== 'root')
return Promise.reject(Error(`Not a ROOT file ${this.fURL}`));
Expand Down Expand Up @@ -99900,6 +99900,11 @@ function readMapElement(buf) {
}

const n = buf.ntoi4(), res = new Array(n);

// no extra data written for empty map
if (n === 0)
return res;

if (this.member_wise && (buf.remain() >= 6)) {
if (buf.ntoi2() === kStreamedMemberWise)
buf.shift(4); // skip checksum
Expand Down
4 changes: 4 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# JSROOT changelog

## Changes in 7.7.x
1. Fix - correctly handle in I/O empty std::map
2. Fix - reading of small (<1KB) ROOT files


## Changes in 7.7.2
1. Fix - hide empty title on the canvas
Expand Down
2 changes: 1 addition & 1 deletion modules/core.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const version_id = '7.7.x',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '19/06/2024',
version_date = '2/08/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down

0 comments on commit a799bcf

Please sign in to comment.