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

Browse Source
This commit is contained in:
ghorvath
2010-04-16 10:29:18 +00:00
parent 71b74bbfd2
commit 68c4f03a59
205 changed files with 7112 additions and 15069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
rtengine/imagedata.cc
View File

@@ -1,21 +1,21 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <imagedata.h>
#include <iptcpairs.h>
#include <glib/gstdio.h>
@@ -23,6 +23,10 @@
#include <rwz_sdk.h>
#endif
#ifndef GLIBMM_EXCEPTIONS_ENABLED
#include <memory>
#endif
using namespace rtengine;
extern "C" IptcData *iptc_data_new_from_jpeg_file (FILE* infile);
@@ -274,6 +278,27 @@ ImageData::~ImageData () {
iptc_data_free (iptc);
}
Glib::ustring safe_locale_to_utf8 (const std::string& src)
{
Glib::ustring utf8_str;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
utf8_str = Glib::locale_to_utf8(src);
}
catch (const Glib::ConvertError& e) {
utf8_str = Glib::convert_with_fallback(src, "UTF8", "LATIN1","?");
}
#else
{
std::auto_ptr<Glib::Error> error;
utf8_str = locale_to_utf8(src, error);
if (error.get())
utf8_str = Glib::convert_with_fallback(src, "UTF8", "LATIN1","?", error);
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
return utf8_str;
}
const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
std::vector<procparams::IPTCPair> iptcc;
@@ -287,12 +312,8 @@ const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
iptc_dataset_get_data (ds, buffer, 2100);
procparams::IPTCPair ic;
ic.field = strTags[i].field;
try {
ic.values.push_back (Glib::locale_to_utf8((char*)buffer));
}
catch (const Glib::ConvertError& e) {
ic.values.push_back (Glib::convert_with_fallback((char*)buffer, "UTF8", "LATIN1","?"));
}
ic.values.push_back (safe_locale_to_utf8((char*)buffer));
iptcc.push_back (ic);
iptc_dataset_unref (ds);
}
@@ -302,12 +323,7 @@ const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
ickw.field = "Keywords";
while (ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_KEYWORDS)) {
iptc_dataset_get_data (ds, buffer, 2100);
try {
ickw.values.push_back (Glib::locale_to_utf8((char*)buffer));
}
catch (const Glib::ConvertError& e) {
ickw.values.push_back (Glib::convert_with_fallback((char*)buffer, "UTF8", "LATIN1","?"));
}
ickw.values.push_back (safe_locale_to_utf8((char*)buffer));
}
iptcc.push_back (ickw);
ds = NULL;
@@ -315,12 +331,7 @@ const std::vector<procparams::IPTCPair> ImageData::getIPTCData () const {
icsc.field = "SupplementalCategories";
while (ds=iptc_data_get_next_dataset (iptc, ds, IPTC_RECORD_APP_2, IPTC_TAG_SUPPL_CATEGORY)) {
iptc_dataset_get_data (ds, buffer, 2100);
try {
icsc.values.push_back (Glib::locale_to_utf8((char*)buffer));
}
catch (const Glib::ConvertError& e) {
icsc.values.push_back (Glib::convert_with_fallback((char*)buffer, "UTF8", "LATIN1","?"));
}
icsc.values.push_back (safe_locale_to_utf8((char*)buffer));
iptc_dataset_unref (ds);
}
iptcc.push_back (icsc);