Commit Graph

24 Commits

Author SHA1 Message Date
f136890dc0 Clean up AlphaMask::CopyPixel "override" hack
...that required undefined downcasts of Bitmap objects that are not actually AlphaMasks.

Change-Id: I629f4a81d40a2a85cd877ffec13445786ef58187
2014-07-10 10:37:24 +02:00
184a00b962 loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
2014-06-09 10:10:13 +02:00
1139d618b8 handle strange brightness+contrast adjustment from msoffice (fdo#38410)
LO uses basically the formula "newpixel=(oldpixel-128)*contrast+128+brightness",
i.e. contrast is applied first. It looks like there's no "oficial" formula for this,
so a formula that applies brightness first would be ok too. MSO for some weird reason
apparently uses a formula that applies half of brightness before contrast and
half afterwards (insert funny political correctness or compromise joke here).
While the result is the same like with the LO formula if only either brightness
or contrast is adjusted, the result is different if both are involved. Just modify
the image using the MSO algorithm if this is the case.

Change-Id: I55fe8f395832685b90f024cf2f58b0797c1ba588
2014-04-18 20:53:01 +02:00
70cc2b191b First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
2014-03-26 16:39:26 +01:00
8792ec7b21 Remove visual noise from include
Conflicts:
	include/framework/preventduplicateinteraction.hxx
	include/sfx2/sfxbasecontroller.hxx
	include/sfx2/sfxbasemodel.hxx
	include/toolkit/awt/vclxtabpagemodel.hxx
	include/vcl/field.hxx
	include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 09:51:32 -06:00
381f8a5673 sal_Bool -> bool in mostly vcl module
Conflicts:
	include/vcl/settings.hxx
	svtools/source/table/tablecontrol_impl.cxx
	sw/source/core/frmedt/fecopy.cxx
	vcl/inc/canvasbitmap.hxx
	vcl/inc/headless/svpframe.hxx
	vcl/inc/unx/salframe.h
	vcl/inc/win/salframe.h
	vcl/inc/win/salprn.h
	vcl/inc/win/salvd.h
	vcl/osx/DragSource.cxx
	vcl/osx/DragSource.hxx
	vcl/osx/DropTarget.cxx
	vcl/osx/DropTarget.hxx
	vcl/osx/OSXTransferable.cxx
	vcl/osx/OSXTransferable.hxx
	vcl/osx/clipboard.cxx
	vcl/osx/clipboard.hxx
	vcl/osx/salprn.cxx
	vcl/qa/cppunit/canvasbitmaptest.cxx
	vcl/source/components/fontident.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/spinfld.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/helper/canvasbitmap.cxx
	vcl/source/window/dockwin.cxx
	vcl/unx/generic/dtrans/X11_selection.hxx
	vcl/unx/kde/UnxFilePicker.cxx
	vcl/unx/kde/UnxFilePicker.hxx
	vcl/unx/kde4/KDE4FilePicker.cxx
	vcl/unx/kde4/KDE4FilePicker.hxx
	vcl/unx/kde4/KDESalFrame.hxx

Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-28 03:19:47 -06:00
e8f8f24c84 vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
2014-02-21 12:53:51 +01:00
51a68b4992 Doxygen warnings corrected
* Doxygen spits out a lot of warnings about not being able to find
  match function signatures, etc. This is because in some headers we
  have a using namespace statement, in others it gets confused between
  ::Window and Window (!).

* Wrong use of tags:
  + Lots of @seealso - should be @see
  + Wrong usage of @overload - corrected with the right function
    signature
  + HTML tags that doxygen doesn't recognize removed

Change-Id: I1c2eed941619b8764dbfcfc5ab38027518cdf261
2014-02-05 09:14:53 +00:00
2b76184892 Revert "Doxygen warnings corrected"
This reverts commit ff8036df5c5575503dc30d255dfbe99cc637c510.

multiple build failures with namespace collisions etc

Change-Id: Ie8ac08feff518af3584a26957f07a60d95932c76
Reviewed-on: https://gerrit.libreoffice.org/7855
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-04 16:14:08 +00:00
ff8036df5c Doxygen warnings corrected
* Doxygen spits out a lot of warnings about not being able to find
  match function signatures, etc. This is because in some headers we
  have a using namespace statement, in others it gets confused between
  ::Window and Window (!).

* Wrong use of tags:
  + Lots of @seealso - should be @see
  + Wrong usage of @overload - corrected with the right function
    signature
  + HTML tags that doxygen doesn't recognize removed

Conflicts:
	include/vcl/toolbox.hxx

Change-Id: I687f45e426280d411ef3cb6d8d5993a829f2f324
Reviewed-on: https://gerrit.libreoffice.org/7725
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-04 14:39:21 +00:00
d7a4a5b268 The "source size" of a VCL bitmap is not used for anything
Thorsten thought it might have been used for to the handling of the "Original
Size" functionality originally. That seems slightly broken currently in some
use cases, and this change doesn't make it any worse. (To see the brokenness,
play with resizing an image, reloading the document, and using "Original
Size". With the right sequence of actions, LO seems to think that the
"original size" is very small (1x1 pixel perhaps).)

