[Sumover-dev] [svn commit] r4692 - in vic/branches/cc: codec

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Sun Mar 14 20:45:47 2010
New Revision: 4692

Modified:
   vic/branches/cc/codec/encoder-h261.cpp
   vic/branches/cc/module.h

Log:
-- modifed suspend_grabbing() base funtion to avoid compile-time error, e.g.:

error: cannot allocate an object of abstract type ‘JpegEncoder’
note:   because the following virtual functions are pure within ‘JpegEncoder’:

this error occurred because suspend_grabbing() is declared as pure virtual
function earlier, hence no way to allocate an object of abstract JpegEncoder,
for example.

it is now replaced with an empty function in module.h.



Modified: vic/branches/cc/codec/encoder-h261.cpp
==============================================================================
--- vic/branches/cc/codec/encoder-h261.cpp	(original)
+++ vic/branches/cc/codec/encoder-h261.cpp	Sun Mar 14 20:45:47 2010
@@ -139,7 +139,7 @@
 	int vfno_;
 
 	// should we suspend grabbing?
-	virtual bool suspend_grabbing();
+	bool suspend_grabbing();
 
     protected:
 	H261Encoder(int ft);

Modified: vic/branches/cc/module.h
==============================================================================
--- vic/branches/cc/module.h	(original)
+++ vic/branches/cc/module.h	Sun Mar 14 20:45:47 2010
@@ -125,7 +125,7 @@
 
 	double offset_;
 	inline double offset() { return offset_; }
-	virtual bool suspend_grabbing() = 0;
+	virtual inline bool suspend_grabbing() {};
 
     protected:
 	Module(int ft);