Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4265f28d
Kaydet (Commit)
4265f28d
authored
Şub 26, 2011
tarafından
Mathias Bauer
Kaydeden (comit)
Bjoern Michaelsen
Haz 16, 2011
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
CWS gnumake4: convert basebmp to new build system [hg:a0f3dc4a5f5a]
üst
77de797f
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
190 additions
and
104 deletions
+190
-104
Library_basebmp.mk
basebmp/Library_basebmp.mk
+35
-50
Makefile
basebmp/Makefile
+38
-0
Module_basebmp.mk
basebmp/Module_basebmp.mk
+35
-0
Package_inc.mk
basebmp/Package_inc.mk
+64
-0
bitmapdevice.hxx
basebmp/inc/basebmp/bitmapdevice.hxx
+8
-1
build.lst
basebmp/prj/build.lst
+1
-4
d.lst
basebmp/prj/d.lst
+0
-9
makefile.mk
basebmp/prj/makefile.mk
+9
-35
basebmp.flt
basebmp/util/basebmp.flt
+0
-5
No files found.
basebmp/
source/makefile
.mk
→
basebmp/
Library_basebmp
.mk
Dosyayı görüntüle @
4265f28d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2000, 201
0
Oracle and/or its affiliates.
# Copyright 2000, 201
1
Oracle and/or its affiliates.
#
#
# OpenOffice.org - a multi-platform office productivity suite
# OpenOffice.org - a multi-platform office productivity suite
#
#
...
@@ -25,52 +25,37 @@
...
@@ -25,52 +25,37 @@
#
#
#*************************************************************************
#*************************************************************************
PRJ
=
..
$/
$(eval $(call gb_Library_Library,basebmp))
PRJNAME
=
basebmp
$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc))
TARGET
=
wrapper
ENABLE_EXCEPTIONS
=
TRUE
$(eval $(call gb_Library_set_include,basebmp,\
-I$(SRCDIR)/basebmp/inc/ \
# --- Settings -----------------------------------------------------------
-I$(SRCDIR)/basebmp/inc/pch \
$$(INCLUDE) \
.INCLUDE
:
settings.mk
-I$(OUTDIR)/inc/offuh \
))
# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and
$(eval $(call gb_Library_set_defs,basebmp,\
# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS
$$(DEFS) \
#
-DBASEBMP_DLLIMPLEMENTATION \
# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters
))
# to templates - the template keyword is broken for SunCC
# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work
# add libraries to be linked to basebmp; again these names need to be given as
# reliably in some environments, and is thus not enabled)
# specified in Repository.mk
# - VIGRA_HAS_LONG_DOUBLE enables long double overloads
$(eval $(call gb_Library_add_linked_libs,basebmp,\
sal \
.IF
"$(OS)"
!=
"WNT"
basegfx \
CDEFS
+=
-DVIGRA_HAS_LONG_DOUBLE
stl \
.ENDIF
$(gb_STDLIBS) \
))
.IF
"$(OS)"
==
"SOLARIS"
&&
"$(COM)"
!=
"GCC"
CDEFS
+=
-DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER
-DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
# add all source files that shall be compiled with exceptions enabled
.ENDIF
# the name is relative to $(SRCROOT) and must not contain an extension
$(eval $(call gb_Library_add_exception_objects,basebmp,\
# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
basebmp/source/bitmapdevice \
# if compiled with default -xalias_level (and optimization level -xO3)
basebmp/source/debug \
.IF
"$(OS)"
==
"SOLARIS"
basebmp/source/polypolygonrenderer \
# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
))
.IF
"$(CCNUMVER)"
!=
"00050005"
CDEFS
+=
-xalias_level
=
compatible
# vim: set noet sw=4 ts=4:
.ENDIF
.ENDIF
# --- Common ----------------------------------------------------------
SLOFILES
=
\
$(SLO)$/
bitmapdevice.obj
\
$(SLO)$/
debug.obj
\
$(SLO)$/
polypolygonrenderer.obj
# $(SLO)$/genericintegerimageaccessor.obj \
# ==========================================================================
.INCLUDE
:
target.mk
basebmp/Makefile
0 → 100644
Dosyayı görüntüle @
4265f28d
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
ifeq
($(strip
$(SOLARENV)),)
$(error
No
environment
set!)
endif
gb_PARTIALBUILD
:=
T
GBUILDDIR
:=
$(SOLARENV)
/gbuild
include
$(GBUILDDIR)/gbuild.mk
$(eval
$(call
gb_Module_make_global_targets,$(shell
ls
$(dir
$(realpath
$(firstword
$(MAKEFILE_LIST))))/Module*.mk)))
# vim: set noet sw=4 ts=4:
basebmp/Module_basebmp.mk
0 → 100644
Dosyayı görüntüle @
4265f28d
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
$(eval $(call gb_Module_Module,basebmp))
$(eval $(call gb_Module_add_targets,basebmp,\
Library_basebmp \
Package_inc \
))
# vim: set noet sw=4 ts=4:
basebmp/Package_inc.mk
0 → 100644
Dosyayı görüntüle @
4265f28d
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
$(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/polypolygonrenderer.hxx,basebmp/polypolygonrenderer.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgb24pixelformats.hxx,basebmp/rgb24pixelformats.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgbmaskpixelformats.hxx,basebmp/rgbmaskpixelformats.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scaleimage.hxx,basebmp/scaleimage.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/stridedarrayiterator.hxx,basebmp/stridedarrayiterator.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/tools.hxx,basebmp/tools.hxx))
$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/truecolormaskaccessor.hxx,basebmp/truecolormaskaccessor.hxx))
# vim: set noet sw=4 ts=4:
basebmp/inc/basebmp/bitmapdevice.hxx
Dosyayı görüntüle @
4265f28d
...
@@ -38,6 +38,13 @@
...
@@ -38,6 +38,13 @@
#include <boost/noncopyable.hpp>
#include <boost/noncopyable.hpp>
#include <vector>
#include <vector>
#if defined BASEBMP_DLLIMPLEMENTATION
#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define BASEBMP_DLLPRIVATE SAL_DLLPRIVATE
namespace
basegfx
namespace
basegfx
{
{
class
B2IPoint
;
class
B2IPoint
;
...
@@ -71,7 +78,7 @@ struct ImplBitmapDevice;
...
@@ -71,7 +78,7 @@ struct ImplBitmapDevice;
works best when given as an eight bit grey bitmap. Everything else
works best when given as an eight bit grey bitmap. Everything else
is accepted, but potentially slow.
is accepted, but potentially slow.
*/
*/
class
BitmapDevice
:
public
boost
::
enable_shared_from_this
<
BitmapDevice
>
,
class
B
ASEBMP_DLLPUBLIC
B
itmapDevice
:
public
boost
::
enable_shared_from_this
<
BitmapDevice
>
,
private
boost
::
noncopyable
private
boost
::
noncopyable
{
{
public
:
public
:
...
...
basebmp/prj/build.lst
Dosyayı görüntüle @
4265f28d
bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL
bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL
bx basebmp usr1 - all bx_mkout NULL
bx basebmp\prj nmake - all bx_prj NULL
bx basebmp\source nmake - all bx_source NULL
bx basebmp\util nmake - all bx_util bx_source NULL
bx basebmp\test nmake - all bx_test bx_util NULL
basebmp/prj/d.lst
Dosyayı görüntüle @
4265f28d
..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib
..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll
..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.*
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
mkdir: %_DEST%\inc%_EXT%\basebmp
..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx
basebmp/
util
/makefile.mk
→
basebmp/
prj
/makefile.mk
Dosyayı görüntüle @
4265f28d
...
@@ -26,41 +26,15 @@
...
@@ -26,41 +26,15 @@
#*************************************************************************
#*************************************************************************
PRJ
=
..
PRJ
=
..
TARGET
=
prj
PRJNAME
=
basebmp
.INCLUDE
:
settings.mk
TARGET
=
basebmp
# --- Settings ---------------------------------------------------
.IF
"$(VERBOSE)"
!=
""
VERBOSEFLAG
:=
.INCLUDE
:
settings.mk
.ELSE
VERBOSEFLAG
:=
-s
# --- Allgemein ---------------------------------------------------
.ENDIF
LIB1TARGET
=
$(SLB)$/
basebmp.lib
LIB1FILES
=
\
$(SLB)$/
wrapper.lib
SHL1TARGET
=
basebmp
$(DLLPOSTFIX)
SHL1IMPLIB
=
ibasebmp
SHL1STDLIBS
=
\
$(SALLIB)
\
$(BASEGFXLIB)
SHL1DEF
=
$(MISC)$/$(SHL1TARGET)
.def
SHL1LIBS
=
$(SLB)$/
basebmp.lib
DEF1NAME
=
$(SHL1TARGET)
DEF1DEPN
=
$(MISC)$/$(SHL1TARGET)
.flt
\
$(LIB1TARGET)
DEF1DES
=
BaseBMP
DEFLIB1NAME
=
basebmp
# --- Targets -----------------------------------------------------------
.INCLUDE
:
target.mk
$(MISC)$/$(SHL1TARGET).flt
:
makefile.mk
@$(TYPE)
$(TARGET).flt
>
$@
all
:
cd
$(PRJ)
&&
$(GNUMAKE)
$(VERBOSEFLAG)
-r
-j
$(MAXPROCESS)
$(gb_MAKETARGET)
&&
$(GNUMAKE)
$(VERBOSEFLAG)
-r
deliverlog
basebmp/util/basebmp.flt
deleted
100644 → 0
Dosyayı görüntüle @
77de797f
__CT
Impl
IMP
internal
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment