Merge zoom spinbox feature on master. Fix bug in the zoom spinbox feature.

This commit is contained in:
Luis Lucas committed 2014-06-27 02:19:19 +01:00
commit 7e882c2e4f
4 files changed
+50 -4

No files matched your search

+2 -1
View File
@@ -138,9 +138,10 @@ public:
static Pixel ConvertPixel( Pixel, Int );
#ifdef USE_OPENCV
cv::Mat getCvMat();
Void copyFrom( cv::Mat* );
#endif
UInt getWidth() const
{