Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CMake/common to allow external GIT_REVISION update for Nix build #543

Merged
merged 1 commit into from
Aug 31, 2018
Merged

Update CMake/common to allow external GIT_REVISION update for Nix build #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/common
Open in desktop
Submodule common updated 1 files
+4 −4 GitInfo.cmake
2 changes: 1 addition & 1 deletion plugins/RocketsPlugin/ImageGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ImageGenerator::ImageBase64 ImageGenerator::createImage(
#ifdef BRAYNS_USE_FREEIMAGE
return {freeimage::getBase64Image(frameBuffer, format, quality)};
#elif defined BRAYNS_USE_LIBJPEGTURBO
BRAYNS_WARN << "No assimp found, will take TurboJPEG snapshot; "
BRAYNS_WARN << "No FreeImage found, will take TurboJPEG snapshot; "
<< "ignoring format '" << format << "'" << std::endl;
const auto& jpeg = createJPEG(frameBuffer, quality);
return {base64_encode(jpeg.data.get(), jpeg.size)};
Expand Down