This commit is contained in:
parent
289865f9fe
commit
7117b9317d
|
@ -1380,15 +1380,18 @@ void hg_settingdialog::slot_gammaButtonClicked()
|
||||||
dev_que::set_custom_gamma(&m_saneAPI, m_devHandle, &m_gammaData);
|
dev_que::set_custom_gamma(&m_saneAPI, m_devHandle, &m_gammaData);
|
||||||
cur_scheme_->config_changed(SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA, (char*)&m_gammaData, sizeof(m_gammaData), true);
|
cur_scheme_->config_changed(SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA, (char*)&m_gammaData, sizeof(m_gammaData), true);
|
||||||
|
|
||||||
HGSize length = 0;
|
if (comb_->currentIndex() == 0)
|
||||||
HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), NULL, &length);
|
{
|
||||||
HGByte* base64Str = new HGByte[length + 1];
|
HGSize length = 0;
|
||||||
HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), base64Str, &length);
|
HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), NULL, &length);
|
||||||
base64Str[length] = 0;
|
HGByte* base64Str = new HGByte[length + 1];
|
||||||
|
HGBase_Base64Encode((const HGByte*)&m_gammaData, sizeof(m_gammaData), base64Str, &length);
|
||||||
|
base64Str[length] = 0;
|
||||||
|
|
||||||
QString value = QString::fromStdString((char*)base64Str);
|
QString value = QString::fromStdString((const char*)base64Str);
|
||||||
saveDefaultCfgValue("default", "gamma", value);
|
saveDefaultCfgValue("default", "curves", value);
|
||||||
delete[] base64Str;
|
delete[] base64Str;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2342,9 +2345,9 @@ void hg_settingdialog::updateDefaultScheme()
|
||||||
double value = getDefaultCfgValue("default", "cutBottomvalue", QString("")).toDouble();
|
double value = getDefaultCfgValue("default", "cutBottomvalue", QString("")).toDouble();
|
||||||
m_cutBottomValue = value;
|
m_cutBottomValue = value;
|
||||||
}
|
}
|
||||||
if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA) && searchKeyName("default", "gamma"))
|
if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA) && searchKeyName("default", "curves"))
|
||||||
{
|
{
|
||||||
QString value = getDefaultCfgValue("default", "gamma", QString(""));
|
QString value = getDefaultCfgValue("default", "curves", QString(""));
|
||||||
if (!value.isEmpty())
|
if (!value.isEmpty())
|
||||||
{
|
{
|
||||||
HGSize length = 0;
|
HGSize length = 0;
|
||||||
|
|
Loading…
Reference in New Issue