diff options
| -rwxr-xr-x | rotord/src/rotor.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 62dfb39..c42460c 100755 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -13,7 +13,7 @@ TODO - put the boilerplate code for checking inputs into the base class, finally http://stackoverflow.com/questions/5261658/how-to-seek-in-ffmpeg-c-c -300713 +300713 trying to use opencv video loader for seeking not so good - conflicts with included libav - seems to be incorrectly loaded @@ -1177,7 +1177,7 @@ namespace Rotor { cv::Mat rot_mat(2,3,CV_32FC1); cv::Mat trans_mat(2,3,CV_32FC1); - + Image inter; inter.setup(other->w,other->h); // Compute matrix by creating triangle and transforming @@ -1194,7 +1194,7 @@ namespace Rotor { } trans_mat=getAffineTransform( srcTri, dstTri ); warpAffine( other->rgb, inter.rgb, trans_mat, inter.rgb.size(), cv::INTER_LINEAR, cv::BORDER_WRAP); - + // Compute rotation matrix // @@ -1228,6 +1228,7 @@ namespace Rotor { Alpha_merge(){image=nullptr;}; Alpha_merge(map<string,string> &settings) { base_settings(settings); + image=nullptr; }; ~Alpha_merge(){ if (image) delete image;}; Alpha_merge* clone(map<string,string> &_settings) { return new Alpha_merge(_settings);}; @@ -1269,8 +1270,8 @@ namespace Rotor { }; /* class CVideo_loader: public Image_node { - - // attempt + + // attempt // /usr/bin/ld: warning: libavcodec.so.53, needed by /usr/lib/gcc/i686-linux-gnu/4.7/../../../../lib/libopencv_highgui.so, may conflict with libavcodec.so.55 // /usr/bin/ld: warning: libavformat.so.53, needed by /usr/lib/gcc/i686-linux-gnu/4.7/../../../../lib/libopencv_highgui.so, may conflict with libavformat.so.55 @@ -1280,7 +1281,7 @@ namespace Rotor { // libav::Error: file:///mnt/rotor/media/newsins1_360.mp4 Protocol not found // Rotor::Video_loader: failed to load /mnt/rotor/media/newsins1_360.mp4 // 30-07-2013 09:35:31 Rotor: ERROR: could not load newsins1_360.mp4 into video node 03 - + public: CVideo_loader(){}; CVideo_loader(map<string,string> &settings) { @@ -1443,4 +1444,4 @@ coding style Types begin with capitals 'New_type' variables/ instances use lower case with underscore as a seperator */ -#endif
\ No newline at end of file +#endif |