Files
libreoffice/vcl/source/gdi/bitmap4.cxx
Jan Holesovsky 67d2af6fac Merge commit 'ooo/DEV300_m101' into intm101
The following builds for me:

basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl

The rest still needs fixing ;-)

Conflicts:
	canvas/prj/build.lst
	canvas/source/cairo/cairo_textlayout.cxx
	canvas/source/directx/dx_winstuff.hxx
	canvas/source/tools/image.cxx
	canvas/source/vcl/canvashelper.cxx
	comphelper/inc/comphelper/documentconstants.hxx
	comphelper/inc/comphelper/optionalvalue.hxx
	comphelper/inc/comphelper/querydeep.hxx
	comphelper/prj/build.lst
	comphelper/qa/complex/makefile.mk
	comphelper/qa/string/test_string_noadditional.cxx
	comphelper/source/misc/componentmodule.cxx
	comphelper/source/misc/mimeconfighelper.cxx
	comphelper/source/misc/querydeep.cxx
	comphelper/source/misc/uieventslogger.cxx
	comphelper/source/property/TypeGeneration.cxx
	comphelper/test/uno_iterators/uno_iterators.cxx
	comphelper/util/makefile.mk
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	dtrans/prj/build.lst
	dtrans/source/generic/dtrans.cxx
	dtrans/source/win32/dtobj/FmtFilter.cxx
	i18npool/prj/build.lst
	i18npool/source/localedata/data/localedata_others.map
	i18npool/source/localedata/data/makefile.mk
	i18npool/source/localedata/localedata.cxx
	i18npool/source/localedata/saxparser.cxx
	i18npool/source/registerservices/registerservices.cxx
	i18npool/source/search/textsearch.cxx
	l10ntools/inc/cfgmerge.hxx
	l10ntools/inc/export.hxx
	l10ntools/inc/gsicheck.hxx
	l10ntools/inc/l10ntools/vosapp.hxx
	l10ntools/inc/tagtest.hxx
	l10ntools/inc/xmlparse.hxx
	l10ntools/layout/layoutparse.cxx
	l10ntools/layout/tralay.cxx
	l10ntools/source/cfgmerge.cxx
	l10ntools/source/export.cxx
	l10ntools/source/export2.cxx
	l10ntools/source/gsicheck.cxx
	l10ntools/source/help/HelpLinker.cxx
	l10ntools/source/lngex.cxx
	l10ntools/source/lngmerge.cxx
	l10ntools/source/merge.cxx
	l10ntools/source/tagtest.cxx
	l10ntools/source/xmlparse.cxx
	padmin/source/fontentry.cxx
	padmin/source/padialog.cxx
	padmin/source/padialog.src
	padmin/source/pamain.cxx
	rsc/inc/rscarray.hxx
	rsc/inc/rscclass.hxx
	rsc/inc/rscclobj.hxx
	rsc/inc/rsccont.hxx
	rsc/inc/rscdb.hxx
	rsc/inc/rscdef.hxx
	rsc/inc/rscmgr.hxx
	rsc/inc/rscrange.hxx
	rsc/inc/rsctop.hxx
	rsc/inc/vclrsc.hxx
	rsc/source/parser/rscdb.cxx
	rsc/source/parser/rscicpx.cxx
	rsc/source/parser/rscinit.cxx
	rsc/source/prj/start.cxx
	rsc/source/res/rscarray.cxx
	rsc/source/res/rscclass.cxx
	rsc/source/res/rscclobj.cxx
	rsc/source/res/rsccont.cxx
	rsc/source/res/rscmgr.cxx
	rsc/source/res/rscrange.cxx
	rsc/source/res/rsctop.cxx
	rsc/source/rsc/rsc.cxx
	rsc/source/tools/rscdef.cxx
	rsc/source/tools/rsctools.cxx
	sax/source/expatwrap/sax_expat.cxx
	sax/source/fastparser/facreg.cxx
	sax/source/tools/fastserializer.cxx
	sot/inc/sot/filelist.hxx
	sot/inc/sot/object.hxx
	sot/source/base/factory.cxx
	sot/source/base/filelist.cxx
	sot/source/sdstor/stg.cxx
	sot/source/sdstor/stgcache.cxx
	sot/source/sdstor/stgole.cxx
	sot/source/sdstor/stgstrms.cxx
	sot/source/sdstor/storage.cxx
	sot/source/sdstor/ucbstorage.cxx
	svl/inc/svl/cenumitm.hxx
	svl/inc/svl/cintitem.hxx
	svl/inc/svl/cntwall.hxx
	svl/inc/svl/ctypeitm.hxx
	svl/inc/svl/custritm.hxx
	svl/inc/svl/dateitem.hxx
	svl/inc/svl/filerec.hxx
	svl/inc/svl/globalnameitem.hxx
	svl/inc/svl/ilstitem.hxx
	svl/inc/svl/imageitm.hxx
	svl/inc/svl/intitem.hxx
	svl/inc/svl/itempool.hxx
	svl/inc/svl/itemset.hxx
	svl/inc/svl/lckbitem.hxx
	svl/inc/svl/poolitem.hxx
	svl/inc/svl/ptitem.hxx
	svl/inc/svl/rectitem.hxx
	svl/inc/svl/sfontitm.hxx
	svl/inc/svl/slstitm.hxx
	svl/inc/svl/srchitem.hxx
	svl/inc/svl/svarray.hxx
	svl/inc/svl/svdde.hxx
	svl/inc/svl/svstdarr.hxx
	svl/inc/svl/szitem.hxx
	svl/inc/svl/visitem.hxx
	svl/inc/svl/zforlist.hxx
	svl/inc/svl/zformat.hxx
	svl/prj/build.lst
	svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
	svl/qa/complex/ConfigItems/helper/makefile.mk
	svl/qa/makefile.mk
	svl/source/filepicker/pickerhelper.cxx
	svl/source/filerec/filerec.cxx
	svl/source/items/cenumitm.cxx
	svl/source/items/cintitem.cxx
	svl/source/items/cntwall.cxx
	svl/source/items/ctypeitm.cxx
	svl/source/items/custritm.cxx
	svl/source/items/dateitem.cxx
	svl/source/items/globalnameitem.cxx
	svl/source/items/ilstitem.cxx
	svl/source/items/imageitm.cxx
	svl/source/items/intitem.cxx
	svl/source/items/itempool.cxx
	svl/source/items/itemprop.cxx
	svl/source/items/itemset.cxx
	svl/source/items/lckbitem.cxx
	svl/source/items/poolio.cxx
	svl/source/items/poolitem.cxx
	svl/source/items/ptitem.cxx
	svl/source/items/rectitem.cxx
	svl/source/items/slstitm.cxx
	svl/source/items/srchitem.cxx
	svl/source/items/style.cxx
	svl/source/items/szitem.cxx
	svl/source/items/visitem.cxx
	svl/source/items/whiter.cxx
	svl/source/memtools/svarray.cxx
	svl/source/misc/PasswordHelper.cxx
	svl/source/misc/adrparse.cxx
	svl/source/misc/lngmisc.cxx
	svl/source/notify/brdcst.cxx
	svl/source/notify/listener.cxx
	svl/source/notify/listenerbase.cxx
	svl/source/numbers/makefile.mk
	svl/source/numbers/nbdll.cxx
	svl/source/numbers/zforfind.cxx
	svl/source/numbers/zforlist.cxx
	svl/source/numbers/zformat.cxx
	svl/source/numbers/zforscan.cxx
	svl/source/passwordcontainer/passwordcontainer.cxx
	svl/source/svdde/ddecli.cxx
	svl/source/svdde/ddeimp.hxx
	svl/source/svdde/ddemlos2.h
	svl/source/svdde/ddesvr.cxx
	svl/source/undo/undo.cxx
	svl/source/uno/registerservices.cxx
	svl/util/makefile.mk
	svtools/bmpmaker/bmpsum.cxx
	svtools/bmpmaker/g2g.cxx
	svtools/bmpmaker/makefile.mk
	svtools/inc/borderhelper.hxx
	svtools/inc/svtools/accessiblefactory.hxx
	svtools/inc/svtools/apearcfg.hxx
	svtools/inc/svtools/brwbox.hxx
	svtools/inc/svtools/ctrlbox.hxx
	svtools/inc/svtools/ctrltool.hxx
	svtools/inc/svtools/editbrowsebox.hxx
	svtools/inc/svtools/ehdl.hxx
	svtools/inc/svtools/embedhlp.hxx
	svtools/inc/svtools/filter.hxx
	svtools/inc/svtools/ivctrl.hxx
	svtools/inc/svtools/parhtml.hxx
	svtools/inc/svtools/printdlg.hxx
	svtools/inc/svtools/rtftoken.h
	svtools/inc/svtools/ruler.hxx
	svtools/inc/svtools/svicnvw.hxx
	svtools/inc/svtools/svlbitm.hxx
	svtools/inc/svtools/svlbox.hxx
	svtools/inc/svtools/svtreebx.hxx
	svtools/inc/svtools/tabbar.hxx
	svtools/inc/svtools/table/abstracttablecontrol.hxx
	svtools/inc/svtools/taskbar.hxx
	svtools/inc/svtools/textview.hxx
	svtools/inc/svtools/valueset.hxx
	svtools/source/brwbox/brwbox1.cxx
	svtools/source/brwbox/brwbox2.cxx
	svtools/source/brwbox/datwin.cxx
	svtools/source/brwbox/datwin.hxx
	svtools/source/brwbox/makefile.mk
	svtools/source/config/apearcfg.cxx
	svtools/source/config/htmlcfg.cxx
	svtools/source/config/menuoptions.cxx
	svtools/source/config/miscopt.cxx
	svtools/source/contnr/cont_pch.cxx
	svtools/source/contnr/ctrdll.cxx
	svtools/source/contnr/fileview.cxx
	svtools/source/contnr/imivctl1.cxx
	svtools/source/contnr/ivctrl.cxx
	svtools/source/contnr/makefile.mk
	svtools/source/contnr/svcontnr.src
	svtools/source/contnr/svicnvw.cxx
	svtools/source/contnr/svimpbox.cxx
	svtools/source/contnr/svimpicn.cxx
	svtools/source/contnr/svlbitm.cxx
	svtools/source/contnr/svtreebx.cxx
	svtools/source/contnr/templwin.cxx
	svtools/source/contnr/templwin.hxx
	svtools/source/control/asynclink.cxx
	svtools/source/control/ctrlbox.cxx
	svtools/source/control/ctrldll.cxx
	svtools/source/control/ctrltool.cxx
	svtools/source/control/filectrl.cxx
	svtools/source/control/filectrl.src
	svtools/source/control/headbar.cxx
	svtools/source/control/inettbc.cxx
	svtools/source/control/makefile.mk
	svtools/source/control/prgsbar.cxx
	svtools/source/control/roadmap.cxx
	svtools/source/control/ruler.cxx
	svtools/source/control/scriptedtext.cxx
	svtools/source/control/stdmenu.cxx
	svtools/source/control/tabbar.cxx
	svtools/source/control/taskbar.cxx
	svtools/source/control/taskbox.cxx
	svtools/source/control/taskmisc.cxx
	svtools/source/control/taskstat.cxx
	svtools/source/control/valueacc.cxx
	svtools/source/control/valueset.cxx
	svtools/source/dialogs/addresstemplate.cxx
	svtools/source/dialogs/addresstemplate.src
	svtools/source/dialogs/colrdlg.src
	svtools/source/dialogs/filedlg2.cxx
	svtools/source/dialogs/filedlg2.hxx
	svtools/source/dialogs/makefile.mk
	svtools/source/dialogs/printdlg.cxx
	svtools/source/dialogs/printdlg.src
	svtools/source/dialogs/propctrl.cxx
	svtools/source/dialogs/propctrl.hxx
	svtools/source/dialogs/property.cxx
	svtools/source/edit/makefile.mk
	svtools/source/edit/sychconv.cxx
	svtools/source/edit/syntaxhighlight.cxx
	svtools/source/edit/textdoc.cxx
	svtools/source/edit/texteng.cxx
	svtools/source/edit/textundo.cxx
	svtools/source/edit/textview.cxx
	svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
	svtools/source/filter.vcl/filter/dlgejpg.cxx
	svtools/source/filter.vcl/filter/dlgejpg.hxx
	svtools/source/filter.vcl/filter/dlgejpg.src
	svtools/source/filter.vcl/filter/dlgepng.cxx
	svtools/source/filter.vcl/filter/dlgepng.hxx
	svtools/source/filter.vcl/filter/dlgepng.src
	svtools/source/filter.vcl/filter/dlgexpor.cxx
	svtools/source/filter.vcl/filter/dlgexpor.hxx
	svtools/source/filter.vcl/filter/dlgexpor.src
	svtools/source/filter.vcl/filter/filter2.cxx
	svtools/source/filter.vcl/filter/makefile.mk
	svtools/source/filter.vcl/filter/sgfbram.cxx
	svtools/source/filter.vcl/filter/sgvmain.cxx
	svtools/source/filter.vcl/filter/sgvspln.cxx
	svtools/source/filter.vcl/filter/strings.src
	svtools/source/filter.vcl/jpeg/makefile.mk
	svtools/source/filter.vcl/wmf/emfwr.cxx
	svtools/source/filter.vcl/wmf/emfwr.hxx
	svtools/source/filter.vcl/wmf/enhwmf.cxx
	svtools/source/filter.vcl/wmf/winmtf.hxx
	svtools/source/filter.vcl/wmf/wmfwr.cxx
	svtools/source/filter.vcl/wmf/wmfwr.hxx
	svtools/source/graphic/grfcache.cxx
	svtools/source/graphic/grfcache.hxx
	svtools/source/graphic/grfmgr.cxx
	svtools/source/graphic/makefile.mk
	svtools/source/inc/accessibletableimp.hxx
	svtools/source/inc/svimpbox.hxx
	svtools/source/java/patchjavaerror.src
	svtools/source/misc/ehdl.cxx
	svtools/source/misc/errtxt.src
	svtools/source/misc/helpagentwindow.cxx
	svtools/source/misc/imagemgr.cxx
	svtools/source/misc/imagemgr.src
	svtools/source/misc/imageresourceaccess.cxx
	svtools/source/misc/imap.cxx
	svtools/source/misc/langtab.src
	svtools/source/misc/makefile.mk
	svtools/source/misc/svtdata.cxx
	svtools/source/misc/templatefoldercache.cxx
	svtools/source/misc/transfer2.cxx
	svtools/source/misc/undo.src
	svtools/source/plugapp/commtest.cxx
	svtools/source/plugapp/commtest.src
	svtools/source/plugapp/makefile.mk
	svtools/source/plugapp/testtool.src
	svtools/source/productregistration/productregistration.cxx
	svtools/source/svhtml/htmlkywd.cxx
	svtools/source/svhtml/parhtml.cxx
	svtools/source/svrtf/rtfkey2.cxx
	svtools/source/svrtf/rtfkeywd.cxx
	svtools/source/table/defaultinputhandler.cxx
	svtools/source/table/makefile.mk
	svtools/source/table/tablecontrol.cxx
	svtools/source/table/tablecontrol_impl.cxx
	svtools/source/table/tablecontrol_impl.hxx
	svtools/source/table/tabledatawindow.cxx
	svtools/source/table/tablegeometry.cxx
	svtools/source/table/tablegeometry.hxx
	svtools/source/toolpanel/makefile.mk
	svtools/source/toolpanel/toolpaneldrawer.cxx
	svtools/source/uno/addrtempuno.cxx
	svtools/source/uno/miscservices.cxx
	svtools/source/uno/svtxgridcontrol.cxx
	svtools/source/uno/svtxgridcontrol.hxx
	svtools/source/uno/toolboxcontroller.cxx
	svtools/source/uno/treecontrolpeer.cxx
	svtools/source/uno/unocontroltablemodel.cxx
	svtools/source/uno/unocontroltablemodel.hxx
	svtools/source/uno/unoimap.cxx
	svtools/source/urlobj/inetimg.cxx
	svtools/util/makefile.mk
	svtools/workben/browser.cxx
	svtools/workben/cui/makefile.mk
	svtools/workben/makefile.mk
	svtools/workben/stest.cxx
	svtools/workben/toolpanel/makefile.mk
	svtools/workben/urange.cxx
	toolkit/inc/toolkit/awt/vclxdevice.hxx
	toolkit/inc/toolkit/awt/vclxgraphics.hxx
	toolkit/inc/toolkit/awt/vclxwindows.hxx
	toolkit/inc/toolkit/controls/dialogcontrol.hxx
	toolkit/inc/toolkit/helper/property.hxx
	toolkit/inc/toolkit/helper/servicenames.hxx
	toolkit/inc/toolkit/helper/throbberimpl.hxx
	toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
	toolkit/source/awt/asynccallback.cxx
	toolkit/source/awt/vclxgraphics.cxx
	toolkit/source/awt/vclxtoolkit.cxx
	toolkit/source/awt/vclxwindow.cxx
	toolkit/source/awt/xsimpleanimation.cxx
	toolkit/source/awt/xthrobber.cxx
	toolkit/source/controls/dialogcontrol.cxx
	toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
	toolkit/source/controls/grid/defaultgriddatamodel.cxx
	toolkit/source/controls/grid/gridcontrol.cxx
	toolkit/source/controls/grid/initguard.hxx
	toolkit/source/controls/unocontrol.cxx
	toolkit/source/controls/unocontrolcontainer.cxx
	toolkit/source/controls/unocontrols.cxx
	toolkit/source/helper/listenermultiplexer.cxx
	toolkit/source/helper/property.cxx
	toolkit/source/helper/registerservices.cxx
	toolkit/source/helper/servicenames.cxx
	toolkit/source/helper/throbberimpl.cxx
	toolkit/source/helper/tkresmgr.cxx
	tools/StaticLibrary_ooopathutils.mk
	tools/bootstrp/addexes/makefile.mk
	tools/bootstrp/addexes2/makefile.mk
	tools/bootstrp/addexes2/mkfilt.cxx
	tools/bootstrp/command.cxx
	tools/bootstrp/cppdep.cxx
	tools/bootstrp/iserver.cxx
	tools/bootstrp/makefile.mk
	tools/bootstrp/mkcreate.cxx
	tools/bootstrp/prj.cxx
	tools/bootstrp/rscdep.cxx
	tools/bootstrp/sstring.cxx
	tools/inc/bootstrp/command.hxx
	tools/inc/bootstrp/mkcreate.hxx
	tools/inc/bootstrp/prj.hxx
	tools/inc/bootstrp/sstring.hxx
	tools/inc/tools/agapi.hxx
	tools/inc/tools/agitem.hxx
	tools/inc/tools/chapi.hxx
	tools/inc/tools/download.hxx
	tools/inc/tools/eacopier.hxx
	tools/inc/tools/fract.hxx
	tools/inc/tools/fsys.hxx
	tools/inc/tools/geninfo.hxx
	tools/inc/tools/globname.hxx
	tools/inc/tools/inetmime.hxx
	tools/inc/tools/multisel.hxx
	tools/inc/tools/poly.hxx
	tools/inc/tools/postsys.h
	tools/inc/tools/postwin.h
	tools/inc/tools/presys.h
	tools/inc/tools/prewin.h
	tools/inc/tools/pstm.hxx
	tools/inc/tools/ref.hxx
	tools/inc/tools/simplerm.hxx
	tools/inc/tools/solar.h
	tools/inc/tools/table.hxx
	tools/inc/tools/urlkeys.hxx
	tools/inc/tools/urlobj.hxx
	tools/prj/build.lst
	tools/prj/d.lst
	tools/qa/makefile.mk
	tools/source/communi/geninfo.cxx
	tools/source/debug/debug.cxx
	tools/source/fsys/dirent.cxx
	tools/source/fsys/tdir.cxx
	tools/source/fsys/unx.cxx
	tools/source/fsys/urlobj.cxx
	tools/source/generic/color.cxx
	tools/source/generic/config.cxx
	tools/source/generic/fract.cxx
	tools/source/inet/inetmime.cxx
	tools/source/memtools/multisel.cxx
	tools/source/memtools/table.cxx
	tools/source/rc/resmgr.cxx
	tools/source/ref/globname.cxx
	tools/source/ref/pstm.cxx
	tools/source/solar/solar.c
	tools/source/stream/strmos2.cxx
	tools/source/stream/strmunx.cxx
	tools/source/stream/strmwnt.cxx
	tools/source/string/makefile.mk
	tools/source/testtoolloader/testtoolloader.cxx
	tools/test/makefile.mk
	tools/util/makefile.mk
	tools/win/inc/dll.hxx
	tools/win/inc/parser.hxx
	tools/win/inc/shellex.h
	tools/win/inc/shutil.h
	tools/win/inc/toolsdll.hxx
	tools/win/inc/winshell.hxx
	tools/workben/makefile.mk
	ucbhelper/source/client/proxydecider.cxx
	ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
	unotools/inc/unotools/unotunnelhelper.hxx
	unotools/source/config/fltrcfg.cxx
	unotools/source/config/lingucfg.cxx
	unotools/source/config/misccfg.cxx
	unotools/source/config/pathoptions.cxx
	unotools/source/config/searchopt.cxx
	unotools/source/i18n/localedatawrapper.cxx
	unotools/source/ucbhelper/localfilehelper.cxx
	unotools/source/ucbhelper/ucbhelper.cxx
	unotools/source/ucbhelper/xtempfile.cxx
	vcl/aqua/inc/salbmp.h
	vcl/aqua/inc/salgdi.h
	vcl/aqua/inc/salinst.h
	vcl/aqua/source/app/salinst.cxx
	vcl/aqua/source/gdi/aquaprintaccessoryview.mm
	vcl/aqua/source/gdi/salgdi.cxx
	vcl/aqua/source/gdi/salprn.cxx
	vcl/aqua/source/window/salframeview.mm
	vcl/aqua/source/window/salobj.cxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/brdwin.hxx
	vcl/inc/vcl/button.hxx
	vcl/inc/vcl/cmdevt.hxx
	vcl/inc/vcl/cvtgrf.hxx
	vcl/inc/vcl/dialog.hxx
	vcl/inc/vcl/dockwin.hxx
	vcl/inc/vcl/event.hxx
	vcl/inc/vcl/fixed.hxx
	vcl/inc/vcl/fldunit.hxx
	vcl/inc/vcl/floatwin.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/glyphcache.hxx
	vcl/inc/vcl/graphite_adaptors.hxx
	vcl/inc/vcl/graphite_features.hxx
	vcl/inc/vcl/graphite_layout.hxx
	vcl/inc/vcl/ilstbox.hxx
	vcl/inc/vcl/image.h
	vcl/inc/vcl/imgctrl.hxx
	vcl/inc/vcl/impbmpconv.hxx
	vcl/inc/vcl/impprn.hxx
	vcl/inc/vcl/jobset.h
	vcl/inc/vcl/keycodes.hxx
	vcl/inc/vcl/lstbox.hxx
	vcl/inc/vcl/mapunit.hxx
	vcl/inc/vcl/menu.hxx
	vcl/inc/vcl/msgbox.hxx
	vcl/inc/vcl/outdev.hxx
	vcl/inc/vcl/prndlg.hxx
	vcl/inc/vcl/salatype.hxx
	vcl/inc/vcl/salbmp.hxx
	vcl/inc/vcl/salgdi.hxx
	vcl/inc/vcl/salinst.hxx
	vcl/inc/vcl/seleng.hxx
	vcl/inc/vcl/settings.hxx
	vcl/inc/vcl/smartid.hxx
	vcl/inc/vcl/status.hxx
	vcl/inc/vcl/strhelper.hxx
	vcl/inc/vcl/svapp.hxx
	vcl/inc/vcl/svdata.hxx
	vcl/inc/vcl/syschild.hxx
	vcl/inc/vcl/sysdata.hxx
	vcl/inc/vcl/taskpanelist.hxx
	vcl/inc/vcl/toolbox.hxx
	vcl/inc/vcl/vclevent.hxx
	vcl/inc/vcl/windata.hxx
	vcl/inc/vcl/window.hxx
	vcl/inc/vcl/wintypes.hxx
	vcl/os2/source/app/salinst.cxx
	vcl/os2/source/gdi/salgdi.cxx
	vcl/os2/source/window/salmenu.cxx
	vcl/os2/source/window/salobj.cxx
	vcl/prj/build.lst
	vcl/source/app/dbggui.cxx
	vcl/source/app/help.cxx
	vcl/source/app/idlemgr.cxx
	vcl/source/app/settings.cxx
	vcl/source/app/svapp.cxx
	vcl/source/app/svdata.cxx
	vcl/source/app/svmain.cxx
	vcl/source/app/svmainhook.cxx
	vcl/source/app/unohelp.cxx
	vcl/source/app/vclevent.cxx
	vcl/source/control/button.cxx
	vcl/source/control/combobox.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/field.cxx
	vcl/source/control/fixed.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/control/imgctrl.cxx
	vcl/source/control/makefile.mk
	vcl/source/control/tabctrl.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap2.cxx
	vcl/source/gdi/bitmap4.cxx
	vcl/source/gdi/bmpconv.cxx
	vcl/source/gdi/cvtsvm.cxx
	vcl/source/gdi/font.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/gdi/image.cxx
	vcl/source/gdi/impimage.cxx
	vcl/source/gdi/jobset.cxx
	vcl/source/gdi/makefile.mk
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev3.cxx
	vcl/source/gdi/outdev4.cxx
	vcl/source/gdi/outdevnative.cxx
	vcl/source/gdi/pdfwriter.cxx
	vcl/source/gdi/pdfwriter_impl.cxx
	vcl/source/gdi/print3.cxx
	vcl/source/gdi/salmisc.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/gcach_ftyp.hxx
	vcl/source/glyphs/glyphcache.cxx
	vcl/source/glyphs/graphite_cache.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/glyphs/graphite_textsrc.hxx
	vcl/source/helper/canvasbitmap.cxx
	vcl/source/helper/smartid.cxx
	vcl/source/helper/xconnection.cxx
	vcl/source/src/btntext.src
	vcl/source/src/images.src
	vcl/source/src/print.src
	vcl/source/window/accel.cxx
	vcl/source/window/accmgr.cxx
	vcl/source/window/brdwin.cxx
	vcl/source/window/btndlg.cxx
	vcl/source/window/dlgctrl.cxx
	vcl/source/window/javachild.cxx
	vcl/source/window/menu.cxx
	vcl/source/window/msgbox.cxx
	vcl/source/window/printdlg.cxx
	vcl/source/window/status.cxx
	vcl/source/window/syschild.cxx
	vcl/source/window/toolbox.cxx
	vcl/source/window/toolbox2.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window2.cxx
	vcl/source/window/wrkwin.cxx
	vcl/unx/gtk/app/gtkdata.cxx
	vcl/unx/gtk/app/gtkinst.cxx
	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
	vcl/unx/gtk/window/gtkframe.cxx
	vcl/unx/gtk/window/gtkobject.cxx
	vcl/unx/headless/svpbmp.hxx
	vcl/unx/headless/svpgdi.cxx
	vcl/unx/headless/svpgdi.hxx
	vcl/unx/headless/svpinst.cxx
	vcl/unx/headless/svpinst.hxx
	vcl/unx/headless/svpprn.cxx
	vcl/unx/headless/svpprn.hxx
	vcl/unx/headless/svppspgraphics.cxx
	vcl/unx/headless/svppspgraphics.hxx
	vcl/unx/headless/svptext.cxx
	vcl/unx/inc/dtint.hxx
	vcl/unx/inc/plugins/gtk/gtkdata.hxx
	vcl/unx/inc/pspgraphics.h
	vcl/unx/inc/salbmp.h
	vcl/unx/inc/saldata.hxx
	vcl/unx/inc/saldisp.hxx
	vcl/unx/inc/salgdi.h
	vcl/unx/inc/salinst.h
	vcl/unx/inc/xfont.hxx
	vcl/unx/kde/kdedata.cxx
	vcl/unx/kde4/KDESalGraphics.cxx
	vcl/unx/source/app/keysymnames.cxx
	vcl/unx/source/app/saldata.cxx
	vcl/unx/source/app/saldisp.cxx
	vcl/unx/source/app/salinst.cxx
	vcl/unx/source/app/wmadaptor.cxx
	vcl/unx/source/dtrans/X11_selection.cxx
	vcl/unx/source/dtrans/X11_service.cxx
	vcl/unx/source/gdi/makefile.mk
	vcl/unx/source/gdi/pspgraphics.cxx
	vcl/unx/source/gdi/salgdi.cxx
	vcl/unx/source/gdi/salgdi3.cxx
	vcl/unx/source/gdi/salprnpsp.cxx
	vcl/unx/source/gdi/xfont.cxx
	vcl/unx/source/gdi/xlfd_attr.cxx
	vcl/unx/source/gdi/xlfd_attr.hxx
	vcl/unx/source/gdi/xlfd_extd.cxx
	vcl/unx/source/gdi/xlfd_extd.hxx
	vcl/unx/source/gdi/xlfd_smpl.cxx
	vcl/unx/source/gdi/xlfd_smpl.hxx
	vcl/unx/source/printer/ppdparser.cxx
	vcl/unx/source/printer/printerinfomanager.cxx
	vcl/unx/source/window/salframe.cxx
	vcl/unx/source/window/salmenu.cxx
	vcl/unx/source/window/salobj.cxx
	vcl/util/makefile2.pmk
	vcl/win/inc/salbmp.h
	vcl/win/inc/saldata.hxx
	vcl/win/inc/salgdi.h
	vcl/win/inc/salinst.h
	vcl/win/source/app/saldata.cxx
	vcl/win/source/app/salinst.cxx
	vcl/win/source/gdi/salgdi.cxx
	vcl/win/source/gdi/salgdi3.cxx
	vcl/win/source/gdi/salprn.cxx
	vcl/win/source/gdi/winlayout.cxx
	vcl/win/source/window/salframe.cxx
	vcl/win/source/window/salobj.cxx
	vcl/workben/outdevgrind.cxx
	vos/inc/vos/execabl.hxx
	vos/inc/vos/macros.hxx
	vos/inc/vos/pipe.hxx
	vos/inc/vos/process.hxx
	vos/inc/vos/refernce.hxx
	vos/inc/vos/signal.hxx
	vos/inc/vos/socket.hxx
	vos/inc/vos/stream.hxx
	vos/inc/vos/thread.hxx
	vos/source/pipe.cxx
	vos/source/process.cxx
	vos/source/signal.cxx
	vos/source/thread.cxx
	vos/source/timer.cxx
