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

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

Author: piers
Date: Wed May  9 18:34:35 2007
New Revision: 4014

Modified:
   vic/branches/mpeg4/render/color.cpp

Log:
Fixed for compilation with TCLTK80

Modified: vic/branches/mpeg4/render/color.cpp
==============================================================================
--- vic/branches/mpeg4/render/color.cpp	(original)
+++ vic/branches/mpeg4/render/color.cpp	Wed May  9 18:34:35 2007
@@ -63,8 +63,10 @@
 				  * counts indexed by pixel value. */
 };
 
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 extern "C" unsigned long *win32Colors;
 extern "C" int win32NColors;
+#endif
 
 #endif
 
@@ -230,10 +232,13 @@
 		fprintf(stderr, "vic: colormap overflow (internal error)\n");
 		exit(1);
 	}
-	/*XXX*/
+
+#if defined(WIN32) && (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 	if (!win32Colors)
 		win32Colors = pixel_;
 	win32NColors = ncolor_;
+#endif
+
 #else
 	int pixel = xc.pixel;
 	pixel_[ncolor_] = pixel;