diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-15 06:49:03 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-15 06:49:03 +0000 |
| commit | f32aa75eda310263aecf9939fdff3e3dbacefcd6 (patch) | |
| tree | 3431be44181a3064a03246fb3b4d6283156ed093 /chalk/core | |
| parent | 8b44021a8864099221bd1f5f4cfc1d209fcf078b (diff) | |
| download | koffice-f32aa75eda310263aecf9939fdff3e3dbacefcd6.tar.gz koffice-f32aa75eda310263aecf9939fdff3e3dbacefcd6.zip | |
Fix koffice FTBFS under oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1258954 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'chalk/core')
| -rw-r--r-- | chalk/core/kis_exif_value.cc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc index 1b7bcf32..043bf4e3 100644 --- a/chalk/core/kis_exif_value.cc +++ b/chalk/core/kis_exif_value.cc @@ -532,7 +532,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set16Bit( (*data) + 2 * i, order, &asExifNumber(i).m_short); + TQ_UINT16 aenms = asExifNumber(i).m_short; + set16Bit( (*data) + 2 * i, order, &aenms); } return; } @@ -542,7 +543,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set32Bit( (*data) + 4 * i, order, &asExifNumber(i).m_long); + TQ_UINT32 aenml = asExifNumber(i).m_long; + set32Bit( (*data) + 4 * i, order, &aenml); } return; } @@ -577,7 +579,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set16Bit( (*data) + 2 * i, order, (TQ_UINT16*)&asExifNumber(i).m_sshort); + TQ_INT16 aenmss = asExifNumber(i).m_sshort; + set16Bit( (*data) + 2 * i, order, (TQ_UINT16*)&aenmss); } return; case EXIF_TYPE_SLONG: @@ -585,7 +588,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&asExifNumber(i).m_slong); + TQ_INT32 aenmsl = asExifNumber(i).m_slong; + set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&aenmsl); } return; case EXIF_TYPE_SRATIONAL: @@ -594,8 +598,10 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal for(uint i = 0; i < components(); i++) { ExifNumber n = asExifNumber(i); - set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&asExifNumber(i).m_srational.numerator); - set32Bit( (*data) + 4 * i + 4, order, (TQ_UINT32*)&asExifNumber(i).m_srational.denominator); + TQ_INT32 aenmsr_numerator = asExifNumber(i).m_srational.numerator; + TQ_INT32 aenmsr_denominator = asExifNumber(i).m_srational.denominator; + set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&aenmsr_numerator); + set32Bit( (*data) + 4 * i + 4, order, (TQ_UINT32*)&aenmsr_denominator); } return; case EXIF_TYPE_FLOAT: @@ -603,7 +609,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&asExifNumber(i).m_float); + float aenmf = asExifNumber(i).m_float; + set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&aenmf); } return; case EXIF_TYPE_DOUBLE: @@ -611,7 +618,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal *data = new uchar[*size]; for(uint i = 0; i < components(); i++) { - set64Bit( (*data) + 4 * i, order, (TQ_UINT64*)&asExifNumber(i).m_double); + double aenmd = asExifNumber(i).m_double; + set64Bit( (*data) + 4 * i, order, (TQ_UINT64*)&aenmd); } return; case EXIF_TYPE_UNKNOW: |