summaryrefslogtreecommitdiffstats
path: root/dummyresource/resourcefactory.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-04-12 16:02:56 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-04-12 16:02:56 +0200
commit7357673a7ee5a0976447d0285e3aa272e8626282 (patch)
tree667c7f7c8a780c88419f878ed5c381d54a7ed803 /dummyresource/resourcefactory.cpp
parente85967518b9041e9943ec5f1765c6694bb153840 (diff)
parent73b8fe58c6fb985898d2bbf431926f0628e2b0a9 (diff)
downloadsink-7357673a7ee5a0976447d0285e3aa272e8626282.tar.gz
sink-7357673a7ee5a0976447d0285e3aa272e8626282.zip
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'dummyresource/resourcefactory.cpp')
-rw-r--r--dummyresource/resourcefactory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index 04413c2..8f0a2bd 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -77,14 +77,15 @@ static std::string createEvent()
77 static flatbuffers::FlatBufferBuilder fbb; 77 static flatbuffers::FlatBufferBuilder fbb;
78 fbb.Clear(); 78 fbb.Clear();
79 { 79 {
80 uint8_t *rawDataPtr = Q_NULLPTR;
80 auto summary = fbb.CreateString("summary"); 81 auto summary = fbb.CreateString("summary");
81 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize); 82 auto data = fbb.CreateUninitializedVector<uint8_t>(attachmentSize, &rawDataPtr);
82 DummyCalendar::DummyEventBuilder eventBuilder(fbb); 83 DummyCalendar::DummyEventBuilder eventBuilder(fbb);
83 eventBuilder.add_summary(summary); 84 eventBuilder.add_summary(summary);
84 eventBuilder.add_attachment(data); 85 eventBuilder.add_attachment(data);
85 auto eventLocation = eventBuilder.Finish(); 86 auto eventLocation = eventBuilder.Finish();
86 DummyCalendar::FinishDummyEventBuffer(fbb, eventLocation); 87 DummyCalendar::FinishDummyEventBuffer(fbb, eventLocation);
87 memcpy((void*)DummyCalendar::GetDummyEvent(fbb.GetBufferPointer())->attachment()->Data(), rawData, attachmentSize); 88 memcpy((void*)rawDataPtr, rawData, attachmentSize);
88 } 89 }
89 90
90 return std::string(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize()); 91 return std::string(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());