comparison: databuffer.h
databuffer.h
- changeset 36
- a8838b5f1213
- parent 34
- 0a9a5902beaa
- child 37
- c349dca807f9
equal
deleted
inserted
replaced
| 35:3d3f6ed40171 | 36:a8838b5f1213 |
|---|---|
| 104 } | 104 } |
| 105 } | 105 } |
| 106 | 106 |
| 107 // Merge another data buffer into this one. | 107 // Merge another data buffer into this one. |
| 108 void Merge (DataBuffer* other) { | 108 void Merge (DataBuffer* other) { |
| 109 if (!other) | |
| 110 return; | |
| 111 | |
| 109 for (unsigned int x = 0; x < other->writesize; x++) { | 112 for (unsigned int x = 0; x < other->writesize; x++) { |
| 110 unsigned char c = *(other->buffer+x); | 113 unsigned char c = *(other->buffer+x); |
| 111 Write<unsigned char> (c); | 114 Write<unsigned char> (c); |
| 112 } | 115 } |
| 113 | 116 |
