diff --git a/nonisotropic.cpp b/nonisotropic.cpp index 3bbc0e36..793e763d 100644 --- a/nonisotropic.cpp +++ b/nonisotropic.cpp @@ -88,11 +88,11 @@ EX namespace sn { FILE *f = fopen(fname.c_str(), "rb"); if(!f) f = fopen((rsrcdir + fname).c_str(), "rb"); if(!f) { addMessage(XLAT("geodesic table missing")); pmodel = mdPerspective; return; } - ignore(fread(&PRECX, 4, 1, f)); - ignore(fread(&PRECY, 4, 1, f)); - ignore(fread(&PRECZ, 4, 1, f)); + hr::ignore(fread(&PRECX, 4, 1, f)); + hr::ignore(fread(&PRECY, 4, 1, f)); + hr::ignore(fread(&PRECZ, 4, 1, f)); tab.resize(PRECX * PRECY * PRECZ); - ignore(fread(&tab[0], sizeof(compressed_point) * PRECX * PRECY * PRECZ, 1, f)); + hr::ignore(fread(&tab[0], sizeof(compressed_point) * PRECX * PRECY * PRECZ, 1, f)); fclose(f); loaded = true; } diff --git a/rogueviz/presentation.cpp b/rogueviz/presentation.cpp index e18aff78..11e4ef21 100644 --- a/rogueviz/presentation.cpp +++ b/rogueviz/presentation.cpp @@ -160,7 +160,7 @@ string gen_latex(presmode mode, string s, int res) { string filename = format("latex-cache/%08X.png", hash); if(mode == pmStartAll) { if(!file_exists(filename)) { - system("mkdir latex-cache"); + hr::ignore(system("mkdir latex-cache")); FILE *f = fopen("latex-cache/rogueviz-latex.tex", "w"); fprintf(f, "\\documentclass[border=2pt]{standalone}\n" @@ -172,9 +172,9 @@ string gen_latex(presmode mode, string s, int res) { "\\end{varwidth}\n" "\\end{document}\n", s.c_str()); fclose(f); - system("cd latex-cache; pdflatex rogueviz-latex.tex"); + hr::ignore(system("cd latex-cache; pdflatex rogueviz-latex.tex")); string pngline = "cd latex-cache; pdftopng -r " + its(res) + " rogueviz-latex.pdf t"; - system(pngline.c_str()); + hr::ignore(system(pngline.c_str())); rename("latex-cache/t-000001.png", filename.c_str()); } } diff --git a/rogueviz/som/analyzer.cpp b/rogueviz/som/analyzer.cpp index 41dcf7f1..e2dacec4 100644 --- a/rogueviz/som/analyzer.cpp +++ b/rogueviz/som/analyzer.cpp @@ -36,13 +36,13 @@ void load_maniset(maniset& m, int scale) { m.names.push_back(buf); auto& md = m.mdata[buf]; int N, M; - fscanf(f, "%d%d", &N, &M); + hr::ignore(fscanf(f, "%d%d", &N, &M)); println(hlog, "reading ", buf, " of size ", N, " and ", M, " edges"); md.size = N; auto& ed = md.edges; for(int i=0; i