[Libreoffice-commits] core.git: 2 commits - vcl/android

Tor Lillqvist tml at iki.fi
Wed Feb 27 23:01:35 PST 2013


 vcl/android/androidinst.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7bce0a1d9b0ef57432e0d856c67257b1573dedf5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Feb 28 09:00:43 2013 +0200

    The "pre-cleaning" is fairly pointless now when we fill the whole screen
    
    Change-Id: I85a2ee8af9615222c33b36e3d7d08e5821a66a43

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 2677575..df4f189 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -299,7 +299,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow, ANativeWindow_Buf
     if (aOutBuffer.bits != NULL)
     {
 
-#if 1   // pre-'clean' the buffer with cruft:
+#if 0   // pre-'clean' the buffer with cruft:
         // hard-code / guess at a format ...
         int32_t *p = (int32_t *)aOutBuffer.bits;
         for (int32_t y = 0; y < aOutBuffer.height; y++)
commit c167f05fdcc25e02276c4321c8af45009263b605
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Feb 28 09:00:04 2013 +0200

    Bin some repetitive verbose logging
    
    Change-Id: I5c2ee005094ec3fdf1ebc766b0760a1f73b2682f

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 2773cd3..2677575 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -278,8 +278,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow, ANativeWindow_Buf
     ANativeWindow_Buffer aOutBuffer;
     memset ((void *)&aOutBuffer, 0, sizeof (aOutBuffer));
 
-    LOGI("RedrawWindows");
-
     int32_t nRet = 0;
     if (pBuffer != NULL)
         aOutBuffer = *pBuffer;
@@ -318,8 +316,9 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow, ANativeWindow_Buf
 
             if (pFrame->IsVisible())
             {
-                LOGI("render visible frame %d", i );
-#ifndef REGION_RE_RENDER
+#ifndef REGION_RE_RENDER // (It isn't defined, don't know where it
+                         // would/could bem so this branch is the one
+                         // that is used)
                 BlitFrameToWindow (&aOutBuffer, pFrame->getDevice());
 #else
                 // Sadly it seems that due to double buffering, we don't
@@ -353,7 +352,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow, ANativeWindow_Buf
     if (pBuffer && pWindow)
         ANativeWindow_unlockAndPost(pWindow);
 
-    LOGI("done render!");
     maRedrawRegion.SetEmpty();
     mbQueueReDraw = false;
 }


More information about the Libreoffice-commits mailing list