Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Tue Feb 9 22:57:26 CET 2010.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2010-01-20 02:07:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2010-02-09 11:42:49.000000000 +0100
@@ -1,0 +2,19 @@
+Tue Feb 9 11:41:00 CET 2010 - dmueller@suse.de
+
+- relax poppler version requirement for more flexibility in
+ maintenance updates
+
+-------------------------------------------------------------------
+Thu Feb 4 11:42:00 CET 2010 - dmueller@suse.de
+
+- update to 4.4.0
+ * Critical bugfixes only over 4.3.98
+ * see http://www.kde.org/announcements/4.4/ for general overview
+
+-------------------------------------------------------------------
+Sun Jan 31 21:38:25 CET 2010 - dmueller@suse.de
+
+- update to 4.3.98
+ * see http://www.kde.org/announcements/announce-4.4-rc3.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdegraphics-4.3.95.tar.bz2
New:
----
kdegraphics-4.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.spm5sp/_old 2010-02-09 22:57:01.000000000 +0100
+++ /var/tmp/diff_new_pack.spm5sp/_new 2010-02-09 22:57:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.3.95)
+# spec file for package kdegraphics4 (Version 4.4.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -33,7 +33,7 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 4.3.95
+Version: 4.4.0
Release: 1
Source0: kdegraphics-%version.tar.bz2
Patch0: 4_4_BRANCH.diff
@@ -494,7 +494,7 @@
Obsoletes: kdegraphics3-postscript <= 3.5.1
# recommend unrar for comic book plugin (bnc#467204)
Recommends: unrar
-%requires_eq libpoppler-qt4-3
+%requires_ge libpoppler-qt4-3
Provides: kde4-okular = 4.3.0
Obsoletes: kde4-okular < 4.3.0
%kde4_runtime_requires
++++++ kdegraphics-4.3.95.tar.bz2 -> kdegraphics-4.4.0.tar.bz2 ++++++
Files old/kdegraphics-4.3.95/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.4.0/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.4.0/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.4.0/doc/kcontrol/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.4.0/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/kruler/index.cache.bz2 and new/kdegraphics-4.4.0/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.4.0/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.3.95/doc/okular/index.cache.bz2 and new/kdegraphics-4.4.0/doc/okular/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/gwenview/app/kipiinterface.cpp new/kdegraphics-4.4.0/gwenview/app/kipiinterface.cpp
--- old/kdegraphics-4.3.95/gwenview/app/kipiinterface.cpp 2009-12-31 14:27:24.000000000 +0100
+++ new/kdegraphics-4.4.0/gwenview/app/kipiinterface.cpp 2010-01-31 20:32:18.000000000 +0100
@@ -207,13 +207,13 @@
typedef QMap CategoryMap;
CategoryMap categoryMap;
- categoryMap[KIPI::ImagesPlugin] = MenuInfo("Images");
- categoryMap[KIPI::EffectsPlugin] = MenuInfo("Effects");
- categoryMap[KIPI::ToolsPlugin] = MenuInfo("Tools");
- categoryMap[KIPI::ImportPlugin] = MenuInfo("Import");
- categoryMap[KIPI::ExportPlugin] = MenuInfo("Export");
- categoryMap[KIPI::BatchPlugin] = MenuInfo("Batch Processing");
- categoryMap[KIPI::CollectionsPlugin] = MenuInfo("Collections");
+ categoryMap[KIPI::ImagesPlugin] = MenuInfo(i18nc("@title:menu", "Images"));
+ categoryMap[KIPI::EffectsPlugin] = MenuInfo(i18nc("@title:menu", "Effects"));
+ categoryMap[KIPI::ToolsPlugin] = MenuInfo(i18nc("@title:menu", "Tools"));
+ categoryMap[KIPI::ImportPlugin] = MenuInfo(i18nc("@title:menu", "Import"));
+ categoryMap[KIPI::ExportPlugin] = MenuInfo(i18nc("@title:menu", "Export"));
+ categoryMap[KIPI::BatchPlugin] = MenuInfo(i18nc("@title:menu", "Batch Processing"));
+ categoryMap[KIPI::CollectionsPlugin] = MenuInfo(i18nc("@title:menu", "Collections"));
// Fill the mActions
KIPI::PluginLoader::PluginList pluginList = d->mPluginLoader->pluginList();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/gwenview/app/mainwindow.cpp new/kdegraphics-4.4.0/gwenview/app/mainwindow.cpp
--- old/kdegraphics-4.3.95/gwenview/app/mainwindow.cpp 2010-01-20 00:21:39.000000000 +0100
+++ new/kdegraphics-4.4.0/gwenview/app/mainwindow.cpp 2010-01-31 20:32:18.000000000 +0100
@@ -422,8 +422,8 @@
InfoContextManagerItem* infoItem = new InfoContextManagerItem(mContextManager);
mContextManager->addItem(infoItem);
- SemanticInfoContextManagerItem* semanticInfoItem = 0;
#ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
+ SemanticInfoContextManagerItem* semanticInfoItem = 0;
// When using Nepomuk, create a SemanticInfoContextManagerItem instance
// only if Nepomuk is available
// When using Fake backend always create it
@@ -434,10 +434,10 @@
#ifdef GWENVIEW_SEMANTICINFO_BACKEND_NEPOMUK
}
#endif
- #endif
if (semanticInfoItem) {
mContextManager->addItem(semanticInfoItem);
}
+ #endif
ImageOpsContextManagerItem* imageOpsItem =
new ImageOpsContextManagerItem(mContextManager, mWindow);
@@ -457,9 +457,11 @@
page = new SideBarPage(i18n("Information"));
page->setObjectName("information");
page->addWidget(infoItem->widget());
+ #ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
if (semanticInfoItem) {
page->addWidget(semanticInfoItem->widget());
}
+ #endif
page->addStretch();
mSideBar->addPage(page);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/gwenview/importer/gwenview_importer.desktop new/kdegraphics-4.4.0/gwenview/importer/gwenview_importer.desktop
--- old/kdegraphics-4.3.95/gwenview/importer/gwenview_importer.desktop 2010-01-20 00:21:39.000000000 +0100
+++ new/kdegraphics-4.4.0/gwenview/importer/gwenview_importer.desktop 2010-02-04 10:32:50.000000000 +0100
@@ -17,15 +17,19 @@
Name[en_GB]=Download Photos with Gwenview
Name[es]=Descargar fotos con Gwenview
Name[et]=Fotode allalaadimine Gwenview'ga
+Name[fr]=Télécharger des photos avec Gwenview
Name[gl]=Decargar fotos con Gwenview
-Name[hr]=Preuzmi fotografije kroz Gwenview
+Name[hr]=Preuzmi fotografije Gwenviewom
Name[is]=Hala niður myndum með Gwenview
+Name[it]=Scarica foto con Gwenview
Name[ja]=Gwenview で写真をダウンロード
+Name[km]=ទាញយករូបថតដោយប្រើ Gwenview
Name[ko]=Gwenview로 사진 가져오기
Name[lv]=Ielādēt fotogrāfijas ar Gwenview
Name[nb]=Last ned fotografier med Gwenview
Name[nds]=Fotos mit Gwenview daalladen
Name[nl]=Foto's met Gwenview downloaden
+Name[pa]=ਜੀਵੀਨ-ਵਿਊ ਨਾਲ ਫੋਟੋ ਡਾਊਨਲੋਡ ਕਰੋ
Name[pt]=Obter as Fotografias com o Gwenview
Name[pt_BR]=Transferir as fotos com o Gwenview
Name[sk]=Stiahnuť fotografie pomocou Gwenview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/gwenview/lib/thumbnailview/previewitemdelegate.cpp new/kdegraphics-4.4.0/gwenview/lib/thumbnailview/previewitemdelegate.cpp
--- old/kdegraphics-4.3.95/gwenview/lib/thumbnailview/previewitemdelegate.cpp 2009-12-11 00:13:52.000000000 +0100
+++ new/kdegraphics-4.4.0/gwenview/lib/thumbnailview/previewitemdelegate.cpp 2010-01-31 20:32:18.000000000 +0100
@@ -328,10 +328,9 @@
QPoint saveButtonPosition(const QRect& itemRect) const {
- QSize frameSize = mSaveButton->sizeHint();
- int textHeight = mView->fontMetrics().height();
- int posX = itemRect.right() - CONTEXTBAR_MARGIN - frameSize.width();
- int posY = itemRect.bottom() - CONTEXTBAR_MARGIN - textHeight - frameSize.height();
+ QSize buttonSize = mSaveButton->sizeHint();
+ int posX = itemRect.right() - buttonSize.width();
+ int posY = itemRect.top() + mThumbnailSize + 2 * ITEM_MARGIN - buttonSize.height();
return QPoint(posX, posY);
}
@@ -601,6 +600,10 @@
mRotateRightButton->setVisible(full && width >= 4 * buttonWidth);
mContextBar->adjustSize();
}
+
+ void updateViewGridSize() {
+ mView->setGridSize(QSize(itemWidth(), itemHeight()));
+ }
};
@@ -673,7 +676,7 @@
QSize PreviewItemDelegate::sizeHint( const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/ ) const {
- return QSize( d->itemWidth(), d->itemHeight() );
+ return d->mView->gridSize();
}
@@ -816,6 +819,7 @@
void PreviewItemDelegate::setThumbnailSize(int value) {
d->mThumbnailSize = value;
+ d->updateViewGridSize();
d->updateContextBar();
d->mElidedTextCache.clear();
}
@@ -856,6 +860,7 @@
void PreviewItemDelegate::setThumbnailDetails(PreviewItemDelegate::ThumbnailDetails details) {
d->mDetails = details;
+ d->updateViewGridSize();
d->mView->scheduleDelayedItemsLayout();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/gwenview/lib/thumbnailview/thumbnailview.cpp new/kdegraphics-4.4.0/gwenview/lib/thumbnailview/thumbnailview.cpp
--- old/kdegraphics-4.3.95/gwenview/lib/thumbnailview/thumbnailview.cpp 2009-12-31 14:27:25.000000000 +0100
+++ new/kdegraphics-4.4.0/gwenview/lib/thumbnailview/thumbnailview.cpp 2010-01-31 20:32:18.000000000 +0100
@@ -56,9 +56,6 @@
#define LOG(x) ;
#endif
-/** How many pixels between items */
-const int SPACING = 11;
-
/** How many msec to wait before starting to smooth thumbnails */
const int SMOOTH_DELAY = 500;
@@ -264,11 +261,14 @@
, d(new ThumbnailViewPrivate) {
d->that = this;
d->mThumbnailViewHelper = 0;
+ // Init to some stupid value so that the first call to setThumbnailSize()
+ // is not ignored (do not use 0 in case someone try to divide by
+ // mThumbnailSize...)
+ d->mThumbnailSize = 1;
setFrameShape(QFrame::NoFrame);
setViewMode(QListView::IconMode);
setResizeMode(QListView::Adjust);
- setSpacing(SPACING);
setDragEnabled(true);
setAcceptDrops(true);
setDropIndicatorShown(true);
@@ -282,11 +282,6 @@
setVerticalScrollMode(ScrollPerPixel);
setHorizontalScrollMode(ScrollPerPixel);
- // Make sure mThumbnailSize is initialized before calling setThumbnailSize,
- // since it will compare the new size with the old one
- d->mThumbnailSize = 0;
- setThumbnailSize(128);
-
d->mScheduledThumbnailGenerationTimer.setSingleShot(true);
d->mScheduledThumbnailGenerationTimer.setInterval(500);
connect(&d->mScheduledThumbnailGenerationTimer, SIGNAL(timeout()),
@@ -362,7 +357,6 @@
}
thumbnailSizeChanged(value);
- setSpacing(SPACING);
d->scheduleThumbnailGenerationForVisibleItems();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/kamera/solid_camera.desktop new/kdegraphics-4.4.0/kamera/solid_camera.desktop
--- old/kdegraphics-4.3.95/kamera/solid_camera.desktop 2010-01-20 00:21:44.000000000 +0100
+++ new/kdegraphics-4.4.0/kamera/solid_camera.desktop 2010-02-04 10:32:50.000000000 +0100
@@ -16,16 +16,20 @@
Name[en_GB]=Open with File Manager
Name[es]=Abrir con el gestor de archivos
Name[et]=Avamine failihalduriga
+Name[fr]=Ouvrir dans le gestionnaire de fichiers
Name[gl]=Abrir co xestor de ficheiros
Name[hr]=Otvori s preglednikom datoteka
Name[is]=Opna með skráastjóra
+Name[it]=Apri con il gestore dei file
Name[ja]=ファイルマネージャで開く
+Name[km]=បើកជាមួយកម្មវិធីគ្រប់គ្រងឯកសារ
Name[ko]=파일 관리자로 열기
Name[lv]=Atvērt failu pārvaldniekā
Name[nb]=Åpne med filbehandler
Name[nds]=Mit Dateipleger opmaken
Name[nl]=Openen met bestandsbeheerder
Name[nn]=Opna med filhandsamaren
+Name[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨਾਲ ਖੋਲ੍ਹੋ
Name[pt]=Abrir com o Gestor de Ficheiros
Name[pt_BR]=Abrir com o gerenciador de arquivos
Name[sk]=Otvoriť v správcovi súborov
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/kgamma/kcmkgamma/kgamma.desktop new/kdegraphics-4.4.0/kgamma/kcmkgamma/kgamma.desktop
--- old/kdegraphics-4.3.95/kgamma/kcmkgamma/kgamma.desktop 2010-01-20 00:21:40.000000000 +0100
+++ new/kdegraphics-4.4.0/kgamma/kcmkgamma/kgamma.desktop 2010-01-31 20:32:19.000000000 +0100
@@ -93,7 +93,7 @@
Name[hu]=Gamma-korrekció
Name[is]=Litatíðni (gamma)
Name[it]=Gamma
-Name[ja]=Gamma
+Name[ja]=ガンマ
Name[kk]=Гамма
Name[km]=ហ្គាម៉ា
Name[ko]=Gamma
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/kruler/kruler.notifyrc new/kdegraphics-4.4.0/kruler/kruler.notifyrc
--- old/kdegraphics-4.3.95/kruler/kruler.notifyrc 2010-01-20 00:21:45.000000000 +0100
+++ new/kdegraphics-4.4.0/kruler/kruler.notifyrc 2010-01-31 20:32:21.000000000 +0100
@@ -107,6 +107,7 @@
Name[nds]=Mit Pieltasten verschaven
Name[nl]=Verplaatst door cursortoetsen
Name[nn]=Flytta med piltastar
+Name[pa]=ਕਰਸਰ ਸਵਿੱਚ ਨਾਲ ਹਲਾਏ
Name[pl]=Przesunięto klawiszami kursora
Name[pt]=Movido pelas Teclas de Cursores
Name[pt_BR]=Movido pelas teclas de direção
@@ -168,6 +169,7 @@
Comment[nds]=Dat Lineaal warrt mit de Pieltasten pixelwies verschaven
Comment[nl]=De lineaal is pixelgewijs verplaatst met behulp van de cursortoetsen
Comment[nn]=Linjalen er flytta pikselvis med piltastane
+Comment[pa]=ਰੂਲਰ ਨੂੰ ਕਰਸਰ ਸਵਿੱਚਾਂ ਦੀ ਮੱਦਦ ਨਾਲ ਪਿਕਸਲ ਨਾਲ ਹਿਲਾਇਆ ਗਿਆ
Comment[pl]=Linijka przesunięta o zadaną ilość pikseli używając klawiszy kursora
Comment[pt]=A regra mudou de posição, ao nível do pixel, com as teclas de cursores
Comment[pt_BR]=A régua foi movida usando as teclas de direção
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/ksnapshot/ksnapshot.desktop new/kdegraphics-4.4.0/ksnapshot/ksnapshot.desktop
--- old/kdegraphics-4.3.95/ksnapshot/ksnapshot.desktop 2010-01-20 00:21:45.000000000 +0100
+++ new/kdegraphics-4.4.0/ksnapshot/ksnapshot.desktop 2010-01-31 20:32:21.000000000 +0100
@@ -59,7 +59,7 @@
GenericName[tg]=Эҷоди суратҳои экран
GenericName[th]=โปรแกรมจับภาพหน้าจอ
GenericName[tr]=Ekran Görüntüsü Yakalayıcı
-GenericName[uk]=Захоплювач екрана
+GenericName[uk]=Створення знімків вікон
GenericName[uz]=Skrinshot olish dasturi
GenericName[uz@cyrillic]=Скриншот олиш дастури
GenericName[vi]=Chương trình chụp màn hình
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/libs/libkdcraw/CMakeLists.txt new/kdegraphics-4.4.0/libs/libkdcraw/CMakeLists.txt
--- old/kdegraphics-4.3.95/libs/libkdcraw/CMakeLists.txt 2009-12-01 01:33:28.000000000 +0100
+++ new/kdegraphics-4.4.0/libs/libkdcraw/CMakeLists.txt 2010-01-31 20:32:18.000000000 +0100
@@ -74,7 +74,7 @@
MESSAGE(STATUS "CMake version (cleaned): ${VERSION_CMAKE_INFO}")
MACRO_ENSURE_VERSION("2.6.3" "${VERSION_CMAKE_INFO}" VERSION_CMAKE)
-IF(VERSION_CMAKE)
+IF(VERSION_CMAKE AND NOT MSVC)
MACRO_OPTIONAL_FIND_PACKAGE(OpenMP)
IF(OPENMP_FOUND)
MESSAGE(STATUS "OpenMP detected: LibRaw will be compiled with parallelized code.")
@@ -86,7 +86,7 @@
ELSE(VERSION_CMAKE)
MESSAGE(STATUS "CMake version too old: cannot detected OpenMP: LibRaw will not be compiled with parallelized code.")
SET(USE_OPENMP FALSE)
-ENDIF(VERSION_CMAKE)
+ENDIF(VERSION_CMAKE AND NOT MSVC)
IF(OPENMP_FOUND)
ADD_DEFINITIONS(${OpenMP_CXX_FLAGS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/CMakeLists.txt new/kdegraphics-4.4.0/okular/CMakeLists.txt
--- old/kdegraphics-4.3.95/okular/CMakeLists.txt 2009-12-31 14:27:28.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/CMakeLists.txt 2010-01-31 20:32:20.000000000 +0100
@@ -102,7 +102,7 @@
target_link_libraries(okularcore ${OKULAR_IOKIT} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_KJSAPI_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} )
-set_target_properties(okularcore PROPERTIES VERSION 1.3.0 SOVERSION 1 )
+set_target_properties(okularcore PROPERTIES VERSION 1.4.0 SOVERSION 1 )
install(TARGETS okularcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/VERSION new/kdegraphics-4.4.0/okular/VERSION
--- old/kdegraphics-4.3.95/okular/VERSION 2009-07-06 12:42:51.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/VERSION 2010-01-31 20:32:20.000000000 +0100
@@ -1 +1 @@
-okular v0.9.80
+okular v0.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/core/version.h new/kdegraphics-4.4.0/okular/core/version.h
--- old/kdegraphics-4.3.95/okular/core/version.h 2009-07-06 12:42:48.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/core/version.h 2010-01-31 20:32:19.000000000 +0100
@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_
-#define OKULAR_VERSION_STRING "0.9.80"
+#define OKULAR_VERSION_STRING "0.10"
#define OKULAR_VERSION_MAJOR 0
-#define OKULAR_VERSION_MINOR 9
-#define OKULAR_VERSION_RELEASE 80
+#define OKULAR_VERSION_MINOR 10
+#define OKULAR_VERSION_RELEASE 0
#define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
#define OKULAR_VERSION \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/chm/generator_chm.cpp new/kdegraphics-4.4.0/okular/generators/chm/generator_chm.cpp
--- old/kdegraphics-4.3.95/okular/generators/chm/generator_chm.cpp 2009-10-15 18:32:06.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/chm/generator_chm.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -36,7 +36,7 @@
"okular_chm",
"okular_chm",
ki18n( "CHM Backend" ),
- "0.1.3",
+ "0.1.4",
ki18n( "A Microsoft Windows help file renderer" ),
KAboutData::License_GPL,
ki18n( "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/chm/kio-msits/msits.protocol new/kdegraphics-4.4.0/okular/generators/chm/kio-msits/msits.protocol
--- old/kdegraphics-4.3.95/okular/generators/chm/kio-msits/msits.protocol 2010-01-20 00:21:43.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/chm/kio-msits/msits.protocol 2010-01-31 20:32:20.000000000 +0100
@@ -41,6 +41,7 @@
Description[ne]=विनहेल्प फाइल प्रदर्शन गर्नका लागि कियोस्लाभ
Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden
Description[nn]=Ein kioslave for vising av WinHelp-filer
+Description[pa]=WinHelp ਫਾਇਲਾਂ ਵੇਖਾਉਣ ਲਈ kioslave
Description[pl]=Moduł wyświetlający pliki WinHelp
Description[pt]=Um 'kioslave' para mostrar ficheiros do WinHelp
Description[pt_BR]=Um kioslave para mostrar arquivos WinHelp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/CMakeLists.txt new/kdegraphics-4.4.0/okular/generators/dvi/CMakeLists.txt
--- old/kdegraphics-4.3.95/okular/generators/dvi/CMakeLists.txt 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/CMakeLists.txt 2010-01-31 20:32:20.000000000 +0100
@@ -3,7 +3,6 @@
${CMAKE_BINARY_DIR}/okular
)
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
#add_definitions(-DDEBUG_DVIRENDERER -DDEBUG_RENDER -DDEBUG_PRESCAN -DDEBUG_PSGS -DDEBUG_FONTPOOL)
if (FREETYPE_FOUND)
@@ -50,7 +49,7 @@
kde4_add_plugin(okularGenerator_dvi ${okularGenerator_dvi_SRCS})
-target_link_libraries(okularGenerator_dvi okularcore ${KDE4_KIO_LIBS} ${MATH_LIB} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(okularGenerator_dvi okularcore ${KDE4_KIO_LIBS} ${MATH_LIB})
if (FREETYPE_FOUND)
target_link_libraries(okularGenerator_dvi ${FREETYPE_LIBRARIES})
endif (FREETYPE_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/TeXFontDefinition.cpp new/kdegraphics-4.4.0/okular/generators/dvi/TeXFontDefinition.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/TeXFontDefinition.cpp 2009-11-21 10:43:38.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/TeXFontDefinition.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -224,10 +224,10 @@
// For virtual fonts, also go through the list of referred fonts
if (flags & TeXFontDefinition::FONT_VIRTUAL) {
- Q3IntDictIterator<TeXFontDefinition> it(vf_table);
- while( it.current() ) {
- it.current()->flags |= TeXFontDefinition::FONT_IN_USE;
- ++it;
+ QHashIterator it(vf_table);
+ while( it.hasNext() ) {
+ it.next();
+ it.value()->flags |= TeXFontDefinition::FONT_IN_USE;
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/TeXFontDefinition.h new/kdegraphics-4.4.0/okular/generators/dvi/TeXFontDefinition.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/TeXFontDefinition.h 2009-11-21 10:43:38.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/TeXFontDefinition.h 2010-01-31 20:32:20.000000000 +0100
@@ -15,7 +15,7 @@
#ifndef _FONT_H
#define _FONT_H
-#include <Q3IntDict>
+#include <QHash>
#include <cstdio>
@@ -110,7 +110,7 @@
// used by (loaded) virtual fonts
macro* macrotable;
// used by (loaded) virtual fonts, list of fonts used by this vf,
- Q3IntDict<TeXFontDefinition> vf_table;
+ QHash vf_table;
// acessible by number
// used by (loaded) virtual fonts, list of fonts used by this vf
TeXFontDefinition* first_font;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/TeXFont_PK.cpp new/kdegraphics-4.4.0/okular/generators/dvi/TeXFont_PK.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/TeXFont_PK.cpp 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/TeXFont_PK.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -104,6 +104,11 @@
TeXFont_PK::~TeXFont_PK()
{
//@@@ Release bitmaps
+ for(unsigned int i=0; isourceSpecialMarker;
have_complainedAboutMissingPDF2PS = false;
- dviData = old->dviData.copy();
+ dviData = old->dviData;
filename = old->filename;
size_of_file = old->size_of_file;
@@ -207,10 +207,10 @@
// Insert font in dictionary and make sure the dictionary is big
// enough.
- if (tn_table.size()-2 <= tn_table.count())
+ if (tn_table.capacity()-2 <= tn_table.count())
// Not quite optimal. The size of the dictionary should be a
// prime for optimal performance. I don't care.
- tn_table.resize(tn_table.size()*2);
+ tn_table.reserve(tn_table.capacity()*2);
tn_table.insert(TeXnumber, fontp);
}
@@ -238,7 +238,8 @@
if (total_pages == 0)
return;
- if (page_offset.resize(total_pages+1) == false) {
+ page_offset.resize(total_pages+1);
+ if (page_offset.size() < (total_pages+1)) {
kError(kvs::dvi) << "No memory for page list!" << endl;
return;
}
@@ -273,7 +274,7 @@
errorMsg.clear();
errorCounter = 0;
- page_offset = 0;
+ page_offset.clear();
suggestedPageSize = 0;
numberOfExternalPSFiles = 0;
numberOfExternalNONPSFiles = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/dviFile.h new/kdegraphics-4.4.0/okular/generators/dvi/dviFile.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/dviFile.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/dviFile.h 2010-01-31 20:32:20.000000000 +0100
@@ -13,10 +13,9 @@
#include "bigEndianByteReader.h"
-#include <Q3IntDict>
-#include <Q3MemArray>
-#include <QIODevice>
+#include <QHash>
#include <QMap>
+#include <QVector>
class fontPool;
@@ -37,7 +36,7 @@
QString filename;
QString generatorString;
quint16 total_pages;
- Q3MemArray<quint32> page_offset;
+ QVector<quint32> page_offset;
/** Saves the DVI file. Returns true on success. */
bool saveAs(const QString &filename);
@@ -46,7 +45,7 @@
// been allocated.
quint8 * dvi_Data() {return dviData.data();}
- QIODevice::Offset size_of_file;
+ qint64 size_of_file;
QString errorMsg;
/** This field is set to zero when the DVI file is constructed, and
@@ -69,7 +68,7 @@
KDVI ensures that the user is only informed once. */
bool sourceSpecialMarker;
- Q3IntDict<TeXFontDefinition> tn_table;
+ QHash tn_table;
/** Returns the number of centimeters per DVI unit in this DVI
file. */
@@ -90,7 +89,7 @@
/** Sets new DVI data; all old data is erased. EXPERIMENTAL, use
with care. */
- void setNewData(const Q3MemArray<quint8>& newData) {dviData = newData;}
+ void setNewData(const QVector<quint8>& newData) {dviData = newData;}
/** Page numbers that appear in a DVI document need not be
ordered. Worse, page numbers need not be unique. This method
@@ -135,7 +134,7 @@
double cmPerDVIunit;
- Q3MemArray<quint8> dviData;
+ QVector<quint8> dviData;
/** Map of filenames for converted PDF files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer.h new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer.h 2009-10-15 18:32:06.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer.h 2010-01-31 20:32:20.000000000 +0100
@@ -23,8 +23,8 @@
#include
#include
#include
-#include <Q3IntDict>
-#include <Q3PointArray>
+#include <QHash>
+#include <QPolygon>
#include <QStack>
#include <QVector>
#include <QTimer>
@@ -82,7 +82,7 @@
TeXFontDefinition* fontp;
set_char_proc set_char_p;
- Q3IntDict<TeXFontDefinition>* fonttable;
+ QHash* fonttable;
TeXFontDefinition* _virtual;
};
@@ -307,7 +307,7 @@
/** Data required for handling TPIC specials */
float penWidth_in_mInch;
- Q3PointArray TPIC_path;
+ QPolygon TPIC_path;
quint16 number_of_elements_in_path;
drawinf currinf;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer_draw.cpp new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer_draw.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer_draw.cpp 2009-07-28 21:44:30.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer_draw.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -281,7 +281,7 @@
(this->*currinf.set_char_p)(ch, ch);
} else
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
- currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
+ currinf.fontp = currinf.fonttable->value(ch - FNTNUM0);
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0);
return;
@@ -502,7 +502,7 @@
case FNT1:
case FNT2:
case FNT3:
- currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->value(readUINT(ch - FNT1 + 1));
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
return;
@@ -511,7 +511,7 @@
break;
case FNT4:
- currinf.fontp = currinf.fonttable->find(readINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->value(readINT(ch - FNT1 + 1));
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer_prescan.cpp new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer_prescan.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/dviRenderer_prescan.cpp 2008-07-22 02:01:12.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/dvi/dviRenderer_prescan.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -21,7 +21,6 @@
#include
#include
-#include <Q3MemArray>
#include <QApplication>
#include <QDir>
#include <QFileInfo>
@@ -159,7 +158,7 @@
quint32 lengthOfOldSpecial = command_pointer - beginningOfSpecialCommand;
quint32 lengthOfNewSpecial = PS.length()+5;
- Q3MemArray<quint8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
+ QVector<quint8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
quint8 *commandPtrSav = command_pointer;
quint8 *endPtrSav = end_pointer;
@@ -643,7 +642,7 @@
}
if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
- currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
+ currinf.fontp = currinf.fonttable->value(ch - FNTNUM0);
if (currinf.fontp == NULL) {
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0);
return;
@@ -762,7 +761,7 @@
case FNT2:
case FNT3:
case FNT4:
- currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
+ currinf.fontp = currinf.fonttable->value(readUINT(ch - FNT1 + 1));
if (currinf.fontp == NULL)
return;
currinf.set_char_p = currinf.fontp->set_char_p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/fontEncodingPool.cpp new/kdegraphics-4.4.0/okular/generators/dvi/fontEncodingPool.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/fontEncodingPool.cpp 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/fontEncodingPool.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -16,10 +16,14 @@
fontEncodingPool::fontEncodingPool()
{}
+fontEncodingPool::~fontEncodingPool()
+{
+ qDeleteAll(dictionary);
+}
fontEncoding *fontEncodingPool::findByName(const QString &name)
{
- fontEncoding *ptr = dictionary.find( name );
+ fontEncoding *ptr = dictionary.value( name );
if (ptr == 0) {
ptr = new fontEncoding(name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/fontEncodingPool.h new/kdegraphics-4.4.0/okular/generators/dvi/fontEncodingPool.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/fontEncodingPool.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/fontEncodingPool.h 2010-01-31 20:32:20.000000000 +0100
@@ -11,7 +11,7 @@
#include "fontEncoding.h"
-#include <Q3Dict>
+#include <QHash>
class QString;
@@ -19,11 +19,12 @@
class fontEncodingPool {
public:
fontEncodingPool();
+ ~fontEncodingPool();
fontEncoding *findByName(const QString &name);
private:
- Q3Dict<fontEncoding> dictionary;
+ QHash dictionary;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/generator_dvi.cpp new/kdegraphics-4.4.0/okular/generators/dvi/generator_dvi.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/generator_dvi.cpp 2010-01-20 00:21:41.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/generator_dvi.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -52,7 +52,7 @@
"okular_dvi",
"okular_dvi",
ki18n( "DVI Backend" ),
- "0.2",
+ "0.3",
ki18n( "A DVI file renderer" ),
KAboutData::License_GPL,
ki18n( "© 2006 Luigi Toscano" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/glyph.cpp new/kdegraphics-4.4.0/okular/generators/dvi/glyph.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/glyph.cpp 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/glyph.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -12,6 +12,17 @@
#include "glyph.h"
#include "kvs_debug.h"
+bitmap::bitmap()
+{
+ bits = 0;
+}
+
+bitmap::~bitmap()
+{
+ if (bits != 0) {
+ delete bits;
+ }
+}
glyph::glyph()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/glyph.h new/kdegraphics-4.4.0/okular/generators/dvi/glyph.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/glyph.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/glyph.h 2010-01-31 20:32:20.000000000 +0100
@@ -8,6 +8,9 @@
struct bitmap {
+ bitmap();
+ ~bitmap();
+
// width and height in pixels
quint16 w, h;
// scan-line width in bytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/psgs.cpp new/kdegraphics-4.4.0/okular/generators/dvi/psgs.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/psgs.cpp 2009-08-05 11:56:00.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/dvi/psgs.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -47,7 +47,6 @@
// ======================================================
ghostscript_interface::ghostscript_interface() {
- pageList.setAutoDelete(true);
PostScriptHeaderString = new QString();
@@ -61,6 +60,7 @@
ghostscript_interface::~ghostscript_interface() {
if (PostScriptHeaderString != 0L)
delete PostScriptHeaderString;
+ qDeleteAll(pageList);
}
@@ -69,14 +69,14 @@
kDebug(kvs::dvi) << "ghostscript_interface::setPostScript( " << page << ", ... )";
#endif
- if (pageList.find(page) == 0) {
+ if (pageList.value(page) == 0) {
pageInfo *info = new pageInfo(PostScript);
// Check if dict is big enough
- if (pageList.count() > pageList.size() -2)
- pageList.resize(pageList.size()*2);
+ if (pageList.count() > pageList.capacity() -2)
+ pageList.reserve(pageList.capacity()*2);
pageList.insert(page, info);
} else
- *(pageList.find(page)->PostScriptString) = PostScript;
+ *(pageList.value(page)->PostScriptString) = PostScript;
}
@@ -93,19 +93,19 @@
kDebug(kvs::dvi) << "ghostscript_interface::setBackgroundColor( " << page << ", " << background_color << " )";
#endif
- if (pageList.find(page) == 0) {
+ if (pageList.value(page) == 0) {
pageInfo *info = new pageInfo(QString::null); //krazy:exclude=nullstrassign for old broken gcc
info->background = background_color;
if (permanent)
info->permanentBackground = background_color;
// Check if dict is big enough
- if (pageList.count() > pageList.size() -2)
- pageList.resize(pageList.size()*2);
+ if (pageList.count() > pageList.capacity() -2)
+ pageList.reserve(pageList.capacity()*2);
pageList.insert(page, info);
} else {
- pageList.find(page)->background = background_color;
+ pageList.value(page)->background = background_color;
if (permanent)
- pageList.find(page)->permanentBackground = background_color;
+ pageList.value(page)->permanentBackground = background_color;
}
}
@@ -114,10 +114,10 @@
#ifdef DEBUG_PSGS
kDebug(kvs::dvi) << "ghostscript_interface::restoreBackgroundColor( " << page << " )";
#endif
- if (pageList.find(page) == 0)
+ if (pageList.value(page) == 0)
return;
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.value(page);
info->background = info->permanentBackground;
}
@@ -129,10 +129,10 @@
kDebug(kvs::dvi) << "ghostscript_interface::getBackgroundColor( " << page << " )";
#endif
- if (pageList.find(page) == 0)
+ if (pageList.value(page) == 0)
return Qt::white;
else
- return pageList.find(page)->background;
+ return pageList.value(page)->background;
}
@@ -140,6 +140,7 @@
PostScriptHeaderString->truncate(0);
// Deletes all items, removes temporary files, etc.
+ qDeleteAll(pageList);
pageList.clear();
}
@@ -154,7 +155,7 @@
return;
}
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.value(page);
// Generate a PNG-file
// Step 1: Write the PostScriptString to a File
@@ -310,7 +311,7 @@
pixel_page_w = paint->viewport().width();
pixel_page_h = paint->viewport().height();
- pageInfo *info = pageList.find(page);
+ pageInfo *info = pageList.value(page);
// No PostScript? Then return immediately.
if ((info == 0) || (info->PostScriptString->isEmpty())) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/psgs.h new/kdegraphics-4.4.0/okular/generators/dvi/psgs.h
--- old/kdegraphics-4.3.95/okular/generators/dvi/psgs.h 2008-01-05 00:53:45.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/dvi/psgs.h 2010-01-31 20:32:20.000000000 +0100
@@ -10,10 +10,10 @@
#ifndef _PSGS_H_
#define _PSGS_H_
-#include <Q3IntDict>
#include <QApplication>
#include <QColor>
#include <QCustomEvent>
+#include <QHash>
#include <QObject>
#include <QThread>
@@ -82,7 +82,7 @@
private:
void gs_generate_graphics_file(const PageNumber& page, const QString& filename, long magnification);
- Q3IntDict<pageInfo> pageList;
+ QHash pageList;
double resolution; // in dots per inch
int pixel_page_w; // in pixels
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/dvi/vf.cpp new/kdegraphics-4.4.0/okular/generators/dvi/vf.cpp
--- old/kdegraphics-4.3.95/okular/generators/dvi/vf.cpp 2008-04-18 09:21:29.000000000 +0200
+++ new/kdegraphics-4.4.0/okular/generators/dvi/vf.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -118,10 +118,10 @@
// Insert font in dictionary and make sure the dictionary is big
// enough.
- if (vf_table.size()-2 <= vf_table.count())
+ if (vf_table.capacity()-2 <= vf_table.count())
// Not quite optimal. The size of the dictionary should be a
// prime. I don't care.
- vf_table.resize(vf_table.size()*2);
+ vf_table.reserve(vf_table.capacity()*2);
vf_table.insert(TeXnumber, newfontp);
if (first_font == NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/mobipocket/libokularGenerator_mobi.desktop new/kdegraphics-4.4.0/okular/generators/mobipocket/libokularGenerator_mobi.desktop
--- old/kdegraphics-4.3.95/okular/generators/mobipocket/libokularGenerator_mobi.desktop 2010-01-20 00:21:42.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/mobipocket/libokularGenerator_mobi.desktop 2010-01-31 20:32:20.000000000 +0100
@@ -30,6 +30,7 @@
Name[nds]=Mobipocket-Dokment
Name[nl]=Mobipocket-document
Name[nn]=Mobipocket-dokument
+Name[pa]=ਮੋਬੀਪਾਕਟ ਡੌਕੂਮੈਂਟ
Name[pl]=Dokument Mobipocket
Name[pt]=Documento do Mobipocket
Name[pt_BR]=Documento Mobipocket
@@ -75,6 +76,7 @@
Comment[nds]=Mobipocket-Hülppropgramm för Okular
Comment[nl]=Mobipocket-backend voor Okular
Comment[nn]=Mobipocket-motor for Okular
+Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਮੋਬੀਪਾਕਟ ਬੈਕਐਂਡ
Comment[pl]=Obsługa formatu Mobipocket dla Okulara
Comment[pt]=Infra-estrutura do Mobipocket para o Okular
Comment[pt_BR]=Infraestrutura Mobipocket para o Okular
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/poppler/generator_pdf.cpp new/kdegraphics-4.4.0/okular/generators/poppler/generator_pdf.cpp
--- old/kdegraphics-4.3.95/okular/generators/poppler/generator_pdf.cpp 2010-01-20 00:21:41.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/poppler/generator_pdf.cpp 2010-01-31 20:32:19.000000000 +0100
@@ -275,7 +275,7 @@
"okular_poppler",
"okular_poppler",
ki18n( "PDF Backend" ),
- "0.2.1",
+ "0.3",
ki18n( "A PDF file renderer" ),
KAboutData::License_GPL,
ki18n( "© 2005-2008 Albert Astals Cid" )
@@ -290,7 +290,7 @@
: Generator( parent, args ), pdfdoc( 0 ), ready( true ),
pixmapRequest( 0 ), docInfoDirty( true ), docSynopsisDirty( true ),
docEmbeddedFilesDirty( true ), nextFontPage( 0 ),
- dpiX( Okular::Utils::dpiX() ), dpiY( Okular::Utils::dpiY() ),
+ dpiX( 72.0 /*Okular::Utils::dpiX()*/ ), dpiY( 72.0 /*Okular::Utils::dpiY()*/ ),
synctex_scanner(0)
{
setFeature( TextExtraction );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/generators/spectre/generator_ghostview.cpp new/kdegraphics-4.4.0/okular/generators/spectre/generator_ghostview.cpp
--- old/kdegraphics-4.3.95/okular/generators/spectre/generator_ghostview.cpp 2010-01-06 17:59:16.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/generators/spectre/generator_ghostview.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -39,7 +39,7 @@
"okular_ghostview",
"okular_ghostview",
ki18n( "PS Backend" ),
- "0.1.2",
+ "0.1.4",
ki18n( "A PostScript file renderer." ),
KAboutData::License_GPL,
ki18n( "© 2007-2008 Albert Astals Cid" ),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/okular/part.cpp new/kdegraphics-4.4.0/okular/part.cpp
--- old/kdegraphics-4.3.95/okular/part.cpp 2009-12-31 14:27:28.000000000 +0100
+++ new/kdegraphics-4.4.0/okular/part.cpp 2010-01-31 20:32:20.000000000 +0100
@@ -612,6 +612,9 @@
if ( m_embedMode != PrintPreviewMode )
unsetDummyMode();
+ if ( m_embedMode == NativeShellMode )
+ m_sidebar->setAutoFillBackground( false );
+
#ifdef OKULAR_KEEP_FILE_OPEN
m_keeper = new FileKeeper();
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/thumbnailers/mobi/mobithumbnail.desktop new/kdegraphics-4.4.0/thumbnailers/mobi/mobithumbnail.desktop
--- old/kdegraphics-4.3.95/thumbnailers/mobi/mobithumbnail.desktop 2010-01-20 00:21:44.000000000 +0100
+++ new/kdegraphics-4.4.0/thumbnailers/mobi/mobithumbnail.desktop 2010-01-31 20:32:21.000000000 +0100
@@ -28,6 +28,7 @@
Name[nds]=Mobipocket-Vöransichten
Name[nl]=Mobipocket-miniatuurmaker
Name[nn]=Miniatyrbiletlaging for Mobipocket
+Name[pa]=ਮੋਬੀਪਾਕਟ ਥੰਮਨੇਲਰ
Name[pl]=Miniatury Mobipocket
Name[pt]=Miniaturas para o Mobipocket
Name[pt_BR]=Miniatura do Mobipocket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.3.95/thumbnailers/raw/rawthumbnail.desktop new/kdegraphics-4.4.0/thumbnailers/raw/rawthumbnail.desktop
--- old/kdegraphics-4.3.95/thumbnailers/raw/rawthumbnail.desktop 2010-01-20 00:21:44.000000000 +0100
+++ new/kdegraphics-4.4.0/thumbnailers/raw/rawthumbnail.desktop 2010-01-31 20:32:21.000000000 +0100
@@ -27,6 +27,7 @@
Name[nds]=RAW-Fotokamera-Dateien
Name[nl]=Bestanden met RAW-camera-afbeelding
Name[nn]=RAW-kamerafiler
+Name[pa]=RAW ਫੋਟੋ ਕੈਮਰਾ ਫਾਇਲਾਂ
Name[pl]=Pliki RAW z aparatów cyfrowych
Name[pt]=Ficheiros de máquinas fotográficas RAW
Name[pt_BR]=Arquivos RAW de câmeras fotográficas
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org