[Libreoffice-commits] core.git: 2 commits - Makefile.in vcl/source

[Norbert Thiebaud]

 Makefile.in                    |   10 +++++-----
 vcl/source/window/toolbox2.cxx |   13 -------------
 2 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 3e2f1601278b9e079230566712c40820dbd81fce
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 9 16:21:54 2014 -0600

    fast scale doubling of biptmap mess up mac retina
    
    Change-Id: Ib39dd0048266483c385551a2f8f9f9629ea2ff66

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3fc9e3e..9f6a1af 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1379,19 +1379,6 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
     {
         Image aImage(rImage);
 
-        if ( GetDPIScaleFactor() > 1)
-        {
-            BitmapEx aBitmap(aImage.GetBitmapEx());
-
-            // Some code calls this twice, so add a sanity check
-            // FIXME find out what that code is & fix accordingly
-            if (aBitmap.GetSizePixel().Width() < 32)
-            {
-                aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
-                aImage = Image(aBitmap);
-            }
-        }
-
         ImplToolItem* pItem = &mpData->m_aItems[nPos];
         // Nur wenn alles berechnet ist, mehr Aufwand treiben
         if ( !mbCalc )
commit 3047ac5c1f9966592ea1f73be919e47c7fd0db64
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Feb 8 22:08:33 2014 -0600

    Makefile.in make the initial invocation of Makefile.build a bit less ugly
    
    Change-Id: Ic25f0e379142ad8e0581598e314b5d314ee5f9e1

diff --git a/Makefile.in b/Makefile.in
index f7c06c3..29d76e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,10 @@
 .PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo
 
 MAKECMDGOALS?=all
+build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
+ $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
+ $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS))
 
 SHELL=/usr/bin/env bash
 SRCDIR := @SRC_ROOT@
@@ -217,11 +221,7 @@ build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
 ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
 	mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
 endif
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
-		$(if $(filter build check,$(MAKECMDGOALS)),all) \
-		$(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
-		$(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \
-		$(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS))
+	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
 ifeq ($(OS),IOS)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
 endif