[Libreoffice-commits] core.git: configure.ac vcl/source

[Khaled Hosny (via logerrit)]

 configure.ac   |4 ++--
 vcl/source/gdi/CommonSalLayout.cxx |   33 ++---
 2 files changed, 4 insertions(+), 33 deletions(-)

New commits:
commit a3bd84703ada964441c17971b5fc1ce1258b3b05
Author: Khaled Hosny 
AuthorDate: Wed Sep 7 18:04:56 2022 +0200
Commit: خالد حسني 
CommitDate: Thu Sep 8 03:35:45 2022 +0200

Require HarfBuzz 2.0.0

Released October 2018. We want to use some newer APIs than the currently
required version.

Change-Id: I85f572ad3b7155926ad36a11b3afaf08a2a11714
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139607
Tested-by: Jenkins
Reviewed-by: René Engelhard 
Reviewed-by: خالد حسني 

diff --git a/configure.ac b/configure.ac
index f9d52805053b..6f8158940266 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10878,11 +10878,11 @@ dnl 
===
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 2.0.0])
 
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.0.0])
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index aab404ebe73f..6caeca7c86a1 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -42,24 +42,6 @@
 
 #include 
 
-#if !HB_VERSION_ATLEAST(1, 1, 0)
-// Disabled Unicode compatibility decomposition, see fdo#66715
-static unsigned int unicodeDecomposeCompatibility(hb_unicode_funcs_t* 
/*ufuncs*/,
-  hb_codepoint_t  /*u*/,
-  hb_codepoint_t* 
/*decomposed*/,
-  void*   
/*user_data*/)
-{
-return 0;
-}
-
-static hb_unicode_funcs_t* getUnicodeFuncs()
-{
-static hb_unicode_funcs_t* ufuncs = 
hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
-hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, 
unicodeDecomposeCompatibility, nullptr, nullptr);
-return ufuncs;
-}
-#endif
-
 GenericSalLayout::GenericSalLayout(LogicalFontInstance )
 : m_GlyphItems(rFont)
 , mpVertGlyphs(nullptr)
@@ -309,10 +291,6 @@ bool 
GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay
 
 hb_buffer_t* pHbBuffer = hb_buffer_create();
 hb_buffer_pre_allocate(pHbBuffer, nGlyphCapacity);
-#if !HB_VERSION_ATLEAST(1, 1, 0)
-static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
-hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
-#endif
 
 const vcl::font::FontSelectPattern& rFontSelData = 
GetFont().GetFontSelectPattern();
 if (rArgs.mnFlags & SalLayoutFlags::DisableKerning)
