Skip to content

Fix compilation errors on Windows #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
couet merged 1 commit into from
Oct 3, 2017
Merged

Fix compilation errors on Windows #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions graf2d/gpad/src/TRatioPlot.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,11 @@ Int_t TRatioPlot::BuildLowerPlot()
std::vector<double> ci1;
std::vector<double> ci2;

Double_t x_arr[fH1->GetNbinsX()];
Double_t *x_arr = new Double_t[fH1->GetNbinsX()];
std::fill_n(x_arr, fH1->GetNbinsX(), 0);
Double_t ci_arr1[fH1->GetNbinsX()];
Double_t *ci_arr1 = new Double_t[fH1->GetNbinsX()];
std::fill_n(ci_arr1, fH1->GetNbinsX(), 0);
Double_t ci_arr2[fH1->GetNbinsX()];
Double_t *ci_arr2 = new Double_t[fH1->GetNbinsX()];
std::fill_n(ci_arr2, fH1->GetNbinsX(), 0);
for (Int_t i=0; i<fH1->GetNbinsX();++i) {
x_arr[i] = fH1->GetBinCenter(i+1);
Expand Down Expand Up @@ -1083,7 +1083,9 @@ Int_t TRatioPlot::BuildLowerPlot()
}

}

delete [] x_arr;
delete [] ci_arr1;
delete [] ci_arr2;
} else if (fMode == TRatioPlot::CalculationMode::kDivideHist){
SetGridlines(divideGridlines, 3);

Expand Down
4 changes: 2 additions & 2 deletions graf2d/graf/inc/TCandle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ class TCandle : public TAttLine, public TAttFill, public TAttMarker {
Double_t GetQ3() const {return fBoxDown;}
Bool_t IsHorizontal() {return (IsOption(kHorizontal)); }
Bool_t IsVertical() {return (!IsOption(kHorizontal)); }
Bool_t IsCandleScaled() {return fScaledCandle; }
Bool_t IsViolinScaled() {return fScaledViolin; }
Bool_t IsCandleScaled();
Bool_t IsViolinScaled();

void SetOption(CandleOption opt) { fOption = opt; }
void SetLog(int x, int y, int z) { fLogX = x; fLogY = y; fLogZ = z;}
Expand Down
10 changes: 10 additions & 0 deletions graf2d/graf/src/TCandle.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,16 @@ TCandle::~TCandle() {
if (fIsRaw && fProj) delete fProj;
}

Bool_t TCandle::IsCandleScaled()
{
return fScaledCandle;
}

Bool_t TCandle::IsViolinScaled()
{
return fScaledViolin;
}

////////////////////////////////////////////////////////////////////////////////
/// Static function to set fWhiskerRange, by setting whisker-range, one can force
/// the whiskers to cover the fraction of the distribution.
Expand Down
6 changes: 3 additions & 3 deletions graf2d/mathtext/src/fontembedps.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ namespace mathtext {
bswap_32(segment_header.length);
#endif // LITTLE_ENDIAN
char *buffer = new char[segment_header.length];
char *match = "/FontName";
char *fname;

memcpy(buffer, &font_data[offset],
Expand All @@ -275,9 +276,8 @@ namespace mathtext {
buffer[segment_header.length - 1] = '\n';
}
ret.append(buffer, segment_header.length);

fname = (char*)memmem(buffer, segment_header.length,
"/FontName", 9);
fname = std::search(buffer, buffer+segment_header.length,
match, match+9);
if (fname) {
fname += 9;
while (fname < buffer + segment_header.length &&
Expand Down