-rw-r--r-- | noncore/unsupported/gsmtool/gsmtool.pro | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/addresspicker.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/mail2/bend/opie-mailapplet.control | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/opie-mail2.control | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/opie-mailit.control | 2 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 17 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/opie-qpdf.control | 2 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/qpdf.cpp | 0 |
8 files changed, 22 insertions, 8 deletions
diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro index 180195f..40d5942 100644 --- a/noncore/unsupported/gsmtool/gsmtool.pro +++ b/noncore/unsupported/gsmtool/gsmtool.pro | |||
@@ -9,3 +9,3 @@ TMAKE_CXXFLAGS += -fexceptions | |||
9 | INCLUDEPATH+= $(OPIEDIR)/include | 9 | INCLUDEPATH+= $(OPIEDIR)/include |
10 | INCLUDEPATH+= $(GSMLIBDIR) | 10 | #INCLUDEPATH+= $(GSMLIBDIR) |
11 | DEPENDPATH+= $(OPIEDIR)/include | 11 | DEPENDPATH+= $(OPIEDIR)/include |
diff --git a/noncore/unsupported/mail2/addresspicker.cpp b/noncore/unsupported/mail2/addresspicker.cpp index 7f32725..a97b33f 100644 --- a/noncore/unsupported/mail2/addresspicker.cpp +++ b/noncore/unsupported/mail2/addresspicker.cpp | |||
@@ -26,2 +26,3 @@ AddressPicker::AddressPicker(QWidget *parent, const char *name, bool modal, | |||
26 | QTextStream stream(&f); | 26 | QTextStream stream(&f); |
27 | stream.setEncoding( QTextStream::UnicodeUTF8 ); | ||
27 | QString content; | 28 | QString content; |
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control index e5d3c6e..d618643 100644 --- a/noncore/unsupported/mail2/bend/opie-mailapplet.control +++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control | |||
@@ -6,4 +6,4 @@ Maintainer: Constantin Bergemann <cbergemann@lisa.de> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.0.9-$SUB_VERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: task-opie-minimal libopie1 opie-mail2 | 8 | Depends: task-opie-minimal, libopie1, opie-mail2 |
9 | Description: A Biff-Like mailchecker | 9 | Description: A Biff-Like mailchecker |
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control index 7f8aeb6..976dc0b 100644 --- a/noncore/unsupported/mail2/opie-mail2.control +++ b/noncore/unsupported/mail2/opie-mail2.control | |||
@@ -6,3 +6,3 @@ Maintainer: Constantin Bergemann <cbergemann@lisa.de> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.0.9-$SUB_VERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopie1 | 8 | Depends: task-opie-minimal, libopie1 |
diff --git a/noncore/unsupported/mailit/opie-mailit.control b/noncore/unsupported/mailit/opie-mailit.control index 65b5b36..77d4102 100644 --- a/noncore/unsupported/mailit/opie-mailit.control +++ b/noncore/unsupported/mailit/opie-mailit.control | |||
@@ -6,3 +6,3 @@ Maintainer: L.J. Potter <llornkcor@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $OPIE_VERSION-$SUB_VERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Description: EMail | 8 | Description: EMail |
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp index 52237f5..022d938 100644 --- a/noncore/unsupported/qpdf/QOutputDev.cpp +++ b/noncore/unsupported/qpdf/QOutputDev.cpp | |||
@@ -121,3 +121,3 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp | |||
121 | gfxFont-> isCIDFont ( ), | 121 | gfxFont-> isCIDFont ( ), |
122 | ( gfxFont-> getEmbeddedFontName ( ) ? gfxFont-> getEmbeddedFontName ( ) : "<n/a>" ), | 122 | ( gfxFont-> getEmbeddedFontName ( ) ? gfxFont-> getEmbeddedFontName()-> getCString ( ) : "<n/a>" ), |
123 | (double) m11, (double) m12, (double) m21, (double) m22 )); | 123 | (double) m11, (double) m12, (double) m21, (double) m22 )); |
@@ -217,6 +217,13 @@ void QOutputDev::endPage ( ) | |||
217 | { | 217 | { |
218 | QPDFDBG( printf("End page\n") ); | ||
218 | m_text-> coalesce ( ); | 219 | m_text-> coalesce ( ); |
219 | 220 | ||
221 | /* | ||
222 | * I get stupid crashes after endPage is called and then we do clipping | ||
223 | * and other stuff..... | ||
224 | */ | ||
225 | #if 0 | ||
220 | delete m_painter; | 226 | delete m_painter; |
221 | m_painter = 0; | 227 | m_painter = 0; |
228 | #endif | ||
222 | 229 | ||
@@ -246,2 +253,5 @@ void QOutputDev::saveState ( GfxState */*state*/ ) | |||
246 | { | 253 | { |
254 | if ( ! m_painter ) | ||
255 | return; | ||
256 | |||
247 | QPDFDBG( printf ( "SAVE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( ))); | 257 | QPDFDBG( printf ( "SAVE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( ))); |
@@ -253,2 +263,5 @@ void QOutputDev::restoreState ( GfxState */*state*/ ) | |||
253 | { | 263 | { |
264 | if( ! m_painter ) | ||
265 | return; | ||
266 | |||
254 | m_painter-> restore ( ); | 267 | m_painter-> restore ( ); |
@@ -523,3 +536,3 @@ void QOutputDev::doClip ( GfxState *state, bool winding ) | |||
523 | 536 | ||
524 | if ( m_painter-> hasClipping ( )) | 537 | if ( m_painter && m_painter-> hasClipping ( )) |
525 | region &= m_painter-> clipRegion ( ); | 538 | region &= m_painter-> clipRegion ( ); |
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control index 33df3e1..208dcb1 100644 --- a/noncore/unsupported/qpdf/opie-qpdf.control +++ b/noncore/unsupported/qpdf/opie-qpdf.control | |||
@@ -6,4 +6,4 @@ Maintainer: Robert Griebl <sandman@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, gzip | 7 | Depends: task-opie-minimal, gzip |
9 | Description: A PDF viewer for OPIE. | 8 | Description: A PDF viewer for OPIE. |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp index 61f097b..de1dcf3 100644 --- a/noncore/unsupported/qpdf/qpdf.cpp +++ b/noncore/unsupported/qpdf/qpdf.cpp | |||