Change-Id: I4e0852d2b367def5bc40baf95aac273d59731eec
2013-11-01 00:18:48 +02:00
d0df04f299 fixincludeguards.sh: include/vcl
Change-Id: Iaea4396f60aeade5303bf83a4504ad62f161b83c
2013-10-23 23:22:29 +02:00
8b71607241 n#820077: Import images with duotone filter.
Also, contains implementation for a simple duotone filter.
2013-07-17 13:02:07 +05:30
c96802f0e2 Resolves: #i122418# Added workaround to not use GetBitmap on windows
(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f)

Conflicts:
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/bitmap4.cxx
	vcl/source/gdi/bitmapex.cxx

Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1
2013-06-19 12:17:19 +01:00
e0cce521f1 Resolves: #i121504# Support for alpha channel in clipboard for all systems
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)

Conflicts:
	automation/source/server/statemnt.cxx
	basic/source/runtime/methods.cxx
	canvas/source/vcl/devicehelper.cxx
	canvas/source/vcl/spritedevicehelper.cxx
	drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/tools/converters.cxx
	dtrans/source/win32/dtobj/FmtFilter.cxx
	editeng/source/items/bulitem.cxx
	extensions/source/scanner/sanedlg.cxx
	external/gcc3_specific/makefile.mk
	filter/source/graphicfilter/eos2met/eos2met.cxx
	filter/source/graphicfilter/ios2met/ios2met.cxx
	filter/source/msfilter/msdffimp.cxx
	fpicker/source/office/iodlg.cxx
	framework/source/fwe/classes/addonsoptions.cxx
	framework/source/fwe/helper/actiontriggerhelper.cxx
	sc/source/filter/excel/xiescher.cxx
	sc/source/ui/docshell/docsh.cxx
	sc/source/ui/inc/viewfunc.hxx
	sd/source/ui/app/sdxfer.cxx
	sd/source/ui/unoidl/unopage.cxx
	sd/source/ui/view/sdview3.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/linkmgr2.cxx
	sfx2/source/dialog/filedlghelper.cxx
	sfx2/source/dialog/intro.cxx
	sfx2/source/doc/docinf.cxx
	sot/inc/sot/formats.hxx
	sot/source/base/formats.cxx
	svtools/bmpmaker/bmpcore.cxx
	svtools/bmpmaker/bmpsum.cxx
	svtools/inc/svtools/transfer.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/graphic.cxx
	svtools/source/graphic/provider.cxx
	svtools/source/misc/transfer.cxx
	svx/inc/svx/xoutbmp.hxx
	svx/source/sdr/overlay/overlaymanagerbuffered.cxx
	svx/source/xoutdev/_xoutbmp.cxx
	sw/source/core/view/viewsh.cxx
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww8/ww8par.hxx
	sw/source/ui/dochdl/swdtflvr.cxx
	toolkit/source/awt/vclxbitmap.cxx
	toolkit/source/helper/vclunohelper.cxx
	vcl/Library_vcl.mk
	vcl/Package_inc.mk
	vcl/aqua/source/dtrans/DataFlavorMapping.cxx
	vcl/aqua/source/dtrans/OSXTransferable.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.hxx
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/inc/vcl/pngwrite.hxx
	vcl/inc/vcl/salbtype.hxx
	vcl/inc/vcl/wall.hxx
	vcl/source/gdi/animate.cxx
	vcl/source/gdi/bitmap2.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/bmpconv.cxx
	vcl/source/gdi/cvtsvm.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/wall.cxx