@@ -470,10 +448,8 @@ bool 
GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay
 hb_buffer_set_cluster_level(pHbBuffer, 
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
 
 // The shapers that we want HarfBuzz to use, in the order of
-// preference. The coretext_aat shaper is available only on macOS,
-// but there is no harm in always including it, HarfBuzz will
-// ignore unavailable shapers.
-const char*const pHbShapers[] = { "graphite2", "coretext_aat", 
"ot", "fallback", nullptr };
+// preference.
+const char*const pHbShapers[] = { "graphite2", "ot", "fallback", 
nullptr };
 bool ok = hb_shape_full(pHbFont, pHbBuffer, maFeatures.data(), 
maFeatures.size(), pHbShapers);
 assert(ok);
 (void) ok;
@@ -570,13 +546,8 @@ bool 
GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay
 if (u_isUWhiteSpace(aChar))
 nGlyphFlags |= GlyphItemFlags::IS_SPACING;
 
-#if HB_VERSION_ATLEAST(1, 5, 0)
 if (hb_glyph_info_get_glyph_flags([i]) & 
HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
 nGlyphFlags |= GlyphItemFlags::IS_UNSAFE_TO_BREAK;
-#else
-// If support is not present, then always prevent breaking.
-nGlyphFlags |= GlyphItemFlags::IS_UNSAFE_TO_BREAK;
-#endif
 
 #if HB_VERSION_ATLEAST(5, 1, 0)
 if (hb_glyph_info_get_glyph_flags([i]) & 
HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL)

[Libreoffice-commits] core.git: configure.ac vcl/source vcl/win

[Libreoffice Gerrit user]

 configure.ac  |2 +-
 vcl/source/outdev/polygon.cxx |2 +-
 vcl/win/gdi/gdiimpl.cxx   |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5be9451b9be4f71e18aeaadf9e9553d560a1710d
Author: Andrea Gelmini 
AuthorDate: Thu Sep 13 12:49:41 2018 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 13 14:47:12 2018 +0200

Fix typos

Change-Id: I1ee620200a285936159fed57d0cbbf5320e7d3ec
Reviewed-on: https://gerrit.libreoffice.org/60429
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/configure.ac b/configure.ac
index d01e89a02a2f..8515564d5723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5244,7 +5244,7 @@ find_winsdk_version()
 tmppath="$winsdktest\\Include\\$winsdklibsubdir"
 # test exist the SDK path
 if test -d "$tmppath"; then
-   # when path is convertable to a short path then path is okay
+   # when path is convertible to a short path then path is okay
if ! cygpath -d "$tmppath"; then
   AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
fi
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 1496b1a1daf8..7f865108756a 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -192,7 +192,7 @@ void OutputDevice::DrawPolygon( const tools::Polygon& rPoly 
)
 basegfx::B2DPolygon aB2DPolygon(rPoly.getB2DPolygon());
 bool bSuccess(true);
 
-// ensure closed - maybe assert, hinders bufering
+// ensure closed - maybe assert, hinders buffering
 if(!aB2DPolygon.isClosed())
 {
 aB2DPolygon.setClosed(true);
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 4dcd86a4f405..0134c9ab63e5 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2025,7 +2025,7 @@ bool WinSalGraphicsImpl::drawPolyPolygon(
 // and fill polygons. Checked that in a first try, used
 // GraphicsPath::AddPath from Gdiplus combined with below used
 // StartFigure/CloseFigure, worked well (thus the line-draw version
-// may create non-cloded partial Polygon data).
+// may create non-closed partial Polygon data).
 //
 // But in current reality it gets not used due to e.g.
 // SdrPathPrimitive2D::create2DDecomposition creating transformed
@@ -2040,7 +2040,7 @@ bool WinSalGraphicsImpl::drawPolyPolygon(
 //
 // A 2nd problem is that the NoLineJoin mode 
(basegfx::B2DLineJoin::NONE
 // && rLineWidths > 0.0) creates polygon fill infos that are not 
reusable
-// for the fill case (see ::drawPolyLine bnelow) - thus we would need a
+// for the fill case (see ::drawPolyLine below) - thus we would need a
 // bool and/or two system-dependent paths buffered - doable, but 
complicated.
 //
 // All in all: Make B2DPolyPolygon a SystemDependentDataProvider and 
buffer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac vcl/source

[Yousuf Philips]

 configure.ac   |6 +++---
 vcl/source/app/IconThemeInfo.cxx   |5 +
 vcl/source/image/ImplImageTree.cxx |2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 59c0682c46e52aa18bdbee4c14ef05af9329de33
Author: Yousuf Philips 
Date:   Mon Jun 5 17:35:16 2017 +0400

tdf#94632 Enable sifr dark and set fallback

Change-Id: If77b33acf4f8d3e2e9c38b3e5ef359a1fc966910
Reviewed-on: https://gerrit.libreoffice.org/38387
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/configure.ac b/configure.ac
index 24df1493171d..652fdc0ac100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1577,7 +1577,7 @@ AC_ARG_WITH(galleries,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *breeze, *breeze_dark, crystal, *galaxy, 
*hicontrast, oxygen, *sifr, *tango, *tango_testing.]),
+ Possible choices: *breeze, *breeze_dark, crystal, *galaxy, 
*hicontrast, oxygen, *sifr, *sifr_dark, *tango, *tango_testing.]),
 ,)
 
 libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11062,7 +11062,7 @@ dnl 
===
 AC_MSG_CHECKING([which themes to include])
 # if none given use default subset of available themes
 if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
-with_theme="breeze breeze_dark galaxy hicontrast sifr tango"
+with_theme="breeze breeze_dark galaxy hicontrast sifr sifr_dark tango"
 test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing"
 fi
 
@@ -11070,7 +11070,7 @@ WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
 for theme in $with_theme; do
 case $theme in
-
breeze|breeze_dark|crystal|elementary|galaxy|hicontrast|oxygen|sifr|tango|tango_testing)
 real_theme="$theme" ;;
+
breeze|breeze_dark|crystal|elementary|galaxy|hicontrast|oxygen|sifr|sifr_dark|tango|tango_testing)
 real_theme="$theme" ;;
 default) real_theme=galaxy ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 88171e985bc3..6abae73f4826 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -25,6 +25,8 @@ static const OUStringLiteral 
TANGO_TESTING_ID("tango_testing");
 static const OUStringLiteral TANGO_TESTING_DISPLAY_NAME("Tango Testing");
 static const OUStringLiteral BREEZE_DARK_ID("breeze_dark");
 static const OUStringLiteral BREEZE_DARK_DISPLAY_NAME("Breeze Dark");
+static const OUStringLiteral SIFR_DARK_ID("sifr_dark");
+static const OUStringLiteral SIFR_DARK_DISPLAY_NAME("Sifr Dark");
 
 OUString
 filename_from_url(const OUString& url)
@@ -132,6 +134,9 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId)
 else if (themeId.equalsIgnoreAsciiCase(BREEZE_DARK_ID)) {
 return BREEZE_DARK_DISPLAY_NAME;
 }
