Merge branch 'develop' into libpng

This commit is contained in:
Paul Romano 2021-10-05 12:49:30 -05:00
commit 75b3d18446
29 changed files with 1405 additions and 150 deletions

View file

@ -30,9 +30,7 @@ namespace model {
extern std::unordered_map<int, int> plot_map; //!< map of plot ids to index
extern vector<Plot> plots; //!< Plot instance container
extern uint64_t
plotter_prn_seeds[N_STREAMS]; // Random number seeds used for plotter
extern int plotter_stream; // Stream index used by the plotter
extern uint64_t plotter_seed; // Stream index used by the plotter
} // namespace model
@ -281,6 +279,9 @@ void voxel_finalize(hid_t dspace, hid_t dset, hid_t memspace);
//! Read plot specifications from a plots.xml file
void read_plots_xml();
//! Clear memory
void free_memory_plot();
//! Create an image for a plot object
//! \param[in] plot object
void create_image(Plot const& pl);