[Branch,~jesse-barker/libmatrix/trunk] Rev 34: Merge of lp:~linaro-graphics-wg/libmatrix/log-fixes to address issues with Android support.

Message ID 20120127150112.5300.32962.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Jesse Barker Jan. 27, 2012, 3:01 p.m.
Merge authors:
  Alexandros Frantzis (afrantzis)
Related merge proposals:
  https://code.launchpad.net/~linaro-graphics-wg/libmatrix/log-fixes/+merge/90424
  proposed by: Alexandros Frantzis (afrantzis)
------------------------------------------------------------
revno: 34 [merge]
committer: Jesse Barker <jesse.barker@linaro.org>
branch nick: trunk
timestamp: Fri 2012-01-27 06:58:24 -0800
message:
  Merge of lp:~linaro-graphics-wg/libmatrix/log-fixes to address issues with Android support.
modified:
  log.cc


--
lp:libmatrix
https://code.launchpad.net/~jesse-barker/libmatrix/trunk

You are subscribed to branch lp:libmatrix.
To unsubscribe from this branch go to https://code.launchpad.net/~jesse-barker/libmatrix/trunk/+edit-subscription

Patch

=== modified file 'log.cc'
--- log.cc	2012-01-26 17:31:27 +0000
+++ log.cc	2012-01-27 11:55:16 +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);