[Pkg-sdl-commits] [libsdl2-ttf] 09/13: Imported Upstream version 2.0.14+dfsg1
Manuel A. Fernandez Montecelo
mafm at moszumanska.debian.org
Tue Feb 2 12:53:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
mafm pushed a commit to branch master
in repository libsdl2-ttf.
commit 35b70dec0bcdb2c759b73bde84230b32a52a6e98
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date: Tue Feb 2 12:30:54 2016 +0000
Imported Upstream version 2.0.14+dfsg1
---
CHANGES.txt | 4 ++++
SDL2_ttf.spec | 2 +-
SDL_ttf.c | 11 ++++++++++-
SDL_ttf.h | 21 +++++++++++++++++++--
configure | 6 +++---
configure.in | 6 +++---
version.rc | 8 ++++----
7 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index f2a6577..85e55ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.14:
+Ryan Gordon - Fri Jan 29 12:53:29 PST 2016
+ * Deprecated TTF_GetFontKerningSize() which takes font glyph indices and added TTF_GetFontKerningSizeGlyphs() which takes characters
+
2.0.13:
Sylvain - Sat Jun 28 11:42:42 2014
* Fixed bug rendering text starting with a glyph with negative starting offset
diff --git a/SDL2_ttf.spec b/SDL2_ttf.spec
index d3424d5..b89da73 100644
--- a/SDL2_ttf.spec
+++ b/SDL2_ttf.spec
@@ -1,5 +1,5 @@
%define name SDL2_ttf
-%define version 2.0.13
+%define version 2.0.14
%define release 1
Summary: Simple DirectMedia Layer - Sample TrueType Font Library
diff --git a/SDL_ttf.c b/SDL_ttf.c
index 96cc57a..be91600 100644
--- a/SDL_ttf.c
+++ b/SDL_ttf.c
@@ -2196,7 +2196,15 @@ int TTF_WasInit( void )
return TTF_initialized;
}
-int TTF_GetFontKerningSize(TTF_Font *font, Uint16 previous_ch, Uint16 ch)
+/* don't use this function. It's just here for binary compatibility. */
+int TTF_GetFontKerningSize(TTF_Font* font, int prev_index, int index)
+{
+ FT_Vector delta;
+ FT_Get_Kerning( font->face, prev_index, index, ft_kerning_default, &delta );
+ return (delta.x >> 6);
+}
+
+int TTF_GetFontKerningSizeGlyphs(TTF_Font *font, Uint16 previous_ch, Uint16 ch)
{
int error;
int glyph_index, prev_index;
@@ -2231,3 +2239,4 @@ int TTF_GetFontKerningSize(TTF_Font *font, Uint16 previous_ch, Uint16 ch)
}
return (delta.x >> 6);
}
+
diff --git a/SDL_ttf.h b/SDL_ttf.h
index f79bd90..75e79e0 100644
--- a/SDL_ttf.h
+++ b/SDL_ttf.h
@@ -24,6 +24,10 @@
http://www.freetype.org/
*/
+/* Note: In many places, SDL_ttf will say "glyph" when it means "code point."
+ Unicode is hard, we learn as we go, and we apologize for adding to the
+ confusion. */
+
#ifndef _SDL_TTF_H
#define _SDL_TTF_H
@@ -39,7 +43,7 @@ extern "C" {
*/
#define SDL_TTF_MAJOR_VERSION 2
#define SDL_TTF_MINOR_VERSION 0
-#define SDL_TTF_PATCHLEVEL 13
+#define SDL_TTF_PATCHLEVEL 14
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_ttf library.
@@ -57,6 +61,11 @@ extern "C" {
#define TTF_PATCHLEVEL SDL_TTF_PATCHLEVEL
#define TTF_VERSION(X) SDL_TTF_VERSION(X)
+/* Make sure this is defined (only available in newer SDL versions) */
+#ifndef SDL_DEPRECATED
+#define SDL_DEPRECATED
+#endif
+
/* This function gets the version of the dynamically linked SDL_ttf library.
it should NOT be used to fill a version structure, instead you should
use the SDL_TTF_VERSION() macro.
@@ -247,8 +256,16 @@ extern DECLSPEC void SDLCALL TTF_Quit(void);
/* Check if the TTF engine is initialized */
extern DECLSPEC int SDLCALL TTF_WasInit(void);
+/* Get the kerning size of two glyphs indices */
+/* DEPRECATED: this function requires FreeType font indexes, not glyphs,
+ by accident, which we don't expose through this API, so it could give
+ wildly incorrect results, especially with non-ASCII values.
+ Going forward, please use TTF_GetFontKerningSizeGlyphs() instead, which
+ does what you probably expected this function to do. */
+extern DECLSPEC int TTF_GetFontKerningSize(TTF_Font *font, int prev_index, int index) SDL_DEPRECATED;
+
/* Get the kerning size of two glyphs */
-extern DECLSPEC int TTF_GetFontKerningSize(TTF_Font *font, Uint16 previous_ch, Uint16 ch);
+extern DECLSPEC int TTF_GetFontKerningSizeGlyphs(TTF_Font *font, Uint16 previous_ch, Uint16 ch);
/* We'll use SDL for reporting errors */
#define TTF_SetError SDL_SetError
diff --git a/configure b/configure
index dfb32c9..28b828e 100755
--- a/configure
+++ b/configure
@@ -2360,9 +2360,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
MAJOR_VERSION=2
MINOR_VERSION=0
-MICRO_VERSION=13
-INTERFACE_AGE=3
-BINARY_AGE=13
+MICRO_VERSION=14
+INTERFACE_AGE=0
+BINARY_AGE=14
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
diff --git a/configure.in b/configure.in
index 62c5933..9b36e15 100644
--- a/configure.in
+++ b/configure.in
@@ -13,9 +13,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
MAJOR_VERSION=2
MINOR_VERSION=0
-MICRO_VERSION=13
-INTERFACE_AGE=3
-BINARY_AGE=13
+MICRO_VERSION=14
+INTERFACE_AGE=0
+BINARY_AGE=14
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
AC_SUBST(MAJOR_VERSION)
diff --git a/version.rc b/version.rc
index f038fca..73df288 100644
--- a/version.rc
+++ b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,13,0
- PRODUCTVERSION 2,0,13,0
+ FILEVERSION 2,0,14,0
+ PRODUCTVERSION 2,0,14,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_ttf\0"
- VALUE "FileVersion", "2, 0, 13, 0\0"
+ VALUE "FileVersion", "2, 0, 14, 0\0"
VALUE "InternalName", "SDL_ttf\0"
VALUE "LegalCopyright", "Copyright � 2016 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_ttf.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 13, 0\0"
+ VALUE "ProductVersion", "2, 0, 14, 0\0"
END
END
BLOCK "VarFileInfo"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2-ttf.git
More information about the pkg-sdl-commits
mailing list