[[ Bug 11415 ]] Uninitialized value in measurment cache key causing strange text layout problems.

runrevmark · runrevmark · commit 1b3b10594e48 · 2013-11-12T10:38:16.000Z
diff --git a/docs/notes/bugfix-11415.md b/docs/notes/bugfix-11415.md
@@ -0,0 +1 @@
+# Random issues with text layout and alignment.
diff --git a/libgraphics/src/cachetable.cpp b/libgraphics/src/cachetable.cpp
@@ -27,7 +27,7 @@ static hash_t MCGHashBytes(const void *p_bytes, size_t length)
 {
     // 32-bit FNV-1a hash algorithm
     const uint32_t t_prime = 16777619;
-    const uint32_t t_bias = 2166136261;
+    const uint32_t t_bias = 2166136261U;
     
     const uint8_t *t_data = (const uint8_t*)p_bytes;
     uint32_t t_hash = t_bias;
diff --git a/libgraphics/src/context.cpp b/libgraphics/src/context.cpp
@@ -2682,8 +2682,10 @@ MCGFloat MCGContextMeasurePlatformText(MCGContextRef self, const unichar_t *p_te
 
 		// MW-2013-11-07: [[ Bug 11393 ]] Make sure we take into account the 'ideal' flag
 		//   when looking up metrics.
+		// MW-2013-11-12: [[ Bug 11415 ]] Make sure we use p_font.size and not t_size if not
+		//   ideal - otherwise uninitialized values abound...
 		int16_t t_size;
-		t_size = p_font . ideal ? -p_font . size : t_size;
+		t_size = p_font . ideal ? -p_font . size : p_font . size;
 		MCMemoryCopy(t_key_ptr, &t_size, sizeof(p_font . size));
 		t_key_ptr += sizeof(p_font . size);
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Random issues with text layout and alignment.`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static hash_t MCGHashBytes(const void *p_bytes, size_t length)`
`27`	`27`	`{`
`28`	`28`	`// 32-bit FNV-1a hash algorithm`
`29`	`29`	`const uint32_t t_prime = 16777619;`
`30`		`- const uint32_t t_bias = 2166136261;`
	`30`	`+ const uint32_t t_bias = 2166136261U;`
`31`	`31`
`32`	`32`	`const uint8_t t_data = (const uint8_t)p_bytes;`
`33`	`33`	`uint32_t t_hash = t_bias;`