+else if (themeId.equalsIgnoreAsciiCase(SIFR_DARK_ID)) {
+return SIFR_DARK_DISPLAY_NAME;
+}
 
 // make the first letter uppercase
 OUString r;
diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 576d6c0c0d28..dd9b196c4d05 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -264,6 +264,8 @@ OUString ImplImageTree::fallbackStyle(const OUString& 
rsStyle)
 sResult = "galaxy";
 else if (rsStyle == "sifr" || rsStyle == "breeze_dark")
 sResult = "breeze";
+else if (rsStyle == "sifr_dark" )
+sResult = "breeze_dark";
 else if (rsStyle == "helpimg")
 sResult = "";
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac vcl/source

[Khaled Hosny]

 configure.ac   |2 +-
 vcl/source/gdi/CommonSalLayout.cxx |5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit b9fe5dc791f56df55495d171ae901a246907c68b
Author: Khaled Hosny 
Date:   Fri Dec 2 08:06:08 2016 +0200

Require HarfBuzz 0.9.42

This is the first version where hb_buffer_set_cluster_level() was
introduced. The layout engine depends on this feature in a few places
and though we can build without it, the result will be wrong in some
cases (i.e. any where we assume combining marks will have their own
cluster number).

Change-Id: I89187f317052e7933b83ad0350cace239333510b
Reviewed-on: https://gerrit.libreoffice.org/31521
Reviewed-by: Rene Engelhard 
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/configure.ac b/configure.ac
index e941aeb..66e0bec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9247,7 +9247,7 @@ libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 
>= 0.9.3],
  ["-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"],
  ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
 
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],
  ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],
  ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"])
 
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index c61e540..eda090f 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -551,9 +551,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 hb_buffer_add_utf16(
 pHbBuffer, reinterpret_cast(pStr), nLength,
 nMinRunPos, nRunLen);
-#if HB_VERSION_ATLEAST(0, 9, 42)
 hb_buffer_set_cluster_level(pHbBuffer, 
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-#endif
+
 // The shapers that we want HarfBuzz to use, in the order of
 // preference. The coretext_aat shaper is available only on macOS,
 // but there is no harm in always including it, HarfBuzz will
@@ -598,10 +597,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 sal_Int32 indexUtf16 = nCharPos;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(, 0);
 
-#if HB_VERSION_ATLEAST(0, 9, 42)
 if (u_getIntPropertyValue(aChar, UCHAR_GENERAL_CATEGORY) == 
U_NON_SPACING_MARK)
 nGlyphFlags |= GlyphItem::IS_DIACRITIC;
-#endif
 
 if ((aSubRun.maScript == HB_SCRIPT_ARABIC ||
  aSubRun.maScript == HB_SCRIPT_SYRIAC) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac vcl/source

[Caolán McNamara]

 configure.ac  |   11 ---
 vcl/source/filter/jpeg/transupp.c |4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 9554853ad7c80e1edf853859dbb65d419e16ea66
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 30 17:24:49 2013 +0100

allow building with older libjpeg again

we don't really care what the error number is, so long as its an error of 
some
kind so just sed JERR_BAD_CROP_SPEC to JERR_CONVERSION_NOTIMPL

Change-Id: Iae41de7b720ce2e60c7092d15983aa1c4ba14c89

diff --git a/configure.ac b/configure.ac
index 329350a..5e396a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7553,17 +7553,6 @@ if test $with_system_jpeg = yes; then
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
 AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
-AC_MSG_CHECKING([[libjpeg supports JERR_BAD_CROP_SPEC (jpeg-7 API)]])
-AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
-  [[
-#include stdio.h
-#include jerror.h
-int main(int c, char**v) { printf(%d\n, JERR_BAD_CROP_SPEC); return 0; }
-  ]]) ],
-  [AC_MSG_RESULT(yes)],
-  [AC_MSG_RESULT(no)
-   AC_MSG_ERROR(jpeg library version = 7 or 
jpeg-turbo version = 1.1 required)
-  ])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
 AC_MSG_RESULT([internal])
diff --git a/vcl/source/filter/jpeg/transupp.c 
b/vcl/source/filter/jpeg/transupp.c
index 33da623..4cae59e 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1006,7 +1006,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
   info-crop_yoffset = 0;   /* default to +0 */
 if (info-crop_xoffset = info-output_width ||
 info-crop_yoffset = info-output_height)
-  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
+  ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
 if (info-crop_width_set == JCROP_UNSET)
   info-crop_width = info-output_width - info-crop_xoffset;
 if (info-crop_height_set == JCROP_UNSET)
@@ -1016,7 +1016,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
 info-crop_height = 0 || info-crop_height  info-output_height ||
 info-crop_xoffset  info-output_width - info-crop_width ||
 info-crop_yoffset  info-output_height - info-crop_height)
-  ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
+  ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
 /* Convert negative crop offsets into regular offsets */
 if (info-crop_xoffset_set == JCROP_NEG)
   xoffset = info-output_width - info-crop_width - info-crop_xoffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits