cairo 1.15.5-x86-mingw32 → 1.15.6-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/NEWS +13 -0
- data/Rakefile +6 -6
- data/ext/cairo/extconf.rb +3 -120
- data/ext/cairo/rb_cairo.h +2 -2
- data/ext/cairo/rb_cairo_constants.c +2 -2
- data/ext/cairo/rb_cairo_context.c +14 -0
- data/ext/cairo/rb_cairo_surface.c +14 -0
- data/lib/2.2/cairo.so +0 -0
- data/lib/2.3/cairo.so +0 -0
- data/lib/2.4/cairo.so +0 -0
- data/vendor/local/bin/fc-cache.exe +0 -0
- data/vendor/local/bin/fc-cat.exe +0 -0
- data/vendor/local/bin/fc-list.exe +0 -0
- data/vendor/local/bin/fc-match.exe +0 -0
- data/vendor/local/bin/fc-pattern.exe +0 -0
- data/vendor/local/bin/fc-query.exe +0 -0
- data/vendor/local/bin/fc-scan.exe +0 -0
- data/vendor/local/bin/fc-validate.exe +0 -0
- data/vendor/local/bin/freetype-config +1 -1
- data/vendor/local/bin/libcairo-2.dll +0 -0
- data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
- data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
- data/vendor/local/bin/libfontconfig-1.dll +0 -0
- data/vendor/local/bin/libfreetype-6.dll +0 -0
- data/vendor/local/bin/libpixman-1-0.dll +0 -0
- data/vendor/local/bin/libpng-config +1 -1
- data/vendor/local/bin/libpng16-16.dll +0 -0
- data/vendor/local/bin/libpng16-config +1 -1
- data/vendor/local/bin/libxml2-2.dll +0 -0
- data/vendor/local/bin/png-fix-itxt.exe +0 -0
- data/vendor/local/bin/pngfix.exe +0 -0
- data/vendor/local/bin/xmlcatalog.exe +0 -0
- data/vendor/local/bin/xmllint.exe +0 -0
- data/vendor/local/bin/zlib1.dll +0 -0
- data/vendor/local/include/freetype2/freetype/config/ftconfig.h +17 -6
- data/vendor/local/include/freetype2/freetype/freetype.h +38 -3
- data/vendor/local/include/freetype2/freetype/ftimage.h +1 -0
- data/vendor/local/include/freetype2/freetype/ftmm.h +74 -1
- data/vendor/local/include/freetype2/freetype/ftrender.h +1 -0
- data/vendor/local/include/freetype2/freetype/tttags.h +4 -0
- data/vendor/local/include/libpng16/png.h +23 -25
- data/vendor/local/include/libpng16/pngconf.h +1 -1
- data/vendor/local/include/libpng16/pnglibconf.h +4 -2
- data/vendor/local/include/png.h +23 -25
- data/vendor/local/include/pngconf.h +1 -1
- data/vendor/local/include/pnglibconf.h +4 -2
- data/vendor/local/include/zlib.h +9 -8
- data/vendor/local/lib/libcairo-gobject.a +0 -0
- data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
- data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
- data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
- data/vendor/local/lib/libcairo.a +0 -0
- data/vendor/local/lib/libcairo.dll.a +0 -0
- data/vendor/local/lib/libfontconfig.dll.a +0 -0
- data/vendor/local/lib/libfreetype.a +0 -0
- data/vendor/local/lib/libfreetype.dll.a +0 -0
- data/vendor/local/lib/libfreetype.la +3 -3
- data/vendor/local/lib/libpixman-1.dll.a +0 -0
- data/vendor/local/lib/libpng.a +0 -0
- data/vendor/local/lib/libpng.dll.a +0 -0
- data/vendor/local/lib/libpng.la +2 -2
- data/vendor/local/lib/libpng16.a +0 -0
- data/vendor/local/lib/libpng16.dll.a +0 -0
- data/vendor/local/lib/libpng16.la +2 -2
- data/vendor/local/lib/libxml2.a +0 -0
- data/vendor/local/lib/libxml2.dll.a +0 -0
- data/vendor/local/lib/libz.a +0 -0
- data/vendor/local/lib/libz.dll.a +0 -0
- data/vendor/local/lib/pkgconfig/freetype2.pc +1 -1
- data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
- data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
- data/vendor/local/lib/pkgconfig/zlib.pc +1 -1
- data/vendor/local/share/license/freetype/README +5 -5
- data/vendor/local/share/license/libpng/README +6 -2
- data/vendor/local/share/license/zlib/README +2 -2
- data/vendor/local/share/man/man1/freetype-config.1 +1 -1
- data/vendor/local/share/man/man3/libpng.3 +15 -12
- data/vendor/local/share/man/man3/libpngpf.3 +2 -2
- data/vendor/local/share/man/man5/png.5 +1 -1
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: dd402eafaf04b9260b95ca0babb07960ae94d787
|
4
|
+
data.tar.gz: e6082538b4a9697cd213a44271c230ba384b2a81
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 60466430734efb963a15f71f2b1fc5b012b7fa0f71b31cc6a08f559b6f9d9b7d6f1b34aed908a73895e2055f50634cc19173c7c18f8f93df549547990d90bda2
|
7
|
+
data.tar.gz: 21104d2ee3a73c3936e051dfd5d69022564a018f1dbdb5c1a47c4fcbdd28211e8bb206d074189cb2c31aec76ce62b4b7ec9c8122f9a2cbbaf8051ec3c099169a
|
data/NEWS
CHANGED
@@ -1,3 +1,16 @@
|
|
1
|
+
Release 1.15.6 (2017-04-27) Kouhei Sutou <kou@cozmixng.org>
|
2
|
+
===========================================================
|
3
|
+
|
4
|
+
Improvements
|
5
|
+
------------
|
6
|
+
|
7
|
+
* Added Cairo::Context#refrence_count.
|
8
|
+
* Windows: Update bundled libraries:
|
9
|
+
* zlib: 1.2.10 -> 1.2.11
|
10
|
+
* libpng: 1.6.27 -> 1.6.29
|
11
|
+
* FreeType: 2.7 -> 2.7.1
|
12
|
+
* Used native-package-installer gem.
|
13
|
+
|
1
14
|
Release 1.15.5 (2017-01-14) Kouhei Sutou <kou@cozmixng.org>
|
2
15
|
===========================================================
|
3
16
|
|
data/Rakefile
CHANGED
@@ -442,8 +442,8 @@ windows_task = WindowsTask.new(spec) do |task|
|
|
442
442
|
task.packages = [
|
443
443
|
{
|
444
444
|
:name => "zlib",
|
445
|
-
:version => "1.2.
|
446
|
-
:download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/1.2.
|
445
|
+
:version => "1.2.11",
|
446
|
+
:download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11",
|
447
447
|
:compression_method => "gz",
|
448
448
|
:windows => {
|
449
449
|
:builder => ZlibBuilder.new,
|
@@ -452,16 +452,16 @@ windows_task = WindowsTask.new(spec) do |task|
|
|
452
452
|
},
|
453
453
|
{
|
454
454
|
:name => "libpng",
|
455
|
-
:version => "1.6.
|
456
|
-
:download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.
|
455
|
+
:version => "1.6.29",
|
456
|
+
:download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.29",
|
457
457
|
:windows => {
|
458
458
|
:built_file => "bin/libpng16-16.dll",
|
459
459
|
},
|
460
460
|
},
|
461
461
|
{
|
462
462
|
:name => "freetype",
|
463
|
-
:version => "2.7",
|
464
|
-
:download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/2.7",
|
463
|
+
:version => "2.7.1",
|
464
|
+
:download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/2.7.1",
|
465
465
|
:compression_method => "bz2",
|
466
466
|
:windows => {
|
467
467
|
:built_file => "bin/libfreetype-7.dll",
|
data/ext/cairo/extconf.rb
CHANGED
@@ -6,12 +6,8 @@ require 'English'
|
|
6
6
|
require 'mkmf'
|
7
7
|
require 'fileutils'
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
rescue LoadError
|
12
|
-
require 'rubygems'
|
13
|
-
require 'pkg-config'
|
14
|
-
end
|
9
|
+
require "pkg-config"
|
10
|
+
require "native-package-installer"
|
15
11
|
|
16
12
|
checking_for(checking_message("GCC")) do
|
17
13
|
if macro_defined?("__GNUC__", "")
|
@@ -47,119 +43,6 @@ checking_for(checking_message("Win32 OS")) do
|
|
47
43
|
end
|
48
44
|
end
|
49
45
|
|
50
|
-
def package_platform
|
51
|
-
if File.exist?("/etc/debian_version")
|
52
|
-
:debian
|
53
|
-
elsif File.exist?("/etc/fedora-release")
|
54
|
-
:fedora
|
55
|
-
elsif File.exist?("/etc/redhat-release")
|
56
|
-
:redhat
|
57
|
-
elsif find_executable("brew")
|
58
|
-
:homebrew
|
59
|
-
elsif find_executable("port")
|
60
|
-
:macports
|
61
|
-
else
|
62
|
-
:unknown
|
63
|
-
end
|
64
|
-
end
|
65
|
-
|
66
|
-
def super_user?
|
67
|
-
Process.uid.zero?
|
68
|
-
end
|
69
|
-
|
70
|
-
def normalize_native_package_info(native_package_info)
|
71
|
-
native_package_info ||= {}
|
72
|
-
native_package_info = native_package_info.dup
|
73
|
-
native_package_info[:fedora] ||= native_package_info[:redhat]
|
74
|
-
native_package_info
|
75
|
-
end
|
76
|
-
|
77
|
-
def install_missing_native_package(native_package_info)
|
78
|
-
platform = package_platform
|
79
|
-
native_package_info = normalize_native_package_info(native_package_info)
|
80
|
-
package = native_package_info[platform]
|
81
|
-
return false if package.nil?
|
82
|
-
|
83
|
-
need_super_user_priviledge = true
|
84
|
-
case platform
|
85
|
-
when :debian
|
86
|
-
install_command = "apt-get install -V -y #{package}"
|
87
|
-
when :fedora, :redhat
|
88
|
-
install_command = "yum install -y #{package}"
|
89
|
-
when :homebrew
|
90
|
-
need_super_user_priviledge = false
|
91
|
-
install_command = "brew install #{package}"
|
92
|
-
when :macports
|
93
|
-
install_command = "port install -y #{package}"
|
94
|
-
else
|
95
|
-
return false
|
96
|
-
end
|
97
|
-
|
98
|
-
have_priviledge = (not need_super_user_priviledge or super_user?)
|
99
|
-
unless have_priviledge
|
100
|
-
sudo = find_executable("sudo")
|
101
|
-
end
|
102
|
-
|
103
|
-
installing_message = "installing '#{package}' native package... "
|
104
|
-
message("%s", installing_message)
|
105
|
-
failed_to_get_super_user_priviledge = false
|
106
|
-
|
107
|
-
succeeded = false
|
108
|
-
execution_result = ""
|
109
|
-
File.open("mkmf.log") do |log|
|
110
|
-
log.seek(0, IO::SEEK_END)
|
111
|
-
if have_priviledge
|
112
|
-
succeeded = xsystem(install_command)
|
113
|
-
else
|
114
|
-
if sudo
|
115
|
-
install_command = "#{sudo} #{install_command}"
|
116
|
-
succeeded = xsystem(install_command)
|
117
|
-
else
|
118
|
-
succeeded = false
|
119
|
-
failed_to_get_super_user_priviledge = true
|
120
|
-
end
|
121
|
-
end
|
122
|
-
executed_command_line = log.gets
|
123
|
-
execution_result = log.read
|
124
|
-
end
|
125
|
-
|
126
|
-
if failed_to_get_super_user_priviledge
|
127
|
-
result_message = "require super user privilege"
|
128
|
-
else
|
129
|
-
result_message = succeeded ? "succeeded" : "failed"
|
130
|
-
end
|
131
|
-
Logging.postpone do
|
132
|
-
"#{installing_message}#{result_message}\n"
|
133
|
-
end
|
134
|
-
message("#{result_message}\n")
|
135
|
-
|
136
|
-
error_message = nil
|
137
|
-
unless succeeded
|
138
|
-
if failed_to_get_super_user_priviledge
|
139
|
-
error_message = <<-EOM
|
140
|
-
'#{package}' native package is required.
|
141
|
-
Run the following command as super user to install required native package:
|
142
|
-
\# #{install_command}
|
143
|
-
EOM
|
144
|
-
else
|
145
|
-
error_message = <<-EOM
|
146
|
-
Failed to run '#{install_command}':
|
147
|
-
--
|
148
|
-
#{execution_result.chomp}
|
149
|
-
--
|
150
|
-
EOM
|
151
|
-
end
|
152
|
-
end
|
153
|
-
if error_message
|
154
|
-
message("%s", error_message)
|
155
|
-
Logging.message("%s", error_message)
|
156
|
-
end
|
157
|
-
|
158
|
-
Logging.message("--------------------\n\n")
|
159
|
-
|
160
|
-
succeeded
|
161
|
-
end
|
162
|
-
|
163
46
|
def required_pkg_config_package(package_info, native_package_info=nil)
|
164
47
|
if package_info.is_a?(Array)
|
165
48
|
required_package_info = package_info
|
@@ -169,7 +52,7 @@ def required_pkg_config_package(package_info, native_package_info=nil)
|
|
169
52
|
return true if PKGConfig.have_package(*required_package_info)
|
170
53
|
|
171
54
|
native_package_info ||= {}
|
172
|
-
return false unless
|
55
|
+
return false unless NativePackageInstaller.install(native_package_info)
|
173
56
|
|
174
57
|
PKGConfig.have_package(*required_package_info)
|
175
58
|
end
|
data/ext/cairo/rb_cairo.h
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
* $Author: kou $
|
6
6
|
* $Date: 2008-09-19 12:56:27 $
|
7
7
|
*
|
8
|
-
* Copyright 2006-
|
8
|
+
* Copyright 2006-2017 Kouhei Sutou <kou@cozmixng.org>
|
9
9
|
* Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
|
10
10
|
* Copyright 2004-2005 MenTaLguY <mental@rydia.com>
|
11
11
|
*
|
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
|
|
73
73
|
|
74
74
|
#define RB_CAIRO_VERSION_MAJOR 1
|
75
75
|
#define RB_CAIRO_VERSION_MINOR 15
|
76
|
-
#define RB_CAIRO_VERSION_MICRO
|
76
|
+
#define RB_CAIRO_VERSION_MICRO 6
|
77
77
|
|
78
78
|
RB_CAIRO_VAR VALUE rb_mCairo;
|
79
79
|
RB_CAIRO_VAR VALUE rb_cCairo_Context;
|
@@ -127,7 +127,7 @@ VALUE rb_mCairo_PDFMetadata = Qnil;
|
|
127
127
|
#define CAIRO_REGION_OVERLAP_MIN CAIRO_REGION_OVERLAP_IN
|
128
128
|
#define CAIRO_REGION_OVERLAP_MAX CAIRO_REGION_OVERLAP_PART
|
129
129
|
|
130
|
-
#if CAIRO_CHECK_VERSION(1, 15,
|
130
|
+
#if CAIRO_CHECK_VERSION(1, 15, 5)
|
131
131
|
# define CAIRO_PDF_OUTLINE_FLAGS_MIN CAIRO_PDF_OUTLINE_FLAG_OPEN
|
132
132
|
# define CAIRO_PDF_OUTLINE_FLAGS_MAX CAIRO_PDF_OUTLINE_FLAG_ITALIC
|
133
133
|
#else
|
@@ -692,7 +692,7 @@ Init_cairo_constants (void)
|
|
692
692
|
#if CAIRO_CHECK_VERSION(1, 15, 4)
|
693
693
|
rb_mCairo_PDFOutlineFlags =
|
694
694
|
rb_define_module_under (rb_mCairo, "PDFOutlineFlags");
|
695
|
-
# if CAIRO_CHECK_VERSION(1, 15,
|
695
|
+
# if CAIRO_CHECK_VERSION(1, 15, 5)
|
696
696
|
rb_define_const (rb_mCairo_PDFOutlineFlags, "OPEN",
|
697
697
|
INT2NUM (CAIRO_PDF_OUTLINE_FLAG_OPEN));
|
698
698
|
rb_define_const (rb_mCairo_PDFOutlineFlags, "BOLD",
|
@@ -129,6 +129,18 @@ cr_destroy_with_destroy_check (VALUE self)
|
|
129
129
|
return Qnil;
|
130
130
|
}
|
131
131
|
|
132
|
+
static VALUE
|
133
|
+
cr_get_reference_count (VALUE self)
|
134
|
+
{
|
135
|
+
cairo_t *cr;
|
136
|
+
unsigned int reference_count;
|
137
|
+
|
138
|
+
cr = _SELF;
|
139
|
+
reference_count = cairo_get_reference_count (cr);
|
140
|
+
|
141
|
+
return UINT2NUM (reference_count);
|
142
|
+
}
|
143
|
+
|
132
144
|
static VALUE
|
133
145
|
cr_s_wrap (VALUE self, VALUE pointer)
|
134
146
|
{
|
@@ -1673,6 +1685,8 @@ Init_cairo_context (void)
|
|
1673
1685
|
/* Functions for manipulating state objects */
|
1674
1686
|
rb_define_method (rb_cCairo_Context, "initialize", cr_initialize, 1);
|
1675
1687
|
rb_define_method (rb_cCairo_Context, "destroy", cr_destroy, 0);
|
1688
|
+
rb_define_method (rb_cCairo_Context, "reference_count",
|
1689
|
+
cr_get_reference_count, 0);
|
1676
1690
|
|
1677
1691
|
rb_define_method (rb_cCairo_Context, "save", cr_save, 0);
|
1678
1692
|
rb_define_method (rb_cCairo_Context, "restore", cr_restore, 0);
|
@@ -465,6 +465,18 @@ cr_surface_destroy (VALUE self)
|
|
465
465
|
return self;
|
466
466
|
}
|
467
467
|
|
468
|
+
static VALUE
|
469
|
+
cr_surface_get_reference_count (VALUE self)
|
470
|
+
{
|
471
|
+
cairo_surface_t *surface;
|
472
|
+
unsigned int reference_count;
|
473
|
+
|
474
|
+
surface = _SELF;
|
475
|
+
reference_count = cairo_surface_get_reference_count (surface);
|
476
|
+
|
477
|
+
return UINT2NUM (reference_count);
|
478
|
+
}
|
479
|
+
|
468
480
|
static VALUE
|
469
481
|
cr_surface_finish (VALUE self)
|
470
482
|
{
|
@@ -1998,6 +2010,8 @@ Init_cairo_surface (void)
|
|
1998
2010
|
cr_surface_get_device, 0);
|
1999
2011
|
#endif
|
2000
2012
|
rb_define_method (rb_cCairo_Surface, "destroy", cr_surface_destroy, 0);
|
2013
|
+
rb_define_method (rb_cCairo_Surface, "reference_count",
|
2014
|
+
cr_surface_get_reference_count, 0);
|
2001
2015
|
rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
|
2002
2016
|
rb_define_method (rb_cCairo_Surface, "content", cr_surface_get_content, 0);
|
2003
2017
|
|
data/lib/2.2/cairo.so
CHANGED
Binary file
|
data/lib/2.3/cairo.so
CHANGED
Binary file
|
data/lib/2.4/cairo.so
CHANGED
Binary file
|
Binary file
|
data/vendor/local/bin/fc-cat.exe
CHANGED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/vendor/local/bin/pngfix.exe
CHANGED
Binary file
|
Binary file
|
Binary file
|
data/vendor/local/bin/zlib1.dll
CHANGED
Binary file
|
@@ -288,8 +288,8 @@ FT_BEGIN_HEADER
|
|
288
288
|
#endif
|
289
289
|
|
290
290
|
|
291
|
-
/* determine whether we have a 64-bit int type
|
292
|
-
/*
|
291
|
+
/* determine whether we have a 64-bit int type */
|
292
|
+
/* (mostly for environments without `autoconf') */
|
293
293
|
#if FT_SIZEOF_LONG == 8
|
294
294
|
|
295
295
|
/* FT_LONG64 must be defined if a 64-bit type is available */
|
@@ -297,6 +297,16 @@ FT_BEGIN_HEADER
|
|
297
297
|
#define FT_INT64 long
|
298
298
|
#define FT_UINT64 unsigned long
|
299
299
|
|
300
|
+
/* we handle the LLP64 scheme separately for GCC and clang, */
|
301
|
+
/* suppressing the `long long' warning */
|
302
|
+
#elif ( FT_SIZEOF_LONG == 4 ) && \
|
303
|
+
defined( HAVE_LONG_LONG_INT ) && \
|
304
|
+
defined( __GNUC__ )
|
305
|
+
#pragma GCC diagnostic ignored "-Wlong-long"
|
306
|
+
#define FT_LONG64
|
307
|
+
#define FT_INT64 long long int
|
308
|
+
#define FT_UINT64 unsigned long long int
|
309
|
+
|
300
310
|
/*************************************************************************/
|
301
311
|
/* */
|
302
312
|
/* A 64-bit data type may create compilation problems if you compile */
|
@@ -369,10 +379,11 @@ FT_BEGIN_HEADER
|
|
369
379
|
|
370
380
|
|
371
381
|
/* typeof condition taken from gnulib's `intprops.h' header file */
|
372
|
-
#if ( __GNUC__ >= 2
|
373
|
-
defined(
|
374
|
-
|
375
|
-
|
382
|
+
#if ( ( defined( __GNUC__ ) && __GNUC__ >= 2 ) || \
|
383
|
+
( defined( __IBMC__ ) && __IBMC__ >= 1210 && \
|
384
|
+
defined( __IBM__TYPEOF__ ) ) || \
|
385
|
+
( defined( __SUNPRO_C ) && __SUNPRO_C >= 0x5110 && !__STDC__ ) )
|
386
|
+
#define FT_TYPEOF( type ) ( __typeof__ ( type ) )
|
376
387
|
#else
|
377
388
|
#define FT_TYPEOF( type ) /* empty */
|
378
389
|
#endif
|
@@ -951,6 +951,10 @@ FT_BEGIN_HEADER
|
|
951
951
|
/* strikes in the face. It is set to NULL if */
|
952
952
|
/* there is no bitmap strike. */
|
953
953
|
/* */
|
954
|
+
/* Note that FreeType tries to sanitize the */
|
955
|
+
/* strike data since they are sometimes sloppy */
|
956
|
+
/* or incorrect, but this can easily fail. */
|
957
|
+
/* */
|
954
958
|
/* num_charmaps :: The number of charmaps in the face. */
|
955
959
|
/* */
|
956
960
|
/* charmaps :: An array of the charmaps of the face. */
|
@@ -1727,7 +1731,6 @@ FT_BEGIN_HEADER
|
|
1727
1731
|
/* position (e.g., coordinates (0,0) on the baseline). Of course, */
|
1728
1732
|
/* `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP. */
|
1729
1733
|
/* */
|
1730
|
-
/* <Note> */
|
1731
1734
|
/* Here is a small pseudo code fragment that shows how to use */
|
1732
1735
|
/* `lsb_delta' and `rsb_delta': */
|
1733
1736
|
/* */
|
@@ -1755,6 +1758,12 @@ FT_BEGIN_HEADER
|
|
1755
1758
|
/* endfor */
|
1756
1759
|
/* } */
|
1757
1760
|
/* */
|
1761
|
+
/* If you use strong auto-hinting, you *must* apply these delta */
|
1762
|
+
/* values! Otherwise you will experience far too large inter-glyph */
|
1763
|
+
/* spacing at small rendering sizes in most cases. Note that it */
|
1764
|
+
/* doesn't harm to use the above code for other hinting modes also, */
|
1765
|
+
/* since the delta values are zero then. */
|
1766
|
+
/* */
|
1758
1767
|
typedef struct FT_GlyphSlotRec_
|
1759
1768
|
{
|
1760
1769
|
FT_Library library;
|
@@ -2322,7 +2331,10 @@ FT_BEGIN_HEADER
|
|
2322
2331
|
/* FT_Select_Size */
|
2323
2332
|
/* */
|
2324
2333
|
/* <Description> */
|
2325
|
-
/* Select a bitmap strike.
|
2334
|
+
/* Select a bitmap strike. To be more precise, this function sets */
|
2335
|
+
/* the scaling factors of the active @FT_Size object in a face so */
|
2336
|
+
/* that bitmaps from this particular strike are taken by */
|
2337
|
+
/* @FT_Load_Glyph and friends. */
|
2326
2338
|
/* */
|
2327
2339
|
/* <InOut> */
|
2328
2340
|
/* face :: A handle to a target face object. */
|
@@ -2334,6 +2346,20 @@ FT_BEGIN_HEADER
|
|
2334
2346
|
/* <Return> */
|
2335
2347
|
/* FreeType error code. 0~means success. */
|
2336
2348
|
/* */
|
2349
|
+
/* <Note> */
|
2350
|
+
/* For bitmaps embedded in outline fonts it is common that only a */
|
2351
|
+
/* subset of the available glyphs at a given ppem value is available. */
|
2352
|
+
/* FreeType silently uses outlines if there is no bitmap for a given */
|
2353
|
+
/* glyph index. */
|
2354
|
+
/* */
|
2355
|
+
/* For GX variation fonts, a bitmap strike makes sense only if the */
|
2356
|
+
/* default instance is active (this is, no glyph variation takes */
|
2357
|
+
/* place); otherwise, FreeType simply ignores bitmap strikes. The */
|
2358
|
+
/* same is true for all named instances that are different from the */
|
2359
|
+
/* default instance. */
|
2360
|
+
/* */
|
2361
|
+
/* Don't use this function if you are using the FreeType cache API. */
|
2362
|
+
/* */
|
2337
2363
|
FT_EXPORT( FT_Error )
|
2338
2364
|
FT_Select_Size( FT_Face face,
|
2339
2365
|
FT_Int strike_index );
|
@@ -2786,6 +2812,14 @@ FT_BEGIN_HEADER
|
|
2786
2812
|
*
|
2787
2813
|
* Currently, this flag is only implemented for TrueType fonts.
|
2788
2814
|
*
|
2815
|
+
* FT_LOAD_BITMAP_METRICS_ONLY ::
|
2816
|
+
* This flag is used to request loading of the metrics and bitmap
|
2817
|
+
* image information of a (possibly embedded) bitmap glyph without
|
2818
|
+
* allocating or copying the bitmap image data itself. No effect if
|
2819
|
+
* the target glyph is not a bitmap image.
|
2820
|
+
*
|
2821
|
+
* This flag unsets @FT_LOAD_RENDER.
|
2822
|
+
*
|
2789
2823
|
* FT_LOAD_CROP_BITMAP ::
|
2790
2824
|
* Ignored. Deprecated.
|
2791
2825
|
*
|
@@ -2832,6 +2866,7 @@ FT_BEGIN_HEADER
|
|
2832
2866
|
/* Bits 16..19 are used by `FT_LOAD_TARGET_' */
|
2833
2867
|
#define FT_LOAD_COLOR ( 1L << 20 )
|
2834
2868
|
#define FT_LOAD_COMPUTE_METRICS ( 1L << 21 )
|
2869
|
+
#define FT_LOAD_BITMAP_METRICS_ONLY ( 1L << 22 )
|
2835
2870
|
|
2836
2871
|
/* */
|
2837
2872
|
|
@@ -4206,7 +4241,7 @@ FT_BEGIN_HEADER
|
|
4206
4241
|
*/
|
4207
4242
|
#define FREETYPE_MAJOR 2
|
4208
4243
|
#define FREETYPE_MINOR 7
|
4209
|
-
#define FREETYPE_PATCH
|
4244
|
+
#define FREETYPE_PATCH 1
|
4210
4245
|
|
4211
4246
|
|
4212
4247
|
/*************************************************************************/
|