Mercurial > hg > svcore
diff data/model/ImageModel.h @ 1111:457a1a619c5f simple-fft-model
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 07 Jan 2015 17:42:21 +0000 |
parents | 1517d4c60e88 |
children | 48e9f538e6e9 |
line wrap: on
line diff
--- a/data/model/ImageModel.h Tue Jun 30 10:26:23 2015 +0100 +++ b/data/model/ImageModel.h Wed Jan 07 17:42:21 2015 +0000 @@ -31,13 +31,13 @@ struct ImagePoint : public XmlExportable { public: - ImagePoint(long _frame) : frame(_frame) { } - ImagePoint(long _frame, QString _image, QString _label) : + ImagePoint(sv_frame_t _frame) : frame(_frame) { } + ImagePoint(sv_frame_t _frame, QString _image, QString _label) : frame(_frame), image(_image), label(_label) { } int getDimensions() const { return 1; } - long frame; + sv_frame_t frame; QString image; QString label;