Skip to content

Cache ICC color profile information #137

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

Open
ckaiser wants to merge 1 commit into
base: beta
Choose a base branch
from
Open

Cache ICC color profile information #137

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
20 changes: 19 additions & 1 deletion os/win/color_space.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,22 @@
#include "base/string.h"
#include "os/system.h"

#include <unordered_map>

#include <windows.h>

namespace os {

std::unordered_map<HMONITOR, std::string> g_iccFilenameCache;
std::unordered_map<std::string, os::ColorSpaceRef> g_colorspaceCache;

std::string get_hmonitor_icc_filename(HMONITOR monitor)
{
const auto& it = g_iccFilenameCache.find(monitor);
if (it != g_iccFilenameCache.end()) {
return it->second;
}

std::string iccFilename;
MONITORINFOEX mi;
ZeroMemory(&mi, sizeof(MONITORINFOEX));
Expand All @@ -30,15 +40,22 @@ std::string get_hmonitor_icc_filename(HMONITOR monitor)
if (hdc) {
DWORD length = MAX_PATH;
std::vector<TCHAR> str(length + 1);
if (GetICMProfile(hdc, &length, &str[0]))
if (GetICMProfile(hdc, &length, &str[0])) {
iccFilename = base::to_utf8(&str[0]);
g_iccFilenameCache.emplace(monitor, iccFilename);
}
DeleteDC(hdc);
}
return iccFilename;
}

os::ColorSpaceRef get_colorspace_from_icc_file(const std::string& iccFilename)
{
const auto& it = g_colorspaceCache.find(iccFilename);
if (it != g_colorspaceCache.end()) {
return it->second;
}

auto system = System::instance();
ASSERT(system);
if (!system)
Expand All @@ -48,6 +65,7 @@ os::ColorSpaceRef get_colorspace_from_icc_file(const std::string& iccFilename)
auto osCS = system->makeColorSpace(gfx::ColorSpace::MakeICC(std::move(buf)));
if (osCS) {
osCS->gfxColorSpace()->setName("Display Profile: " + base::get_file_title(iccFilename));
g_colorspaceCache.emplace(iccFilename, osCS);
}
return osCS;
}
Expand Down