mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1515629 - Update Graphite2 to version 1.3.13. r=jfkthame
Differential Revision: https://phabricator.services.mozilla.com/D15095 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
3eb2f351ae
commit
6569ba5d26
@ -4,7 +4,7 @@
|
||||
| OS | Intel 64 bit | Intel 32 bit | Arm 32 bit |
|
||||
|---------|:------------:|:------------:|:----------:|
|
||||
| Linux | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt124/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt124&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt123/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt123&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:Graphite_Linux32bitArm/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=Graphite_Linux32bitArm&guest=1) |
|
||||
| Windows | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:Graphite_Windows64bitProduction/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=Graphite_Windows64bitProduction&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt91/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt91&guest=1)| |
|
||||
| Windows | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:Graphite_Windows64bit/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=Graphite_Windows64bit&guest=1) | [![Build Status](http://build.palaso.org/app/rest/builds/buildType:bt91/statusIcon)](http://build.palaso.org/viewType.html?buildTypeId=bt91&guest=1)| |
|
||||
|
||||
## What is Graphite?
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
This directory contains the Graphite2 library release 1.3.12 from
|
||||
https://github.com/silnrsi/graphite/releases/download/1.3.12/graphite2-minimal-1.3.12.tgz
|
||||
This directory contains the Graphite2 library release 1.3.13 from
|
||||
https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-minimal-1.3.13.tgz
|
||||
See ./gfx/graphite2/moz-gr-update.sh for update procedure.
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#define GR2_VERSION_MAJOR 1
|
||||
#define GR2_VERSION_MINOR 3
|
||||
#define GR2_VERSION_BUGFIX 12
|
||||
#define GR2_VERSION_BUGFIX 13
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
|
@ -38,21 +38,21 @@ set(FILEFACE FileFace.cpp)
|
||||
if (GRAPHITE2_NFILEFACE)
|
||||
add_definitions(-DGRAPHITE2_NFILEFACE)
|
||||
set(FILEFACE)
|
||||
endif (GRAPHITE2_NFILEFACE)
|
||||
endif()
|
||||
|
||||
set(TRACING json.cpp)
|
||||
if (GRAPHITE2_NTRACING)
|
||||
add_definitions(-DGRAPHITE2_NTRACING)
|
||||
set(TRACING)
|
||||
endif (GRAPHITE2_NTRACING)
|
||||
endif()
|
||||
|
||||
if (GRAPHITE2_TELEMETRY)
|
||||
add_definitions(-DGRAPHITE2_TELEMETRY)
|
||||
endif (GRAPHITE2_TELEMETRY)
|
||||
endif()
|
||||
|
||||
if (NOT BUILD_SHARED_LIBS)
|
||||
add_definitions(-DGRAPHITE2_STATIC)
|
||||
endif (NOT BUILD_SHARED_LIBS)
|
||||
endif()
|
||||
|
||||
set(GRAPHITE_HEADERS
|
||||
../include/graphite2/Font.h
|
||||
@ -109,14 +109,14 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
LINKER_LANGUAGE C)
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
|
||||
add_definitions(-mfpmath=sse -msse2)
|
||||
endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
|
||||
endif()
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_definitions(-Wdouble-promotion)
|
||||
endif (CMAKE_COMPILER_IS_GNUCXX)
|
||||
endif()
|
||||
message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
|
||||
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||
add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
|
||||
endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||
endif()
|
||||
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
|
||||
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
|
||||
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
|
||||
@ -125,14 +125,14 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
else ()
|
||||
target_link_libraries(graphite2 c gcc)
|
||||
endif ()
|
||||
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
|
||||
endif()
|
||||
include(Graphite)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
||||
endif ()
|
||||
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
|
||||
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
|
||||
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
endif()
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
set_target_properties(graphite2 PROPERTIES
|
||||
@ -144,12 +144,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
||||
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
|
||||
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
|
||||
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
endif()
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
set_target_properties(graphite2 PROPERTIES
|
||||
COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
|
||||
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
endif()
|
||||
|
||||
|
||||
install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
|
||||
|
@ -993,7 +993,7 @@ bool KernCollider::mergeSlot(Segment *seg, Slot *slot, const Position &currShift
|
||||
nooverlap = false;
|
||||
}
|
||||
if (nooverlap)
|
||||
_mingap = max(_mingap, _xbound + currSpace + _margin - x);
|
||||
_mingap = max(_mingap, _xbound - rtl * (currSpace + _margin + x));
|
||||
if (collides && !nooverlap)
|
||||
_hit = true;
|
||||
return collides | nooverlap; // note that true is not a necessarily reliable value
|
||||
|
@ -164,6 +164,10 @@ GlyphCache::GlyphCache(const Face & face, const uint32 face_options)
|
||||
}
|
||||
delete _glyph_loader;
|
||||
_glyph_loader = 0;
|
||||
// coverity[leaked_storage : FALSE] - calling read_glyph on index 0 saved
|
||||
// glyphs as _glyphs[0]. Setting _glyph_loader to nullptr here flags that
|
||||
// the dtor needs to call delete[] on _glyphs[0] to release what was allocated
|
||||
// as glyphs
|
||||
}
|
||||
|
||||
if (_glyphs && glyph(0) == 0)
|
||||
|
@ -79,7 +79,7 @@ enum
|
||||
//**********************************************************************************************
|
||||
namespace Sfnt
|
||||
{
|
||||
#pragma pack(1) // We need this or the structure members aren't aligned
|
||||
#pragma pack(push,1) // We need this or the structure members aren't aligned
|
||||
// correctly. Fortunately this form of pragma is supposed
|
||||
// to be recognised by VS C++ too (at least according to
|
||||
// MSDN).
|
||||
@ -412,7 +412,7 @@ namespace Sfnt
|
||||
};
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
#pragma pack(pop)
|
||||
} // end of namespace Sfnt
|
||||
|
||||
} // end of namespace TtfUtil
|
||||
|
Loading…
Reference in New Issue
Block a user