[Sumover-dev] [svn commit] r3913 - vic/branches/mpeg4/render

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

Author: barz
Date: Wed Nov  8 03:21:21 2006
New Revision: 3913

Modified:
   vic/branches/mpeg4/render/color-x11.cpp
   vic/branches/mpeg4/render/renderer-window.cpp
   vic/branches/mpeg4/render/renderer.cpp

Log:
rename ENABLE_SWSCALE to HAVE_SWSCALE



Modified: vic/branches/mpeg4/render/color-x11.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-x11.cpp	(original)
+++ vic/branches/mpeg4/render/color-x11.cpp	Wed Nov  8 03:21:21 2006
@@ -1,5 +1,5 @@
 
-#ifdef ENABLE_SWSCALE
+#ifdef HAVE_SWSCALE
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -156,4 +156,4 @@
 
 					       
 
-#endif // ENABLE_SWSCALE
+#endif // HAVE_SWSCALE

Modified: vic/branches/mpeg4/render/renderer-window.cpp
==============================================================================
--- vic/branches/mpeg4/render/renderer-window.cpp	(original)
+++ vic/branches/mpeg4/render/renderer-window.cpp	Wed Nov  8 03:21:21 2006
@@ -86,7 +86,7 @@
 	outw_ = (ww_ >> 2) << 2;
 	outh_ = (wh_ >> 2) << 2;
 
-#ifndef ENABLE_SWSCALE
+#ifndef HAVE_SWSCALE
 	int d = distance(ww_, width_);
 	int t = distance(ww_, width_ << 1);
 	if (t < d) {
@@ -127,7 +127,7 @@
 			return;
         }            
 	
-#ifdef ENABLE_SWSCALE
+#ifdef HAVE_SWSCALE
 	window_->render(image_, 0, 0 , 0, 0);
 #else
 	if (scale_ >= 0) {

Modified: vic/branches/mpeg4/render/renderer.cpp
==============================================================================
--- vic/branches/mpeg4/render/renderer.cpp	(original)
+++ vic/branches/mpeg4/render/renderer.cpp	Wed Nov  8 03:21:21 2006
@@ -124,7 +124,7 @@
 		need_update_ = 0;
 	}
 
-#ifdef ENABLE_SWSCALE
+#ifdef HAVE_SWSCALE
 	render(vf->bp_, 0, 0, 0, 0);
 	
 	// put the image to display