liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::string instead of Glib::ustring for key of map in camconst, #4140

Browse Source
This commit is contained in:
heckflosse
2017-10-13 21:34:55 +02:00
parent 5a0e4de607
commit e6f57b1978
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/camconst.cc
View File

@@ -184,7 +184,7 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
js = (cJSON *)cJSON_;
CameraConst *cc = new CameraConst;
cc->make_model = Glib::ustring(make_model);
cc->make_model = make_model;
ji = cJSON_GetObjectItem(js, "dcraw_matrix");
@@ -739,7 +739,7 @@ CameraConstantsStore::get(const char make[], const char model[])
key += " ";
key += model;
key = key.uppercase();
std::map<Glib::ustring, CameraConst *>::iterator it;
std::map<std::string, CameraConst *>::iterator it;
it = mCameraConstants.find(key);
if (it == mCameraConstants.end()) {

4
rtengine/camconst.h
View File

@@ -17,7 +17,7 @@ struct camera_const_levels {
class CameraConst
{
private:
Glib::ustring make_model;
std::string make_model;
short dcraw_matrix[12];
int raw_crop[4];
int raw_mask[8][4];
@@ -48,7 +48,7 @@ public:
class CameraConstantsStore
{
private:
std::map<Glib::ustring, CameraConst *> mCameraConstants;
std::map<std::string, CameraConst *> mCameraConstants;
CameraConstantsStore();
bool parse_camera_constants_file(Glib::ustring filename);