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

Batch of correction to lower the number of GCC warnings

Browse Source
This commit is contained in:
Hombre
2010-08-29 02:25:59 +02:00
parent 6da0cf6792
commit 02dac0425d
40 changed files with 936 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/imagedata.cc
View File

@@ -321,7 +321,7 @@ const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
IptcDataSet* ds = NULL;
procparams::IPTCPair ickw;
ickw.field = "Keywords";
while (ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_KEYWORDS)) {
while ((ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_KEYWORDS))) {
iptc_dataset_get_data (ds, buffer, 2100);
ickw.values.push_back (safe_locale_to_utf8((char*)buffer));
}
@@ -329,12 +329,13 @@ const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
ds = NULL;
procparams::IPTCPair icsc;
icsc.field = "SupplementalCategories";
while (ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_SUPPL_CATEGORY)) {
while ((ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_SUPPL_CATEGORY))) {
iptc_dataset_get_data (ds, buffer, 2100);
icsc.values.push_back (safe_locale_to_utf8((char*)buffer));
iptc_dataset_unref (ds);
}
iptcc.push_back (icsc);
return iptcc;
}
//------inherited functions--------------//