[Libreoffice-commits] core.git: Changes to 'feature/cairocanvas'

[Michael Meeks]

New branch 'feature/cairocanvas' available with the following commits:
commit f16f8b29b262f455f7b587389eec843ab88e6578
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jun 10 17:02:06 2013 +0100

    Cairo canvas fixes
    
    + Move BitmapEx construction from an XBitmapCanvas into BitmapEx
      where (arguably) it will be easier to re-factor later, treat a
      mask fetch failure as if we have no mask
    + Teach the cairo canvas to return a non-pre-multiplied RGB +
      separate Alpha BitmapEx when it can to avoid unpleasantness with
      the underlying X resources.
    + Add tentative code-path to convert 32bit color Bitmaps into
      24bit color, to avoid confusing X
    
    Change-Id: Iaf6998c796aea6d73c57bed2bc03152d9636d5f5
    
    Conflicts:
    	vcl/source/gdi/gdimtf.cxx

commit 064785c2938ef146bec2098da1b53ce4b6675d01
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Apr 29 00:00:00 2013 +0200

    Fix bnc#795857 Use correct sizes for EMF+ bitmap rendering
    
    Fix pdf export wrong size issues for embedded EMF+ images.
    
    Change-Id: I998c9535bde32fc9f452d61d7cb7609c95f5528d
    (cherry picked from commit 4c676625d4016d428e9becd5512b7cfc8b0c4b24)
    
    Conflicts:
    	vcl/inc/vcl/gdimtf.hxx
    	vcl/source/gdi/gdimtf.cxx
    
    Conflicts:
    	vcl/source/gdi/gdimtf.cxx

commit 912f84eab5509d52b3cf8306183d953311887a00
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jun 10 12:34:39 2013 +0100

    Revert "fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830"
    
    This reverts commit 46e53913e9dcc84ffed8fb5f1b4959c70c7e5649.
    
    Conflicts:
    	vcl/inc/salbmp.hxx
    	vcl/source/gdi/gdimtf.cxx
    	vcl/unx/generic/gdi/salgdi2.cxx
    
    Change-Id: Ifa893b687c724ea71655aa4e084a44858695073e
    
    Conflicts:
    	vcl/inc/salbmp.hxx
    	vcl/source/gdi/gdimtf.cxx

commit 896725acf9bd4ead032eacfb32400378dffd1e57
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jun 10 12:24:10 2013 +0100

    Revert "pass argb32 pixmaps from vcl to canvas, avoiding costly x11 ...
    
    This reverts commit 22f63477a3300d474c3d6832232b888f75c7290c.
    
    Conflicts:
    	canvas/source/cairo/cairo_canvasbitmap.cxx
    
    Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316