[cig-commits] commit: The commit yesterday was bogus because it was intialising things to late.

[Mercurial]

changeset:   79:e48bdd224d8a
user:        Julian Giordani <julian.giordani at sci.monash.edu.au>
date:        Fri Sep 19 14:34:55 2008 +1000
files:       Base/src/ColourMap.c
description:
The commit yesterday was bogus because it was intialising things to late.
So the initialisation has been moved to the very next line after the memory is called up.


diff -r 4ff1c49250dc -r e48bdd224d8a Base/src/ColourMap.c
--- a/Base/src/ColourMap.c	Thu Sep 18 17:39:59 2008 +1000
+++ b/Base/src/ColourMap.c	Fri Sep 19 14:34:55 2008 +1000
@@ -139,6 +139,14 @@ void _lucColourMap_Init(
 	/* Allocate space for colour map */
 	self->colourList = Memory_Alloc_Array( lucColour , colourCount, "Colour map");
 
+	/* 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;
+	}
+
 	/* Read String to get colour map */
 	charPointer = strtok( colourMapString, breakChars );
 	for ( colour_I = 0 ; colour_I < colourCount ; colour_I++ ) {
@@ -272,19 +280,7 @@ void _lucColourMap_Construct( void* colo
 
 void _lucColourMap_Build( 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_Initialise( void* colourMap, void* data ) { }
 void _lucColourMap_Execute( void* colourMap, void* data ) { }
 void _lucColourMap_Destroy( void* colourMap, void* data ) { }