[cig-commits] commit: Initialising this data structure before it can be used, this was leading to annoying valgrind vexation

[Mercurial]

changeset:   78:4ff1c49250dc
user:        Julian Giordani <julian.giordani at sci.monash.edu.au>
date:        Thu Sep 18 17:39:59 2008 +1000
files:       Base/src/ColourMap.c
description:
Initialising this data structure before it can be used, this was leading to annoying valgrind vexation


diff -r f4859631bdeb -r 4ff1c49250dc Base/src/ColourMap.c
--- a/Base/src/ColourMap.c	Mon Sep 01 02:09:06 2008 +0000
+++ b/Base/src/ColourMap.c	Thu Sep 18 17:39:59 2008 +1000
@@ -138,7 +138,7 @@ void _lucColourMap_Init(
 
 	/* Allocate space for colour map */
 	self->colourList = Memory_Alloc_Array( lucColour , colourCount, "Colour map");
-		
+
 	/* Read String to get colour map */
 	charPointer = strtok( colourMapString, breakChars );
 	for ( colour_I = 0 ; colour_I < colourCount ; colour_I++ ) {
@@ -271,7 +271,20 @@ void _lucColourMap_Construct( void* colo
 }
 
 void _lucColourMap_Build( void* colourMap, void* data ) { }
-void _lucColourMap_Initialise( void* colourMap, void* data ) { }
+
+void _lucColourMap_Initialise( void* colourMap, void* data ) { 
+	lucColourMap* self             = (lucColourMap*) colourMap;
+	int colour_I, colourCount;
+	colourCount = self->colourCount;
+
+	/* Initialise the space in the colour map */
+	for( colour_I = 0 ; colour_I < colourCount ; colour_I++ ) {
+		self->colourList[colour_I].red = 0;
+		self->colourList[colour_I].green = 0;
+		self->colourList[colour_I].blue = 0;
+		self->colourList[colour_I].opacity = 0;
+	}
+}
 void _lucColourMap_Execute( void* colourMap, void* data ) { }
 void _lucColourMap_Destroy( void* colourMap, void* data ) { }