Merge branch 'master' of https://github.com/google/flatbuffers

net/FlatBuffers/ByteBuffer.cs

@@ -146,6 +146,13 @@ namespace FlatBuffers
             _buffer[offset] = value;
         }
 
+        public void PutByte(int offset, byte value, int count)
+        {
+            AssertOffsetAndLength(offset, sizeof(byte) * count);
+            for (var i = 0; i < count; ++i)
+                _buffer[offset + i] = value;
+        }
+
         // this method exists in order to conform with Java ByteBuffer standards
         public void Put(int offset, byte value)
         {

net/FlatBuffers/FlatBufferBuilder.cs

@@ -69,10 +69,7 @@ namespace FlatBuffers
 
         public void Pad(int size)
         {
-            for (var i = 0; i < size; i++)
-            {
-                _bb.PutByte(--_space, 0);
-            }
+             _bb.PutByte(_space -= size, 0, size);
         }
 
         // Doubles the size of the ByteBuffer, and copies the old data towards
@@ -116,6 +113,7 @@ namespace FlatBuffers
                 _space += (int)_bb.Length - oldBufSize;
 
             }
+            if (alignSize > 0)
                 Pad(alignSize);
         }
 
@@ -277,11 +275,10 @@ namespace FlatBuffers
         public StringOffset CreateString(string s)
         {
             NotNested();            
-            byte[] utf8 = Encoding.UTF8.GetBytes(s);
-            AddByte((byte)0);
-            StartVector(1, utf8.Length, 1);
-            Buffer.BlockCopy(utf8, 0, _bb.Data, _space -= utf8.Length,
-                             utf8.Length);
+            AddByte(0);
+            var utf8StringLen = Encoding.UTF8.GetByteCount(s);
+            StartVector(1, utf8StringLen, 1);
+            Encoding.UTF8.GetBytes(s, 0, s.Length, _bb.Data, _space -= utf8StringLen);
             return new StringOffset(EndVector().Value);
         }
 

readme.md

@@ -18,8 +18,7 @@ Windows, OS X, Linux), see `docs/html/index.html`
 
 Discuss FlatBuffers with other developers and users on the
 [FlatBuffers Google Group][]. File issues on the [FlatBuffers Issues Tracker][]
-or post your questions to [stackoverflow.com][] with a mention of
-**flatbuffers**.
+or post your questions to [stackoverflow.com][] using the [`flatbuffers` tag][].
 
 For applications on Google Play that integrate this tool, usage is tracked.
 This tracking is done automatically using the embedded version string
@@ -34,3 +33,4 @@ you would leave it in.
   [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
   [stackoverflow.com]: http://www.stackoverflow.com
   [landing page]: http://google.github.io/flatbuffers
+  [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers