[Libreoffice-commits] core.git: Branch 'feature/image_rework' - svtools/source

2014-10-27 Thread Zolnai Tamás 
 svtools/source/graphic/grfmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4bb46d5d6c60428561e855b8024eb75368cf6bb
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon Oct 27 13:16:06 2014 +0100

Call assign graphic data only when graphic actually changed

Change-Id: I2ac81667a587a20917dc1bd613a51f0310f1250c

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 68c19ab..098e1f6 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -265,8 +265,8 @@ void GraphicObject::ImplAutoSwapIn()
 if( !mbAutoSwapped  mpMgr )
 mpMgr-ImplGraphicObjectWasSwappedIn( *this );
 }
+ImplAssignGraphicData();
 }
-ImplAssignGraphicData();
 }
 
 bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point rPt, Size 
rSz, const GraphicAttr* pAttr,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/image_rework' - svtools/source

2014-10-27 Thread Zolnai Tamás 
 svtools/source/graphic/grfmgr2.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e3d9dc5be1b591bedbf123bf71ec8f62d7c232b0
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon Oct 27 15:55:38 2014 +0100

Ignore the swapped in graphic, but use its size

Change-Id: I75f17ab5e55119965fcede2b220979cefc1e26ab

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index c97a043..427c312 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -205,12 +205,15 @@ void 
GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGrap
 for (size_t i = 0, n = maObjList.size(); i  n; ++i)
 {
 pObj = maObjList[i];
-if (pObj-meType == GRAPHIC_BITMAP  !pObj-IsSwappedOut()  
pObj-GetSizeBytes()  pObj != pGraphicToIgnore)
+if (pObj-meType == GRAPHIC_BITMAP  !pObj-IsSwappedOut()  
pObj-GetSizeBytes())
 {
-aCandidates.push_back(pObj);
+if( pObj != pGraphicToIgnore )
+{
+aCandidates.push_back(pObj);
+sizes.insert(std::make_pair(pObj, nSize));
+}
 size_t const nSize = pObj-GetSizeBytes();
 nUsedSize += nSize;
-sizes.insert(std::make_pair(pObj, nSize));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/image_rework' - svtools/source

2014-10-27 Thread Zolnai Tamás 
 svtools/source/graphic/grfmgr2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0b45f82dbc6a16e6f29887531951a41c15b081f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon Oct 27 16:16:04 2014 +0100

Fix build

Change-Id: Id0dbf155e6430a456c7e1d9ab1d3b892d7a724a4

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index 427c312..7f93bf9 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -207,13 +207,13 @@ void 
GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGrap
 pObj = maObjList[i];
 if (pObj-meType == GRAPHIC_BITMAP  !pObj-IsSwappedOut()  
pObj-GetSizeBytes())
 {
+size_t const nSize = pObj-GetSizeBytes();
+nUsedSize += nSize;
 if( pObj != pGraphicToIgnore )
 {
 aCandidates.push_back(pObj);
 sizes.insert(std::make_pair(pObj, nSize));
 }
-size_t const nSize = pObj-GetSizeBytes();
-nUsedSize += nSize;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits