Mercurial > hg > svcore
diff data/model/ImageModel.h @ 1112:4d7de68707c8 3.0-integration
Merge from branch simple-fft-model
author | Chris Cannam |
---|---|
date | Wed, 01 Jul 2015 18:31:28 +0100 |
parents | 1517d4c60e88 |
children | 48e9f538e6e9 |
line wrap: on
line diff
--- a/data/model/ImageModel.h Wed Jul 01 13:27:03 2015 +0100 +++ b/data/model/ImageModel.h Wed Jul 01 18:31:28 2015 +0100 @@ -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;