Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3916

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/3916/1

Documentation update of README.cross

* Fixed typos
* Errant/missing commas fixed
* autogen.lastrun -> autogen.input

Change-Id: Ibc0d34f21de661139e622a34d760a6683f394643
---
M README.cross
M cppcanvas/source/mtfrenderer/emfplus.cxx
2 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/README.cross b/README.cross
index 3d962eb..28e4a333 100644
--- a/README.cross
+++ b/README.cross
@@ -32,7 +32,7 @@
 Note that in the case of LibreOffice, it is uncommon to run the
 configure script directly. Normally one uses the autogen.sh script.
 The autogen.sh script reads command-line options from file called
-autogen.lastrun if it exists. The typical way of working is to keep
+autogen.input if it exists. The typical way of working is to keep
 the configure parameters in that file and edit it as needed.
 
 
@@ -58,19 +58,19 @@
 Cygwin gcc in its -mno-cygwin mode, and a Windows-native MinGW
 compiler. The -mno-cygwin mechanism in the Cygwin gcc is rapidly being
 obsoleted, if it isn't already, and we have not attempted to try to
-keep it working; in fact we have activly cleaned out mechanisms
+keep it working; in fact we have actively cleaned out mechanisms
 related to this. Ditto for native MinGW. If one compiles natively on
 Windows, just use a version of Microsoft's compiler. OpenOffice.org
 and LibreOffice have been built for Windows all the time using that.
 
-The only case where it makes sense to use MinGW, is for
+The only case where it makes sense to use MinGW is for
 cross-compilation. There is just too much crack involved on Windows
 anyway, and it is a semi-miracle that the MSVC build under Cygwin
 works as nicely as it does.
 
 MinGW is available as cross-build toolchains pre-packaged in more or
 less official packages for many Linux distros including Debian, Fedora
-and openSUSE. For instance the mingw32 packages in the Open Build
+and openSUSE. For instance, the mingw32 packages in the Open Build
 Service, running on openSUSE, can be found at:
 
 http://download.opensuse.org/repositories/windows:/mingw:/win32/
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4cfd7b9..1f94496 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1272,10 +1272,10 @@
 
                 rMF >> type >> flags >> size >> dataSize;
 
-                next = rMF.Tell() + ( size - 12 );
+                next = rMF.Tell() + ( size - 12 );  // we subtract the 12 byte header record and 
record specific data
 
                 if (size < 12) {
-                    SAL_INFO("cppcanvas.emf", "Size field is less than 12 bytes");
+                    SAL_WARN("cppcanvas.emf", "Size field is less than 12 bytes, this can't be 
because the header alone takes up 12 bytes");
                 }
 
                 SAL_INFO("cppcanvas.emf", "EMF+ record size: " << size << " type: " << type << " 
flags: " << flags << " data size: " << dataSize);
@@ -1941,7 +1941,7 @@
                 else
                 {
                     SAL_WARN("cppcanvas.emf", "ImplRenderer::processEMFPlus: "
-                            "size " << size << " > length " << length);
+                            "size " << size << " > length " << length << ". dataSize is " << 
dataSize);
 #if OSL_DEBUG_LEVEL > 1
                     dumpWords(rMF, length);
 #endif

-- 
To view, visit https://gerrit.libreoffice.org/3916
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc0d34f21de661139e622a34d760a6683f394643
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.