Merge lp:~linaro-graphics-wg/libmatrix/log-fixes into lp:~jesse-barker/libmatrix/trunk

[Alexandros Frantzis]

Various fixes for the Log class.

=== modified file 'log.cc'
--- log.cc	2012-01-26 17:31:27 +0000
+++ log.cc	2012-01-27 12:56:32 +0000
@@ -67,10 +67,7 @@
         if (!color.empty())
         {
             start_color = color;
-            if (color[0] != 0)
-            {
-                end_color = terminal_color_normal;
-            }
+            end_color = terminal_color_normal;
         }
         linePrefix = start_color + prefix + end_color + colon;
     }
@@ -151,12 +148,12 @@
     va_start(ap, fmt);
     __android_log_vprint(ANDROID_LOG_INFO, appname.c_str(), fmt, ap);
     va_end(ap);
-}q
+}
 
 void
 Log::debug(const char *fmt, ...)
 {
-    if (!Options::show_debug)
+    if (!do_debug_)
         return;
     va_list ap;
     va_start(ap, fmt);