2011-03-11 14:24:23 +01:00

1012 lines
37 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#include <stdlib.h>
#include <vcl/bmpacc.hxx>
#include <vcl/bitmap.hxx>
// -----------
// - Defines -
// -----------
#define S2(a,b) { register long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } }
#define MN3(a,b,c) S2(a,b); S2(a,c);
#define MX3(a,b,c) S2(b,c); S2(a,c);
#define MNMX3(a,b,c) MX3(a,b,c); S2(a,b);
#define MNMX4(a,b,c,d) S2(a,b); S2(c,d); S2(a,c); S2(b,d);
#define MNMX5(a,b,c,d,e) S2(a,b); S2(c,d); MN3(a,c,e); MX3(b,d,e);
#define MNMX6(a,b,c,d,e,f) S2(a,d); S2(b,e); S2(c,f); MN3(a,b,c); MX3(d,e,f);
// ----------
// - Bitmap -
// ----------
sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress )
{
sal_Bool bRet = sal_False;
switch( eFilter )
{
case( BMP_FILTER_SMOOTH ):
{
const long pSmoothMatrix[] = { 1, 2, 1, 2, 5, 2, 1, 2, 1 };
bRet = ImplConvolute3( &pSmoothMatrix[ 0 ], 17, pFilterParam, pProgress );
}
break;
case( BMP_FILTER_SHARPEN ):
{
const long pSharpenMatrix[] = { -1, -1, -1, -1, 16, -1, -1, -1, -1 };
bRet = ImplConvolute3( &pSharpenMatrix[ 0 ], 8, pFilterParam, pProgress );
}
break;
case( BMP_FILTER_REMOVENOISE ):
bRet = ImplMedianFilter( pFilterParam, pProgress );
break;
case( BMP_FILTER_SOBEL_GREY ):
bRet = ImplSobelGrey( pFilterParam, pProgress );
break;
case( BMP_FILTER_SOLARIZE ):
bRet = ImplSolarize( pFilterParam, pProgress );
break;
case( BMP_FILTER_SEPIA ):
bRet = ImplSepia( pFilterParam, pProgress );
break;
case( BMP_FILTER_MOSAIC ):
bRet = ImplMosaic( pFilterParam, pProgress );
break;
case( BMP_FILTER_EMBOSS_GREY ):
bRet = ImplEmbossGrey( pFilterParam, pProgress );
break;
case( BMP_FILTER_POPART ):
bRet = ImplPopArt( pFilterParam, pProgress );
break;
default:
OSL_FAIL( "Bitmap::Convert(): Unsupported filter" );
break;
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
sal_Bool bRet = sal_False;
if( pReadAcc )
{
Bitmap aNewBmp( GetSizePixel(), 24 );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
const long nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
BitmapColor* pColor;
long nY, nX, i, nSumR, nSumG, nSumB, nMatrixVal, nTmp;
long (*pKoeff)[ 256 ] = new long[ 9 ][ 256 ];
long* pTmp;
// create LUT of products of matrix value and possible color component values
for( nY = 0; nY < 9; nY++ )
for( nX = nTmp = 0, nMatrixVal = pMatrix[ nY ]; nX < 256; nX++, nTmp += nMatrixVal )
pKoeff[ nY ][ nX ] = nTmp;
// create column LUT
for( i = 0; i < nWidth2; i++ )
pColm[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
pColm[ nWidth + 1 ] = pColm[ nWidth ];
// create row LUT
for( i = 0; i < nHeight2; i++ )
pRows[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
pRows[ nHeight + 1 ] = pRows[ nHeight ];
// read first three rows of bitmap color
for( i = 0; i < nWidth2; i++ )
{
pColRow1[ i ] = pReadAcc->GetColor( pRows[ 0 ], pColm[ i ] );
pColRow2[ i ] = pReadAcc->GetColor( pRows[ 1 ], pColm[ i ] );
pColRow3[ i ] = pReadAcc->GetColor( pRows[ 2 ], pColm[ i ] );
}
// do convolution
for( nY = 0; nY < nHeight; )
{
for( nX = 0; nX < nWidth; nX++ )
{
// first row
nSumR = ( pTmp = pKoeff[ 0 ] )[ ( pColor = pRowTmp1 + nX )->GetRed() ];
nSumG = pTmp[ pColor->GetGreen() ];
nSumB = pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 1 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 2 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
// second row
nSumR += ( pTmp = pKoeff[ 3 ] )[ ( pColor = pRowTmp2 + nX )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 4 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 5 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
// third row
nSumR += ( pTmp = pKoeff[ 6 ] )[ ( pColor = pRowTmp3 + nX )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 7 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
nSumR += ( pTmp = pKoeff[ 8 ] )[ ( ++pColor )->GetRed() ];
nSumG += pTmp[ pColor->GetGreen() ];
nSumB += pTmp[ pColor->GetBlue() ];
// calculate destination color
pWriteAcc->SetPixel( nY, nX, BitmapColor( (sal_uInt8) MinMax( nSumR / nDivisor, 0, 255 ),
(sal_uInt8) MinMax( nSumG / nDivisor, 0, 255 ),
(sal_uInt8) MinMax( nSumB / nDivisor, 0, 255 ) ) );
}
if( ++nY < nHeight )
{
if( pRowTmp1 == pColRow1 )
pRowTmp1 = pColRow2, pRowTmp2 = pColRow3, pRowTmp3 = pColRow1;
else if( pRowTmp1 == pColRow2 )
pRowTmp1 = pColRow3, pRowTmp2 = pColRow1, pRowTmp3 = pColRow2;
else
pRowTmp1 = pColRow1, pRowTmp2 = pColRow2, pRowTmp3 = pColRow3;
for( i = 0; i < nWidth2; i++ )
pRowTmp3[ i ] = pReadAcc->GetColor( pRows[ nY + 2 ], pColm[ i ] );
}
}
delete[] pKoeff;
delete[] (sal_uInt8*) pColRow1;
delete[] (sal_uInt8*) pColRow2;
delete[] (sal_uInt8*) pColRow3;
delete[] pColm;
delete[] pRows;
aNewBmp.ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = aNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
sal_Bool bRet = sal_False;
if( pReadAcc )
{
Bitmap aNewBmp( GetSizePixel(), 24 );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
const long nWidth = pWriteAcc->Width(), nWidth2 = nWidth + 2;
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
BitmapColor* pColor;
long nY, nX, i;
long nR1, nR2, nR3, nR4, nR5, nR6, nR7, nR8, nR9;
long nG1, nG2, nG3, nG4, nG5, nG6, nG7, nG8, nG9;
long nB1, nB2, nB3, nB4, nB5, nB6, nB7, nB8, nB9;
// create column LUT
for( i = 0; i < nWidth2; i++ )
pColm[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
pColm[ nWidth + 1 ] = pColm[ nWidth ];
// create row LUT
for( i = 0; i < nHeight2; i++ )
pRows[ i ] = ( i > 0 ) ? ( i - 1 ) : 0;
pRows[ nHeight + 1 ] = pRows[ nHeight ];
// read first three rows of bitmap color
if (nHeight2 > 2)
{
for( i = 0; i < nWidth2; i++ )
{
pColRow1[ i ] = pReadAcc->GetColor( pRows[ 0 ], pColm[ i ] );
pColRow2[ i ] = pReadAcc->GetColor( pRows[ 1 ], pColm[ i ] );
pColRow3[ i ] = pReadAcc->GetColor( pRows[ 2 ], pColm[ i ] );
}
}
// do median filtering
for( nY = 0; nY < nHeight; )
{
for( nX = 0; nX < nWidth; nX++ )
{
nR1 = ( pColor = pRowTmp1 + nX )->GetRed(), nG1 = pColor->GetGreen(), nB1 = pColor->GetBlue();
nR2 = ( ++pColor )->GetRed(), nG2 = pColor->GetGreen(), nB2 = pColor->GetBlue();
nR3 = ( ++pColor )->GetRed(), nG3 = pColor->GetGreen(), nB3 = pColor->GetBlue();
nR4 = ( pColor = pRowTmp2 + nX )->GetRed(), nG4 = pColor->GetGreen(), nB4 = pColor->GetBlue();
nR5 = ( ++pColor )->GetRed(), nG5 = pColor->GetGreen(), nB5 = pColor->GetBlue();
nR6 = ( ++pColor )->GetRed(), nG6 = pColor->GetGreen(), nB6 = pColor->GetBlue();
nR7 = ( pColor = pRowTmp3 + nX )->GetRed(), nG7 = pColor->GetGreen(), nB7 = pColor->GetBlue();
nR8 = ( ++pColor )->GetRed(), nG8 = pColor->GetGreen(), nB8 = pColor->GetBlue();
nR9 = ( ++pColor )->GetRed(), nG9 = pColor->GetGreen(), nB9 = pColor->GetBlue();
MNMX6( nR1, nR2, nR3, nR4, nR5, nR6 );
MNMX5( nR7, nR2, nR3, nR4, nR5 );
MNMX4( nR8, nR2, nR3, nR4 );
MNMX3( nR9, nR2, nR3 );
MNMX6( nG1, nG2, nG3, nG4, nG5, nG6 );
MNMX5( nG7, nG2, nG3, nG4, nG5 );
MNMX4( nG8, nG2, nG3, nG4 );
MNMX3( nG9, nG2, nG3 );
MNMX6( nB1, nB2, nB3, nB4, nB5, nB6 );
MNMX5( nB7, nB2, nB3, nB4, nB5 );
MNMX4( nB8, nB2, nB3, nB4 );
MNMX3( nB9, nB2, nB3 );
// set destination color
pWriteAcc->SetPixel( nY, nX, BitmapColor( (sal_uInt8) nR2, (sal_uInt8) nG2, (sal_uInt8) nB2 ) );
}
if( ++nY < nHeight )
{
if( pRowTmp1 == pColRow1 )
pRowTmp1 = pColRow2, pRowTmp2 = pColRow3, pRowTmp3 = pColRow1;
else if( pRowTmp1 == pColRow2 )
pRowTmp1 = pColRow3, pRowTmp2 = pColRow1, pRowTmp3 = pColRow2;
else
pRowTmp1 = pColRow1, pRowTmp2 = pColRow2, pRowTmp3 = pColRow3;
for( i = 0; i < nWidth2; i++ )
pRowTmp3[ i ] = pReadAcc->GetColor( pRows[ nY + 2 ], pColm[ i ] );
}
}
delete[] (sal_uInt8*) pColRow1;
delete[] (sal_uInt8*) pColRow2;
delete[] (sal_uInt8*) pColRow3;
delete[] pColm;
delete[] pRows;
aNewBmp.ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = aNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
{
sal_Bool bRet = ImplMakeGreyscales( 256 );
if( bRet )
{
bRet = sal_False;
BitmapReadAccess* pReadAcc = AcquireReadAccess();
if( pReadAcc )
{
Bitmap aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
BitmapColor aGrey( (sal_uInt8) 0 );
const long nWidth = pWriteAcc->Width();
const long nHeight = pWriteAcc->Height();
const long nMask111 = -1, nMask121 = 0, nMask131 = 1;
const long nMask211 = -2, nMask221 = 0, nMask231 = 2;
const long nMask311 = -1, nMask321 = 0, nMask331 = 1;
const long nMask112 = 1, nMask122 = 2, nMask132 = 1;
const long nMask212 = 0, nMask222 = 0, nMask232 = 0;
const long nMask312 = -1, nMask322 = -2, nMask332 = -1;
long nGrey11, nGrey12, nGrey13;
long nGrey21, nGrey22, nGrey23;
long nGrey31, nGrey32, nGrey33;
long* pHMap = new long[ nWidth + 2 ];
long* pVMap = new long[ nHeight + 2 ];
long nX, nY, nSum1, nSum2;
// fill mapping tables
pHMap[ 0 ] = 0;
for( nX = 1; nX <= nWidth; nX++ )
pHMap[ nX ] = nX - 1;
pHMap[ nWidth + 1 ] = nWidth - 1;
pVMap[ 0 ] = 0;
for( nY = 1; nY <= nHeight; nY++ )
pVMap[ nY ] = nY - 1;
pVMap[ nHeight + 1 ] = nHeight - 1;
for( nY = 0; nY < nHeight ; nY++ )
{
nGrey11 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 0 ] ).GetIndex();
nGrey12 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 1 ] ).GetIndex();
nGrey13 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 2 ] ).GetIndex();
nGrey21 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 0 ] ).GetIndex();
nGrey22 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 1 ] ).GetIndex();
nGrey23 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 2 ] ).GetIndex();
nGrey31 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 0 ] ).GetIndex();
nGrey32 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 1 ] ).GetIndex();
nGrey33 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 2 ] ).GetIndex();
for( nX = 0; nX < nWidth; nX++ )
{
nSum1 = nSum2 = 0;
nSum1 += nMask111 * nGrey11;
nSum2 += nMask112 * nGrey11;
nSum1 += nMask121 * nGrey12;
nSum2 += nMask122 * nGrey12;
nSum1 += nMask131 * nGrey13;
nSum2 += nMask132 * nGrey13;
nSum1 += nMask211 * nGrey21;
nSum2 += nMask212 * nGrey21;
nSum1 += nMask221 * nGrey22;
nSum2 += nMask222 * nGrey22;
nSum1 += nMask231 * nGrey23;
nSum2 += nMask232 * nGrey23;
nSum1 += nMask311 * nGrey31;
nSum2 += nMask312 * nGrey31;
nSum1 += nMask321 * nGrey32;
nSum2 += nMask322 * nGrey32;
nSum1 += nMask331 * nGrey33;
nSum2 += nMask332 * nGrey33;
nSum1 = (long) sqrt( (double)( nSum1 * nSum1 + nSum2 * nSum2 ) );
aGrey.SetIndex( ~(sal_uInt8) SAL_BOUND( nSum1, 0, 255 ) );
pWriteAcc->SetPixel( nY, nX, aGrey );
if( nX < ( nWidth - 1 ) )
{
const long nNextX = pHMap[ nX + 3 ];
nGrey11 = nGrey12; nGrey12 = nGrey13; nGrey13 = pReadAcc->GetPixel( pVMap[ nY ], nNextX ).GetIndex();
nGrey21 = nGrey22; nGrey22 = nGrey23; nGrey23 = pReadAcc->GetPixel( pVMap[ nY + 1 ], nNextX ).GetIndex();
nGrey31 = nGrey32; nGrey32 = nGrey33; nGrey33 = pReadAcc->GetPixel( pVMap[ nY + 2 ], nNextX ).GetIndex();
}
}
}
delete[] pHMap;
delete[] pVMap;
aNewBmp.ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = aNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
}
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
{
sal_Bool bRet = ImplMakeGreyscales( 256 );
if( bRet )
{
bRet = sal_False;
BitmapReadAccess* pReadAcc = AcquireReadAccess();
if( pReadAcc )
{
Bitmap aNewBmp( GetSizePixel(), 8, &pReadAcc->GetPalette() );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
BitmapColor aGrey( (sal_uInt8) 0 );
const long nWidth = pWriteAcc->Width();
const long nHeight = pWriteAcc->Height();
long nGrey11, nGrey12, nGrey13;
long nGrey21, nGrey22, nGrey23;
long nGrey31, nGrey32, nGrey33;
double fAzim = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
( pFilterParam->maEmbossAngles.mnAzimuthAngle100 * 0.01 ) : 0.0 ) * F_PI180;
double fElev = ( ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_EMBOSS_GREY ) ?
( pFilterParam->maEmbossAngles.mnElevationAngle100 * 0.01 ) : 90.0 ) * F_PI180;
long* pHMap = new long[ nWidth + 2 ];
long* pVMap = new long[ nHeight + 2 ];
long nX, nY, nNx, nNy, nDotL;
const long nLx = FRound( cos( fAzim ) * cos( fElev ) * 255.0 );
const long nLy = FRound( sin( fAzim ) * cos( fElev ) * 255.0 );
const long nLz = FRound( sin( fElev ) * 255.0 );
const long nZ2 = ( ( 6 * 255 ) / 4 ) * ( ( 6 * 255 ) / 4 );
const long nNzLz = ( ( 6 * 255 ) / 4 ) * nLz;
const sal_uInt8 cLz = (sal_uInt8) SAL_BOUND( nLz, 0, 255 );
// fill mapping tables
pHMap[ 0 ] = 0;
for( nX = 1; nX <= nWidth; nX++ )
pHMap[ nX ] = nX - 1;
pHMap[ nWidth + 1 ] = nWidth - 1;
pVMap[ 0 ] = 0;
for( nY = 1; nY <= nHeight; nY++ )
pVMap[ nY ] = nY - 1;
pVMap[ nHeight + 1 ] = nHeight - 1;
for( nY = 0; nY < nHeight ; nY++ )
{
nGrey11 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 0 ] ).GetIndex();
nGrey12 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 1 ] ).GetIndex();
nGrey13 = pReadAcc->GetPixel( pVMap[ nY ], pHMap[ 2 ] ).GetIndex();
nGrey21 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 0 ] ).GetIndex();
nGrey22 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 1 ] ).GetIndex();
nGrey23 = pReadAcc->GetPixel( pVMap[ nY + 1 ], pHMap[ 2 ] ).GetIndex();
nGrey31 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 0 ] ).GetIndex();
nGrey32 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 1 ] ).GetIndex();
nGrey33 = pReadAcc->GetPixel( pVMap[ nY + 2 ], pHMap[ 2 ] ).GetIndex();
for( nX = 0; nX < nWidth; nX++ )
{
nNx = nGrey11 + nGrey21 + nGrey31 - nGrey13 - nGrey23 - nGrey33;
nNy = nGrey31 + nGrey32 + nGrey33 - nGrey11 - nGrey12 - nGrey13;
if( !nNx && !nNy )
aGrey.SetIndex( cLz );
else if( ( nDotL = nNx * nLx + nNy * nLy +nNzLz ) < 0 )
aGrey.SetIndex( 0 );
else
{
const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
aGrey.SetIndex( (sal_uInt8) SAL_BOUND( fGrey, 0, 255 ) );
}
pWriteAcc->SetPixel( nY, nX, aGrey );
if( nX < ( nWidth - 1 ) )
{
const long nNextX = pHMap[ nX + 3 ];
nGrey11 = nGrey12; nGrey12 = nGrey13; nGrey13 = pReadAcc->GetPixel( pVMap[ nY ], nNextX ).GetIndex();
nGrey21 = nGrey22; nGrey22 = nGrey23; nGrey23 = pReadAcc->GetPixel( pVMap[ nY + 1 ], nNextX ).GetIndex();
nGrey31 = nGrey32; nGrey32 = nGrey33; nGrey33 = pReadAcc->GetPixel( pVMap[ nY + 2 ], nNextX ).GetIndex();
}
}
}
delete[] pHMap;
delete[] pVMap;
aNewBmp.ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = aNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
}
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
{
sal_Bool bRet = sal_False;
BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
if( pWriteAcc )
{
const sal_uInt8 cThreshold = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SOLARIZE ) ?
pFilterParam->mcSolarGreyThreshold : 128;
if( pWriteAcc->HasPalette() )
{
const BitmapPalette& rPal = pWriteAcc->GetPalette();
for( sal_uInt16 i = 0, nCount = rPal.GetEntryCount(); i < nCount; i++ )
{
if( rPal[ i ].GetLuminance() >= cThreshold )
{
BitmapColor aCol( rPal[ i ] );
pWriteAcc->SetPaletteColor( i, aCol.Invert() );
}
}
}
else
{
BitmapColor aCol;
const long nWidth = pWriteAcc->Width();
const long nHeight = pWriteAcc->Height();
for( long nY = 0; nY < nHeight ; nY++ )
{
for( long nX = 0; nX < nWidth; nX++ )
{
aCol = pWriteAcc->GetPixel( nY, nX );
if( aCol.GetLuminance() >= cThreshold )
pWriteAcc->SetPixel( nY, nX, aCol.Invert() );
}
}
}
ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
sal_Bool bRet = sal_False;
if( pReadAcc )
{
long nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ?
pFilterParam->mcSolarGreyThreshold : 10;
const long nSepia = 10000 - 100 * SAL_BOUND( nSepiaPercent, 0, 100 );
BitmapPalette aSepiaPal( 256 );
DBG_ASSERT( nSepiaPercent <= 100, "Bitmap::ImplSepia(): sepia value out of range; defaulting to 100%" );
for( sal_uInt16 i = 0; i < 256; i++ )
{
BitmapColor& rCol = aSepiaPal[ i ];
const sal_uInt8 cSepiaValue = (sal_uInt8) ( ( nSepia * i ) / 10000 );
rCol.SetRed( (sal_uInt8) i );
rCol.SetGreen( cSepiaValue );
rCol.SetBlue( cSepiaValue );
}
Bitmap aNewBmp( GetSizePixel(), 8, &aSepiaPal );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
BitmapColor aCol( (sal_uInt8) 0 );
const long nWidth = pWriteAcc->Width();
const long nHeight = pWriteAcc->Height();
if( pReadAcc->HasPalette() )
{
for( long nY = 0; nY < nHeight ; nY++ )
{
const sal_uInt16 nPalCount = pReadAcc->GetPaletteEntryCount();
sal_uInt8* pIndexMap = new sal_uInt8[ nPalCount ];
for( sal_uInt16 i = 0; i < nPalCount; i++ )
pIndexMap[ i ] = pReadAcc->GetPaletteColor( i ).GetLuminance();
for( long nX = 0; nX < nWidth; nX++ )
{
aCol.SetIndex( pIndexMap[ pReadAcc->GetPixel( nY, nX ).GetIndex() ] );
pWriteAcc->SetPixel( nY, nX, aCol );
}
delete[] pIndexMap;
}
}
else
{
for( long nY = 0; nY < nHeight ; nY++ )
{
for( long nX = 0; nX < nWidth; nX++ )
{
aCol.SetIndex( pReadAcc->GetPixel( nY, nX ).GetLuminance() );
pWriteAcc->SetPixel( nY, nX, aCol );
}
}
}
aNewBmp.ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = aNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
}
return bRet;
}
// -----------------------------------------------------------------------------
sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ )
{
sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
pFilterParam->maMosaicTileSize.mnTileWidth : 4;
sal_uLong nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
pFilterParam->maMosaicTileSize.mnTileHeight : 4;
sal_Bool bRet = sal_False;
if( !nTileWidth )
nTileWidth = 1;
if( !nTileHeight )
nTileHeight = 1;
if( nTileWidth > 1 || nTileHeight > 1 )
{
Bitmap* pNewBmp;
BitmapReadAccess* pReadAcc;
BitmapWriteAccess* pWriteAcc;
if( GetBitCount() > 8 )
{
pNewBmp = NULL;
pReadAcc = pWriteAcc = AcquireWriteAccess();
}
else
{
pNewBmp = new Bitmap( GetSizePixel(), 24 );
pReadAcc = AcquireReadAccess();
pWriteAcc = pNewBmp->AcquireWriteAccess();
}
if( pReadAcc && pWriteAcc )
{
BitmapColor aCol;
long nWidth = pReadAcc->Width();
long nHeight = pReadAcc->Height();
long nX, nY, nX1, nX2, nY1, nY2, nSumR, nSumG, nSumB;
double fArea_1;
nY1 = 0; nY2 = nTileHeight - 1;
if( nY2 >= nHeight )
nY2 = nHeight - 1;
do
{
nX1 = 0; nX2 = nTileWidth - 1;
if( nX2 >= nWidth )
nX2 = nWidth - 1;
fArea_1 = 1.0 / ( ( nX2 - nX1 + 1 ) * ( nY2 - nY1 + 1 ) );
if( !pNewBmp )
{
do
{
for( nY = nY1, nSumR = nSumG = nSumB = 0; nY <= nY2; nY++ )
{
for( nX = nX1; nX <= nX2; nX++ )
{
aCol = pReadAcc->GetPixel( nY, nX );
nSumR += aCol.GetRed();
nSumG += aCol.GetGreen();
nSumB += aCol.GetBlue();
}
}
aCol.SetRed( (sal_uInt8) ( nSumR * fArea_1 ) );
aCol.SetGreen( (sal_uInt8) ( nSumG * fArea_1 ) );
aCol.SetBlue( (sal_uInt8) ( nSumB * fArea_1 ) );
for( nY = nY1; nY <= nY2; nY++ )
for( nX = nX1; nX <= nX2; nX++ )
pWriteAcc->SetPixel( nY, nX, aCol );
nX1 += nTileWidth; nX2 += nTileWidth;
if( nX2 >= nWidth )
{
nX2 = nWidth - 1;
fArea_1 = 1.0 / ( ( nX2 - nX1 + 1 ) * ( nY2 - nY1 + 1 ) );
}
}
while( nX1 < nWidth );
}
else
{
do
{
for( nY = nY1, nSumR = nSumG = nSumB = 0; nY <= nY2; nY++ )
{
for( nX = nX1; nX <= nX2; nX++ )
{
const BitmapColor& rCol = pReadAcc->GetPaletteColor( (sal_uInt8) pReadAcc->GetPixel( nY, nX ) );
nSumR += rCol.GetRed();
nSumG += rCol.GetGreen();
nSumB += rCol.GetBlue();
}
}
aCol.SetRed( (sal_uInt8) ( nSumR * fArea_1 ) );
aCol.SetGreen( (sal_uInt8) ( nSumG * fArea_1 ) );
aCol.SetBlue( (sal_uInt8) ( nSumB * fArea_1 ) );
for( nY = nY1; nY <= nY2; nY++ )
for( nX = nX1; nX <= nX2; nX++ )
pWriteAcc->SetPixel( nY, nX, aCol );
nX1 += nTileWidth; nX2 += nTileWidth;
if( nX2 >= nWidth )
{
nX2 = nWidth - 1;
fArea_1 = 1.0 / ( ( nX2 - nX1 + 1 ) * ( nY2 - nY1 + 1 ) );
}
}
while( nX1 < nWidth );
}
nY1 += nTileHeight; nY2 += nTileHeight;
if( nY2 >= nHeight )
nY2 = nHeight - 1;
}
while( nY1 < nHeight );
bRet = sal_True;
}
ReleaseAccess( pReadAcc );
if( pNewBmp )
{
pNewBmp->ReleaseAccess( pWriteAcc );
if( bRet )
{
const MapMode aMap( maPrefMapMode );
const Size aSize( maPrefSize );
*this = *pNewBmp;
maPrefMapMode = aMap;
maPrefSize = aSize;
}
delete pNewBmp;
}
}
else
bRet = sal_True;
return bRet;
}
// -----------------------------------------------------------------------------
struct PopArtEntry
{
sal_uInt32 mnIndex;
sal_uInt32 mnCount;
};
// ------------------------------------------------------------------------
extern "C" int __LOADONCALLAPI ImplPopArtCmpFnc( const void* p1, const void* p2 )
{
int nRet;
if( ( (PopArtEntry*) p1 )->mnCount < ( (PopArtEntry*) p2 )->mnCount )
nRet = 1;
else if( ( (PopArtEntry*) p1 )->mnCount == ( (PopArtEntry*) p2 )->mnCount )
nRet = 0;
else
nRet = -1;
return nRet;
}
// ------------------------------------------------------------------------
sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
{
sal_Bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True;
if( bRet )
{
bRet = sal_False;
BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
if( pWriteAcc )
{
const long nWidth = pWriteAcc->Width();
const long nHeight = pWriteAcc->Height();
const sal_uLong nEntryCount = 1 << pWriteAcc->GetBitCount();
sal_uLong n;
PopArtEntry* pPopArtTable = new PopArtEntry[ nEntryCount ];
for( n = 0; n < nEntryCount; n++ )
{
PopArtEntry& rEntry = pPopArtTable[ n ];
rEntry.mnIndex = (sal_uInt16) n;
rEntry.mnCount = 0;
}
// get pixel count for each palette entry
for( long nY = 0; nY < nHeight ; nY++ )
for( long nX = 0; nX < nWidth; nX++ )
pPopArtTable[ pWriteAcc->GetPixel( nY, nX ).GetIndex() ].mnCount++;
// sort table
qsort( pPopArtTable, nEntryCount, sizeof( PopArtEntry ), ImplPopArtCmpFnc );
// get last used entry
sal_uLong nFirstEntry;
sal_uLong nLastEntry = 0;
for( n = 0; n < nEntryCount; n++ )
if( pPopArtTable[ n ].mnCount )
nLastEntry = n;
// rotate palette (one entry)
const BitmapColor aFirstCol( pWriteAcc->GetPaletteColor( sal::static_int_cast<sal_uInt16>(pPopArtTable[ 0 ].mnIndex) ) );
for( nFirstEntry = 0; nFirstEntry < nLastEntry; nFirstEntry++ )
{
pWriteAcc->SetPaletteColor( sal::static_int_cast<sal_uInt16>(pPopArtTable[ nFirstEntry ].mnIndex),
pWriteAcc->GetPaletteColor( sal::static_int_cast<sal_uInt16>(pPopArtTable[ nFirstEntry + 1 ].mnIndex) ) );
}
pWriteAcc->SetPaletteColor( sal::static_int_cast<sal_uInt16>(pPopArtTable[ nLastEntry ].mnIndex), aFirstCol );
// cleanup
delete[] pPopArtTable;
ReleaseAccess( pWriteAcc );
bRet = sal_True;
}
}
return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */