mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-17 21:40:36 -04:00
added channel msg thumbnail, you'll lose all your current channel msgs before this rev
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
4157aff291
commit
1f873e023e
6 changed files with 78 additions and 1 deletions
|
@ -221,6 +221,15 @@ bool p3Channels::getChannelMessage(std::string fId, std::string mId, ChannelMsgI
|
|||
info.size += fi.size;
|
||||
}
|
||||
|
||||
if((cmsg->thumbnail.binData.bin_data != NULL) && (cmsg->thumbnail.image_type == RSTLV_IMAGE_TYPE_PNG))
|
||||
{
|
||||
info.thumbnail.image_thumbnail =
|
||||
(unsigned char*) cmsg->thumbnail.binData.bin_data;
|
||||
|
||||
info.thumbnail.im_thumbnail_size =
|
||||
cmsg->thumbnail.binData.bin_len;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -250,6 +259,24 @@ bool p3Channels::ChannelMessageSend(ChannelMsgInfo &info)
|
|||
cmsg -> attachment.items.push_back(mfi);
|
||||
}
|
||||
|
||||
// explicit member wise copy for grp image
|
||||
if((info.thumbnail.image_thumbnail != NULL) &&
|
||||
(info.thumbnail.im_thumbnail_size > 0)){
|
||||
|
||||
cmsg->thumbnail.binData.bin_data =
|
||||
new unsigned char[info.thumbnail.im_thumbnail_size];
|
||||
|
||||
memcpy(cmsg->thumbnail.binData.bin_data, info.thumbnail.image_thumbnail,
|
||||
info.thumbnail.im_thumbnail_size*sizeof(unsigned char));
|
||||
cmsg->thumbnail.binData.bin_len = info.thumbnail.im_thumbnail_size;
|
||||
cmsg->thumbnail.image_type = RSTLV_IMAGE_TYPE_PNG;
|
||||
|
||||
}else{
|
||||
|
||||
cmsg->thumbnail.binData.bin_data = NULL;
|
||||
cmsg->thumbnail.binData.bin_len = 0;
|
||||
cmsg->thumbnail.image_type = 0;
|
||||
}
|
||||
|
||||
std::string msgId = publishMsg(cmsg, true);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue