haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt for older libpng

private/hcvcastro/forking
Tor Lillqvist 2015-04-10 12:39:12 +03:00
parent aedea4229f
commit bf709edf08
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loolwsd/Util.cpp
View File

@ -56,7 +56,7 @@ namespace Util
return false;
}
bool encodePNGAndAppendToBuffer(const unsigned char *pixmap, int width, int height, std::vector<char>& output)
bool encodePNGAndAppendToBuffer(unsigned char *pixmap, int width, int height, std::vector<char>& output)
{
png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

4
loolwsd/Util.hpp
View File

@ -14,7 +14,9 @@ namespace Util
{
std::string logPrefix();
bool windowingAvailable();
bool encodePNGAndAppendToBuffer(const unsigned char *pixmap, int width, int height, std::vector<char>& output);
// Sadly, older libpng headers don't use const for the pixmap pointer parameter to
// png_write_row(), so can't use const here for pixmap.
bool encodePNGAndAppendToBuffer(unsigned char *pixmap, int width, int height, std::vector<char>& output);
};
#endif