[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-12-g09768f1
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Thu Sep 22 17:09:46 UTC 2011
The following commit has been merged in the master branch:
commit 79c7ec764e3fbed4c9e6e471bdfd3ebdb4c673e4
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Sep 21 19:54:27 2011 +0200
Update kwin_avoid_deep_vector_copies.diff from upstream's git.
---
debian/changelog | 1 +
debian/patches/kwin_avoid_deep_vector_copies.diff | 142 ++++++++++----------
2 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 537d4b3..1654e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ kdebase-workspace (4:4.7.1-0r0) UNRELEASED; urgency=low
- Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
- Remove backport_kwin_multihead_improvements.diff, applied usptream.
- Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
+ - Update kwin_avoid_deep_vector_copies.diff from upstream's git.
- Refreshed various patches to make them apply without offsets.
* Update build dependencies:
- Add libgles2-mesa-dev.
diff --git a/debian/patches/kwin_avoid_deep_vector_copies.diff b/debian/patches/kwin_avoid_deep_vector_copies.diff
index d46fd7e..4bd8f80 100644
--- a/debian/patches/kwin_avoid_deep_vector_copies.diff
+++ b/debian/patches/kwin_avoid_deep_vector_copies.diff
@@ -1,98 +1,98 @@
-From f664fbc58fb03e3dcaa2897321d90aada0b8c504 Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <mail at akhuettel.de>
-Date: Tue, 13 Sep 2011 22:39:34 +0200
-Subject: [PATCH] Backport of e142a1a142cbc8b87f021223e6abc947f456a7f9
+From e142a1a142cbc8b87f021223e6abc947f456a7f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking at gmail.com>
+Date: Thu, 8 Sep 2011 22:20:35 +0200
+Subject: [PATCH] replace non-const QVector::operator[] accesses with const
+ ::at() to avoid maaany deep vecor copies
-replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies
---
kwin/effects.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/kwin/effects.cpp b/kwin/effects.cpp
-index c9af32b..edc2927 100644
+index e0c76cb..f5863fc0 100644
--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
-@@ -156,7 +156,7 @@ void EffectsHandlerImpl::prePaintScreen( ScreenPrePaintData& data, int time )
- {
- if( current_paint_screen < loaded_effects.size())
- {
-- loaded_effects[current_paint_screen++].second->prePaintScreen( data, time );
-+ loaded_effects.at(current_paint_screen++).second->prePaintScreen( data, time );
+@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure()
+ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time)
+ {
+ if (current_paint_screen < loaded_effects.size()) {
+- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time);
++ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time);
--current_paint_screen;
- }
+ }
// no special final code
-@@ -166,7 +166,7 @@ void EffectsHandlerImpl::paintScreen( int mask, QRegion region, ScreenPaintData&
- {
- if( current_paint_screen < loaded_effects.size())
- {
-- loaded_effects[current_paint_screen++].second->paintScreen( mask, region, data );
-+ loaded_effects.at(current_paint_screen++).second->paintScreen( mask, region, data );
+@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time)
+ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data)
+ {
+ if (current_paint_screen < loaded_effects.size()) {
+- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data);
++ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data);
--current_paint_screen;
- }
- else
-@@ -177,7 +177,7 @@ void EffectsHandlerImpl::postPaintScreen()
- {
- if( current_paint_screen < loaded_effects.size())
- {
+ } else
+ scene->finalPaintScreen(mask, region, data);
+@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData&
+ void EffectsHandlerImpl::postPaintScreen()
+ {
+ if (current_paint_screen < loaded_effects.size()) {
- loaded_effects[current_paint_screen++].second->postPaintScreen();
+ loaded_effects.at(current_paint_screen++).second->postPaintScreen();
--current_paint_screen;
- }
+ }
// no special final code
-@@ -187,7 +187,7 @@ void EffectsHandlerImpl::prePaintWindow( EffectWindow* w, WindowPrePaintData& da
- {
- if( current_paint_window < loaded_effects.size())
- {
-- loaded_effects[current_paint_window++].second->prePaintWindow( w, data, time );
-+ loaded_effects.at(current_paint_window++).second->prePaintWindow( w, data, time );
+@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen()
+ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
+ {
+ if (current_paint_window < loaded_effects.size()) {
+- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time);
++ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time);
--current_paint_window;
- }
+ }
// no special final code
-@@ -197,7 +197,7 @@ void EffectsHandlerImpl::paintWindow( EffectWindow* w, int mask, QRegion region,
- {
- if( current_paint_window < loaded_effects.size())
- {
-- loaded_effects[current_paint_window++].second->paintWindow( w, mask, region, data );
-+ loaded_effects.at(current_paint_window++).second->paintWindow( w, mask, region, data );
+@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat
+ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
+ {
+ if (current_paint_window < loaded_effects.size()) {
+- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data);
++ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data);
--current_paint_window;
- }
- else
-@@ -208,7 +208,7 @@ void EffectsHandlerImpl::paintEffectFrame( EffectFrame* frame, QRegion region, d
- {
- if( current_paint_effectframe < loaded_effects.size())
- {
-- loaded_effects[current_paint_effectframe++].second->paintEffectFrame( frame, region, opacity, frameOpacity );
-+ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame( frame, region, opacity, frameOpacity );
+ } else
+ scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
+@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region,
+ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity)
+ {
+ if (current_paint_effectframe < loaded_effects.size()) {
+- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity);
++ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity);
--current_paint_effectframe;
- }
- else
-@@ -222,7 +222,7 @@ void EffectsHandlerImpl::postPaintWindow( EffectWindow* w )
- {
- if( current_paint_window < loaded_effects.size())
- {
-- loaded_effects[current_paint_window++].second->postPaintWindow( w );
-+ loaded_effects.at(current_paint_window++).second->postPaintWindow( w );
+ } else {
+ const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame);
+@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do
+ void EffectsHandlerImpl::postPaintWindow(EffectWindow* w)
+ {
+ if (current_paint_window < loaded_effects.size()) {
+- loaded_effects[current_paint_window++].second->postPaintWindow(w);
++ loaded_effects.at(current_paint_window++).second->postPaintWindow(w);
--current_paint_window;
- }
+ }
// no special final code
-@@ -240,7 +240,7 @@ void EffectsHandlerImpl::drawWindow( EffectWindow* w, int mask, QRegion region,
- {
- if( current_draw_window < loaded_effects.size())
- {
-- loaded_effects[current_draw_window++].second->drawWindow( w, mask, region, data );
-+ loaded_effects.at(current_draw_window++).second->drawWindow( w, mask, region, data );
+@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef)
+ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
+ {
+ if (current_draw_window < loaded_effects.size()) {
+- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data);
++ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data);
--current_draw_window;
- }
- else
-@@ -251,7 +251,7 @@ void EffectsHandlerImpl::buildQuads( EffectWindow* w, WindowQuadList& quadList )
- {
- if( current_build_quads < loaded_effects.size())
- {
-- loaded_effects[current_build_quads++].second->buildQuads( w, quadList );
-+ loaded_effects.at(current_build_quads++).second->buildQuads( w, quadList );
+ } else
+ scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data);
+@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W
+ void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList)
+ {
+ if (current_build_quads < loaded_effects.size()) {
+- loaded_effects[current_build_quads++].second->buildQuads(w, quadList);
++ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList);
--current_build_quads;
- }
}
+ }
--
1.7.6.3
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list