[Cmake-commits] CMake branch, next, updated. v3.1.0-1392-g889e889

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  889e889a0377d047dd4430cd4e5f7f29d81d274e (commit)
       via  27890380d37224ab9e63c9854d3f828931a0b0a4 (commit)
      from  6a680df6aad7710c9aca4b01a16567dd3ca9771e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=889e889a0377d047dd4430cd4e5f7f29d81d274e
commit 889e889a0377d047dd4430cd4e5f7f29d81d274e
Merge: 6a680df 2789038
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Dec 24 04:54:02 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 24 04:54:02 2014 -0500

    Merge topic 'base64-casts' into next
    
    27890380 CTest: more base64 size_t fixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27890380d37224ab9e63c9854d3f828931a0b0a4
commit 27890380d37224ab9e63c9854d3f828931a0b0a4
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Dec 24 10:53:33 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Dec 24 10:53:33 2014 +0100

    CTest: more base64 size_t fixes
    
    Commit will be squashed.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 9e3c9fc..ff55528 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -116,10 +116,10 @@ void cmCTestRunTest::CompressOutput()
   unsigned char *encoded_buffer
     = new unsigned char[static_cast<int>(outSize * 1.5)];
 
-  unsigned long rlen
+  size_t rlen
     = cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1);
 
-  for(unsigned long i = 0; i < rlen; i++)
+  for(size_t i = 0; i < rlen; i++)
     {
     this->CompressedOutput += encoded_buffer[i];
     }
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index f330e58..8518a90 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1976,9 +1976,8 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
             = new unsigned char [ static_cast<int>(
                 static_cast<double>(len) * 1.5 + 5.0) ];
 
-          unsigned long rlen
+          size_t rlen
             = cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1);
-          unsigned long cc;
 
           ostr
             << "\t\t\t<NamedMeasurement"
@@ -1988,7 +1987,7 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
             << measurementfile.match(4) << "\""
             << " encoding=\"base64\""
             << ">" << std::endl << "\t\t\t\t<Value>";
-          for ( cc = 0; cc < rlen; cc ++ )
+          for (size_t cc = 0; cc < rlen; cc ++ )
             {
             ostr << encoded_buffer[cc];
             if ( cc % 60 == 0 && cc )
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index b894db9..4ce5bec 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3191,7 +3191,7 @@ bool cmCTest::CompressString(std::string& str)
 
   // Now base64 encode the resulting binary string
   unsigned char* base64EncodedBuffer
-    = new unsigned char[static_cast<int>(outSize * 1.5)];
+    = new unsigned char[(outSize * 3) / 2];
 
   unsigned long rlen
     = cmsysBase64_Encode(out, strm.total_out, base64EncodedBuffer, 1);

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx     |    4 ++--
 Source/CTest/cmCTestTestHandler.cxx |    5 ++---
 Source/cmCTest.cxx                  |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake