Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 24468 → Rev 24469

/trunk/Scribus/CMakeLists_Dependencies.cmake
298,3 → 298,9
# CTL support
pkg_check_modules(HARFBUZZ REQUIRED harfbuzz>=0.9.42 harfbuzz-icu)
pkg_check_modules(ICU REQUIRED icu-uc)
 
# OpenType subsetting support
pkg_check_modules(HARFBUZZ_SUBSET harfbuzz-subset>=2.0.0)
if (HARFBUZZ_SUBSET_FOUND)
set (HAVE_HARFBUZZ_SUBSET ON)
endif()
/trunk/Scribus/config.h.cmake
23,6 → 23,7
#cmakedefine HAVE_TIFF 1
#cmakedefine HAVE_LIBZ 1
#cmakedefine HAVE_FONTCONFIG 1
#cmakedefine HAVE_HARFBUZZ_SUBSET 1
#cmakedefine HAVE_PODOFO 1
#cmakedefine HAVE_POPPLER 1
#cmakedefine HAVE_OSG 1
/trunk/Scribus/scribus/CMakeLists.txt
28,6 → 28,7
${CMAKE_CURRENT_SOURCE_DIR}
${FREETYPE_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
${HARFBUZZ_SUBSET_INCLUDE_DIRS}
)
 
include(api/CMakeLists.txt)
1143,6 → 1144,7
${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt
${CMAKE_CURRENT_BINARY_DIR}/third_party/zip
${HARFBUZZ_LIBRARY_DIRS}
${HARFBUZZ_SUBSET_LIBRARY_DIRS}
${ICU_LIBRARY_DIRS}
)
 
1316,6 → 1318,7
${CUPS_LIBRARIES}
${FREETYPE_LIBRARIES}
${HARFBUZZ_LIBRARIES}
${HARFBUZZ_SUBSET_LIBRARIES}
${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${TIFF_LIBRARIES}
/trunk/Scribus/scribus/fonts/sfnt.cpp
16,8 → 16,12
#include <QDebug>
#include <QScopedPointer>
 
#include "scconfig.h"
 
#include <harfbuzz/hb.h>
#ifdef HAVE_HARFBUZZ_SUBSET
#include <harfbuzz/hb-subset.h>
#endif
 
struct HbBlobDeleter
{
37,6 → 41,7
}
};
 
#ifdef HAVE_HARFBUZZ_SUBSET
struct HbSubsetInputDeleter
{
static void cleanup(void *pointer)
45,6 → 50,7
hb_subset_input_destroy((hb_subset_input_t*) pointer);
}
};
#endif
 
namespace sfnt {
1234,7 → 1240,7
{
glyphMap.clear();
 
#if HB_VERSION_ATLEAST(2, 0, 0)
#ifdef HAVE_HARFBUZZ_SUBSET
QScopedPointer<hb_blob_t, HbBlobDeleter> hbBlob(hb_blob_create(cff.data(), cff.length(), HB_MEMORY_MODE_READONLY, nullptr, nullptr));
if (hbBlob.isNull())
return QByteArray();
1280,7 → 1286,7
 
bool canSubsetOpenTypeFonts()
{
#if HB_VERSION_ATLEAST(2, 0, 0)
#ifdef HAVE_HARFBUZZ_SUBSET
return true;
#else
return false;
/trunk/Scribus/win32/msvc2015/win-config.h
43,6 → 43,9
/* Defines if your system has the libfontconfig library */
#undef HAVE_FONTCONFIG
 
/* Defines if your system has the harfbuzz-subset library */
#define HAVE_HARFBUZZ_SUBSET 1
 
/* Define if you have libz */
#define HAVE_LIBZ 1
 
/trunk/Scribus/win32/msvc2017/win-config.h
43,6 → 43,9
/* Defines if your system has the libfontconfig library */
#undef HAVE_FONTCONFIG
 
/* Defines if your system has the harfbuzz-subset library */
#define HAVE_HARFBUZZ_SUBSET 1
 
/* Define if you have libz */
#define HAVE_LIBZ 1
 
/trunk/Scribus/win32/msvc2019/win-config.h
43,6 → 43,9
/* Defines if your system has the libfontconfig library */
#undef HAVE_FONTCONFIG
 
/* Defines if your system has the harfbuzz-subset library */
#define HAVE_HARFBUZZ_SUBSET 1
 
/* Define if you have libz */
#define HAVE_LIBZ 1