TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix koffice FTBFS under oneiric

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1258954 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 8b44021a88
commit f32aa75eda
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File

24
chalk/core/kis_exif_value.cc
Unescape View File

@ -532,7 +532,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
} }
@ -542,7 +543,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
} }
@ -577,7 +579,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
case EXIF_TYPE_SLONG: case EXIF_TYPE_SLONG:
@ -585,7 +588,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
case EXIF_TYPE_SRATIONAL: 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++) for(uint i = 0; i < components(); i++)
{ {
ExifNumber n = asExifNumber(i); ExifNumber n = asExifNumber(i);
set32Bit( (*data) + 4 * i, order, (TQ_UINT32*)&asExifNumber(i).m_srational.numerator); TQ_INT32 aenmsr_numerator = asExifNumber(i).m_srational.numerator;
set32Bit( (*data) + 4 * i + 4, order, (TQ_UINT32*)&asExifNumber(i).m_srational.denominator); 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; return;
case EXIF_TYPE_FLOAT: case EXIF_TYPE_FLOAT:
@ -603,7 +609,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
case EXIF_TYPE_DOUBLE: case EXIF_TYPE_DOUBLE:
@ -611,7 +618,8 @@ void ExifValue::convertToData(unsigned char ** data, unsigned int* size, ExifVal
*data = new uchar[*size]; *data = new uchar[*size];
for(uint i = 0; i < components(); i++) 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; return;
case EXIF_TYPE_UNKNOW: case EXIF_TYPE_UNKNOW:

2
karbon/Makefile.am
Unescape View File

@ -40,7 +40,7 @@ bin_PROGRAMS =
kdeinit_LTLIBRARIES = karbon.la kdeinit_LTLIBRARIES = karbon.la
karbon_la_SOURCES = main.cc karbon_la_SOURCES = main.cc
karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT)
karbon_la_LIBADD = libkarboncommon.la karbon_la_LIBADD = libkarboncommon.la $(LIB_QT) $(LIB_KOFFICECORE)
noinst_HEADERS = \ noinst_HEADERS = \
karbon_factory.h \ karbon_factory.h \

2
kexi/tests/newapi/Makefile.am
Unescape View File

@ -19,7 +19,7 @@ kexidbtest_SOURCES = main.cpp
kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
../../kexidb/parser/libkexidbparser.la \ ../../kexidb/parser/libkexidbparser.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable
#kexidbmysqlcursor_SOURCES = mysqlcursor.cpp #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \

Write Preview
Loading…
Cancel
Save