Merge lp:~zyv/cuneiform-linux/uninitialized-vars into lp:cuneiform-linux

[Yury V. Zaytsev]

Oleg sent me a follow-up patch to fix some uninitialized variables for MSVC. I guess it would compile anyway if you force MSVC to ignore these warnings (i.e. not treat warnings as errors), but with the default warning level without this patch the compilation breaks.

It's up to you if you want to accept it or not, just wanted to bring this to your attention.

=== modified file 'cuneiform_src/Kern/cfcompat/cfcompat.c'
--- cuneiform_src/Kern/cfcompat/cfcompat.c	2009-09-19 21:19:02 +0000
+++ cuneiform_src/Kern/cfcompat/cfcompat.c	2010-10-04 11:35:58 +0000
@@ -511,7 +511,7 @@
 
 	const int len = strlen (tmpl);
 	char* x_tail = tmpl + len - 6;
-	LARGE_INTEGER rand_seed;
+	LARGE_INTEGER rand_seed = {0, 0};
 	uint64_t value = rand_seed.QuadPart ^ GetCurrentThreadId();
 	unsigned int cnt = 0;
 

=== modified file 'cuneiform_src/Kern/r35/src/r35.c'
--- cuneiform_src/Kern/r35/src/r35.c	2009-09-19 15:08:05 +0000
+++ cuneiform_src/Kern/r35/src/r35.c	2010-10-04 11:35:58 +0000
@@ -728,7 +728,12 @@
 
 Bool32 recog_cluster5x3(uint16_t Im3x5[], uchar let, VERSION *v)
 {
-int jold, jm, rm, res;
+
+int jold = 0;
+int jm = 0;
+int rm = 0;
+int res = 0;
+
 elm3x5 *curr;
 
 curr = &tab3x5 [ (jm=header3x5[ let ].numel) ];