[[ UninitialisedVars ]] Fix Android compilation

livecodesebastien · livecodesebastien · commit c6bd3989b033 · 2015-10-06T16:36:45.000+01:00
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -1085,7 +1085,8 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
 	extern int32_t MCCustomPrinterComputeFontSize(void *font);
 	t_font_size = MCCustomPrinterComputeFontSize(p_span -> font);
 	t_font_handle = p_span -> font;
-#elif defined(_SERVER)
+#else
+    // Neither servers nor Android have an implementation
 	t_font_size = 0;
 	t_font_handle = NULL;
 #endif
@@ -2179,8 +2180,8 @@ Exec_stat MCCustomPrinterCreate(MCStringRef p_destination, MCStringRef p_filenam
             // AL-2014-09-19: Range argument to MCStringFormat is a pointer to an MCRange.
 			MCStringFormat(&t_module_path, "%*@/revpdfprinter.dylib", &t_range, MCcmd);
 			t_module = MCS_loadmodule(*t_module_path);
-#elif defined(_SERVER)
-			
+#else
+			// Neither servers nor Android have an implementation
 			t_module = nil;
 #endif
 			if (t_module != nil)
diff --git a/engine/src/mblandroiddialog.cpp b/engine/src/mblandroiddialog.cpp
@@ -156,6 +156,11 @@ bool MCSystemPickDate(MCDateTime *p_current, MCDateTime *p_min, MCDateTime *p_ma
     int32_t t_current, t_min, t_max;
     bool t_use_min, t_use_max;
 
+    // Avoid to leave t_min/t_max uninitialised, even though showDatePicker
+    // won't use it if t_use_min/t_use_max is not true
+    t_min = 0;
+    t_max = 0;
+    
     t_use_min = p_min != nil;
     t_use_max = p_max != nil;
     
@@ -182,7 +187,7 @@ bool MCSystemPickDate(MCDateTime *p_current, MCDateTime *p_min, MCDateTime *p_ma
 		MCD_convert_from_datetime(ctxt, *p_max, CF_SECONDS, CF_UNDEFINED, &t_val);
         /* UNCHECKED */ ctxt.ConvertToInteger(*t_val, t_max);
     }
-    
+
     s_in_popup_dialog = true;
     s_dialog_result = kMCDialogResultUnknown;
 	// IM-2012-10-31 [[ BZ 10483 ]] - make sure we have the timezone bias for the date
diff --git a/engine/src/mblandroidinput.cpp b/engine/src/mblandroidinput.cpp
@@ -637,6 +637,8 @@ void MCAndroidInputControl::GetTextAlign(MCExecContext& ctxt, MCNativeControlInp
     t_view = GetView();
     
     MCInputTextAlign t_align;
+    // Default to the switch's default
+    t_align = kMCInputTextAlignLeft;
     
     if (t_view != nil)
         MCAndroidObjectRemoteCall(t_view, "getTextAlign", "v", &t_align);
@@ -662,6 +664,8 @@ void MCAndroidInputControl::GetVerticalTextAlign(MCExecContext& ctxt, MCNativeCo
     t_view = GetView();
     
     MCInputVerticalAlign t_align;
+    // Default to the switch's default
+    t_align = kMCInputVerticalAlignCenter;
     
     if (t_view != nil)
         MCAndroidObjectRemoteCall(t_view, "getVerticalAlign", "i", &t_align);
@@ -698,6 +702,8 @@ void MCAndroidInputControl::GetAutoCapitalizationType(MCExecContext& ctxt, MCNat
     t_view = GetView();
     
     MCInputCapitalizationType t_type;
+    // Default to the switch default
+    t_type = kMCInputCapitalizeNone;
     
     if (t_view != nil)
         MCAndroidObjectRemoteCall(t_view, "getCapitalization", "i", &t_type);
@@ -739,6 +745,8 @@ void MCAndroidInputControl::GetKeyboardType(MCExecContext& ctxt, MCNativeControl
     t_view = GetView();
 
     MCInputKeyboardType t_type;
+    // Default to the switch's default
+    t_type = kMCInputKeyboardTypeDefault;
     
     if (t_view != nil)
         MCAndroidObjectRemoteCall(t_view, "getKeyboardType", "v", &t_type);
@@ -776,6 +784,8 @@ void MCAndroidInputControl::GetReturnKey(MCExecContext& ctxt, MCNativeControlInp
     t_view = GetView();
 
     MCInputReturnKeyType t_type;
+    // Default to the switch's default
+    t_type = kMCInputReturnKeyTypeDefault;
     
     if (t_view != nil)
         MCAndroidObjectRemoteCall(t_view, "getReturnKeyType", "i", &t_type);
