← Back to branch summary

~cosme/ubuntu/precise/freeimage/freeimage-3.15.1

« back to all changes in this revision

Viewing changes to Source/Metadata/IPTC.cpp

  • Committer: Stefano Rivera
  • Date: 2010-07-24 15:35:51 UTC
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: stefanor@ubuntu.com-20100724153551-6s3fth1653huk31a
Tags: upstream-3.13.1
Import upstream version 3.31.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/Metadata/IPTC.cpp
173
173
                FreeImage_SetTagID(tag, TAG_KEYWORDS);
174
174
                FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_KEYWORDS, defaultKey));
175
175
                FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_KEYWORDS));
176
 
                FreeImage_SetTagLength(tag, Keywords.length());
177
 
                FreeImage_SetTagCount(tag, Keywords.length());
 
176
                FreeImage_SetTagLength(tag, (DWORD)Keywords.length());
 
177
                FreeImage_SetTagCount(tag, (DWORD)Keywords.length());
178
178
                FreeImage_SetTagValue(tag, (char*)Keywords.c_str());
179
179
                FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag);
180
180
        }
185
185
                FreeImage_SetTagID(tag, TAG_SUPPLEMENTAL_CATEGORIES);
186
186
                FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES, defaultKey));
187
187
                FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES));
188
 
                FreeImage_SetTagLength(tag, SupplementalCategory.length());
189
 
                FreeImage_SetTagCount(tag, SupplementalCategory.length());
 
188
                FreeImage_SetTagLength(tag, (DWORD)SupplementalCategory.length());
 
189
                FreeImage_SetTagCount(tag, (DWORD)SupplementalCategory.length());
190
190
                FreeImage_SetTagValue(tag, (char*)SupplementalCategory.c_str());
191
191
                FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag);
192
192
        }
268
268
                                                std::vector<std::string> output;
269
269
                                                std::string delimiter = IPTC_DELIMITER;         
270
270
                                                
271
 
                                                unsigned int offset = 0;
272
 
                                                unsigned int delimiterIndex = 0;
 
271
                                                size_t offset = 0;
 
272
                                                size_t delimiterIndex = 0;
273
273
 
274
274
                                                delimiterIndex = value.find(delimiter, offset);
275
275
                                                while (delimiterIndex != std::string::npos) {
282
282
                                                // add as many tags as there are comma separated strings
283
283
                                                for(int i = 0; i < (int)output.size(); i++) {
284
284
                                                        std::string& tag_value = output[i];
285
 
                                                        buffer = append_iptc_tag(buffer, &buffer_size, tag_id, tag_value.length(), tag_value.c_str());
 
285
                                                        buffer = append_iptc_tag(buffer, &buffer_size, tag_id, (DWORD)tag_value.length(), tag_value.c_str());
286
286
                                                }
287
287
 
288
288
                                        }