Change-Id: I79938bc412c048c3d4e64f430f216e73bec16167
2013-06-13 14:50:46 +01:00
9536e3cbb8 Resolves: #i121233# some slight corrections/enhancements
(cherry picked from commit db00dfd93ac0e215a5d71e72645790918db0e734)

Conflicts:
	vcl/inc/vcl/bitmap.hxx
	vcl/source/gdi/bitmap3.cxx

Change-Id: I1a7817a94232b3d7f1c095dd27025e4cccea348c
2013-06-12 17:16:52 +01:00
056c7b46d4 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
2013-06-11 14:41:50 +01:00
f31e6debfa A miscellaneous use of boost.
Sinc(x) is a simple function used in communications. boost
happens to use it for quaternion math. The implementation is
simple, however it looks fun to re-use the boost function
even if just to say we are using quaternion math somewhere ;).

The performance difference is not likely to be huge but JIC,
set up a specific Boost math policy to limit type promotion
with it's corresponding impact.
(cherry picked from commit d1f61b3f3564ca5421a13b77e4c7c78bb409e9e1)

Conflicts:
	vcl/inc/vcl/bitmap.hxx

Change-Id: I5f01db1688eedee25a2943ca3aa6e957b400c759
2013-05-24 18:54:38 +01:00
35aa48d80b Resolves: #i122041# Unified and centralized control for Color ValueSets
(cherry picked from commit 68e707bbc6fe23881b822e6efab8a2933343dc1a)

Conflicts:
	cui/source/inc/backgrnd.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/tpcolor.cxx
	sd/source/ui/view/drviews6.cxx
	svx/Package_inc.mk
	svx/inc/svx/colrctrl.hxx
	svx/source/sidebar/tools/ColorControl.cxx
	svx/source/tbxctrls/colorwindow.hxx
	svx/source/tbxctrls/colrctrl.cxx
	svx/source/tbxctrls/tbcontrl.cxx

Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193

Related: #i122041# Add a11y values for defining behaviour of ColorValueSets

(cherry picked from commit 401e8f2db607081e62eaaa1f08a8cd8971a3f637)

Conflicts:
	cui/source/tabpages/backgrnd.cxx
	officecfg/registry/schema/org/openoffice/Office/Common.xcs
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	svtools/inc/svtools/accessibilityoptions.hxx
	svtools/source/inc/configitems/accessibilityoptions_const.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/source/gdi/bitmap4.cxx

Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240
2013-05-20 11:33:13 +01:00
71cca07fc1 Remove old scale convolution methods from Bitmap.
Change-Id: I0265a4b4c7b2fda267eb56ef719fd6a53d49d460
2013-05-12 22:04:16 +02:00
fb6f2e1109 Resolves: #i121407# Gallery reorganizations...
and additions of new themes

(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)

Conflicts:
	extras/prj/build.lst
	extras/source/gallery/bullets/makefile.mk
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.sdv
	extras/source/gallery/gallery_system/sg2.thm
	extras/util/target.pmk
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_extra_ooo.scp
	svx/inc/galtheme.hrc
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/gallery2/galtheme.src
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/alpha.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/bitmapex.cxx

(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: If4b2397b889f914487f2135679250c175181e1df
2013-05-10 17:04:28 +01:00
abb720f423 WaE: clang warnings
Change-Id: Id18a1f1053ec55f910152440a7e7a2eea4d44b3a
2013-05-09 16:35:41 +01:00
44fb0ceeb9 Resolves: #i121233# Added bitmap scaling methods BMP_SCALE_SUPER
added from symphony, also BMP_SCALE_LANCZOS, BMP_SCALE_BICUBIC,
BMP_SCALE_BILINEAR and BMP_SCALE_BOX.

Changed defaults for internal scalings, enhanced PDF export when reduched DPI
is used, added BMP_SCALE_BESTQUALITY and BMP_SCALE_FASTESTINTERPOLATE as new
default for Bitmap::Scale

(cherry picked from commit bf734a151dc5169b65cf5d2a127e4142b765326c)

Conflicts:
	canvas/source/vcl/canvasbitmaphelper.cxx
	canvas/source/vcl/canvashelper.cxx
	sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/pdfwriter_impl2.cxx
	vcl/source/helper/canvasbitmap.cxx

(cherry picked from commit 593c86280b64d97725adde0c0a0cc4f090fb2310)

Change-Id: I41cf0a7e11bdbc6510e22e762486420995ba739b
2013-05-09 16:35:40 +01:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00