comparison data/model/ImageModel.h @ 1110:1517d4c60e88

Fix a number of warnings in the 32-bit build
author Chris Cannam
date Wed, 01 Jul 2015 15:53:54 +0100
parents 57633d605547
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1088:5fab8e4f5f19 1110:1517d4c60e88
29 */ 29 */
30 30
31 struct ImagePoint : public XmlExportable 31 struct ImagePoint : public XmlExportable
32 { 32 {
33 public: 33 public:
34 ImagePoint(long _frame) : frame(_frame) { } 34 ImagePoint(sv_frame_t _frame) : frame(_frame) { }
35 ImagePoint(long _frame, QString _image, QString _label) : 35 ImagePoint(sv_frame_t _frame, QString _image, QString _label) :
36 frame(_frame), image(_image), label(_label) { } 36 frame(_frame), image(_image), label(_label) { }
37 37
38 int getDimensions() const { return 1; } 38 int getDimensions() const { return 1; }
39 39
40 long frame; 40 sv_frame_t frame;
41 QString image; 41 QString image;
42 QString label; 42 QString label;
43 43
44 QString getLabel() const { return label; } 44 QString getLabel() const { return label; }
45 45