commit 43b9668ba688b01553abb7b453aeb206d7fd56fa Author: Matthias Clasen Date: Mon Feb 27 15:03:59 2017 -0500 1.40.4 NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit 31a5ec79fe3ab3059268b04bd06defcf71005680 Author: Behdad Esfahbod Date: Sat Feb 25 13:41:51 2017 -0800 Bug 779232 - Wrong introspection annotation for pango_layout_get_size pango/pango-layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f54e128fc61558f8e1f19aa901e9740023afb063 Author: Chun-wei Fan Date: Fri Feb 17 18:25:32 2017 +0800 win32/Makefile.msvc-introspection: Sync with G-I This enables the new feature recently added in G-I where we can generate the full NMake Makefile module to build the .gir files by passing in a list of C includes, instead of needing to specify them fully one-by-one with --c-include=... win32/Makefile.msvc-introspection | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 359a3e21e65728b75b4c4e77d170f0de8d46ec1c Author: Chun-wei Fan Date: Fri Feb 17 18:24:03 2017 +0800 win32/detectenv-msvc.mak: Sync with GLib This enables one to build the introspection files using Visual Studio 2017. win32/detectenv-msvc.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bfe9cdc64ebb1ce0da532c47147634bd15c29b7d Author: Philip Withnall Date: Wed Feb 15 09:56:49 2017 +0000 pango-layout: Add a clarifying assertion In pango_layout_index_to_pos(), it looks like layout_line could be dereferenced while still NULL in the first loop iteration. This is not the case, as other bits of PangoLayout ensure its start_index is always 0, so this branch is never taken. Add an assertion to clarify that and guide static analysis. Coverity ID: 1391700 Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=778656 pango/pango-layout.c | 4 ++++ 1 file changed, 4 insertions(+) commit 4cd190eb567173c6d10419f379f2facb1a59d7eb Author: Philip Withnall Date: Wed Feb 15 09:41:14 2017 +0000 pango: Remove some unnecessary NULL checks These checks are preceded by other checks or code which demonstrates that the values are definitely always non-NULL. In the case of pango_attr_list_insert_internal(), the final branch of the function never needs to update list->attributes_tail, as the middle branch handles the case of appending to the list. The final case is just for insertions in the middle of the list. Coverity IDs: 1391710, 1391711 Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=778654 pango/pango-attributes.c | 3 --- pango/pangofc-fontmap.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) commit af53ff59328aa175920e23c5c1b1fbcca0059921 Author: Chun-wei Fan Date: Wed Feb 15 14:04:05 2017 +0800 Remove win32/vs15/pango-install.props before re-generation This will ensure that it will be up-to-date when win32/vs10/pango-install.props is re-generated. win32/vs10/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit a0239aec27aa04a234ab6683994b304d197d7035 Author: Chun-wei Fan Date: Wed Feb 15 13:25:59 2017 +0800 Visual Studio builds: Support Visual Studio 2017 This updates the autotools scripts to support Visual Studio 2017 builds, by copying the Visual Studio 2010 projects and updating items in there as necessary. Note the format of the toolset version changed, so we allow one to specify a custom toolset version string and hence use it if it is specified, otherwise the toolset version string is generated as it was before. Since Visual Studio 2017 aims to be compatible on the CRT level as Visual Studio 2015, the 2017-compiled binaries should be usable without problems with 2015-compiled binaries. configure.ac | 5 +++++ win32/Makefile-newvs.am | 25 +++++++++++++++++-------- win32/Makefile.am | 3 ++- win32/vs11/Makefile.am | 1 - win32/vs12/Makefile.am | 1 - win32/vs14/Makefile.am | 1 - win32/vs15/Makefile.am | 29 +++++++++++++++++++++++++++++ 7 files changed, 53 insertions(+), 12 deletions(-) commit e4ea2d2e5118b44bf1c3e5fa998356696e073aa8 Author: Philip Withnall Date: Tue Feb 14 11:12:51 2017 +0000 Add assertions to guard against division by zero on sample text paths There are a few code paths where pango_utf8_strwidth() is called on language-specific sample text. The sample text should have been chosen to never have a zero width, but we should add some assertions to ensure that’s the case. This guides static analysers into the right analysis. Coverity IDs: 1391697, 1391698, 1391699 Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=778602 pango/pango-context.c | 8 +++++++- pango/pangocairo-font.c | 5 ++++- pango/pangofc-font.c | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) commit 318fd546a0ab8ad68f65f5f81b0a6fb845141a9f Author: Philip Withnall Date: Tue Feb 14 10:32:26 2017 +0000 pangofc-shape: Fix potential array overrun If this loop adds the final feature to the features array, the start and end assignment for the next feature will drop off the end of the array. I don’t think the assignments are necessary, since num_features stores the number of elements in the array (so it doesn’t need to be terminated), and the start and end elements are assigned each time a feature is parsed. Coverity ID: 1391709 Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=778601 pango/pangofc-shape.c | 4 ---- 1 file changed, 4 deletions(-) commit f4cbd27f4e5bf8490ea411190d41813e14f12165 Author: Chun-wei Fan Date: Fri Jan 20 18:10:14 2017 +0800 Visual Studio builds: Fix project file move to win32/ Some more paths in auxillary scripts and NMake Makefiles need to be updated as well... win32/Makefile.msvc-introspection | 6 +++--- win32/introspection-msvc.mak | 2 +- win32/pc_base.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit ec025d2b1646505549a3c806101a364c011e365b Author: Chun-wei Fan Date: Fri Jan 20 15:56:31 2017 +0800 Visual Studio builds: Move projects to win32/ This allows one to go down one less level in the directory tree to get to the Visual Studio project files, and so make things more in line with the rest of the GTK+ stack. This also cleans up the Visual Studio 201x projects as there are some items that can be actually combined. Makefile.am | 2 +- build/Makefile-newvs.am | 45 ------ build/Makefile.am | 3 - build/Makefile.msvcproj | 114 --------------- configure.ac | 17 ++- pango/Makefile.am | 24 ++-- win32/Makefile-newvs.am | 46 +++++++ {build/win32 => win32}/Makefile.am | 2 +- {build => win32}/Makefile.msvc-introspection | 64 ++++----- win32/Makefile.msvcproj | 153 +++++++++++++++++++++ {build/win32 => win32}/detectenv-msvc.mak | 0 {build/win32 => win32}/introspection-msvc.mak | 0 .../win32 => win32}/pango-introspection-msvc.mak | 0 {build/win32 => win32}/pangopc.py | 0 {build/win32 => win32}/pc_base.py | 0 {build/win32 => win32}/replace.py | 0 {build/win32 => win32}/unistd.h | 0 {build/win32 => win32}/vs10/Makefile.am | 10 +- {build/win32 => win32}/vs10/README.txt | 4 +- .../win32 => win32}/vs10/pango-build-defines.props | 2 +- {build/win32 => win32}/vs10/pango-ignore-fc.props | 0 .../win32 => win32}/vs10/pango-install-bin.props | 0 {build/win32 => win32}/vs10/pango-install.propsin | 10 +- {build/win32 => win32}/vs10/pango-install.vcxproj | 74 ++++------ .../vs10/pango-install.vcxproj.filters | 2 +- {build/win32 => win32}/vs10/pango-prebuild.props | 2 +- .../vs10/pango-version-paths.props.in | 4 +- {build/win32 => win32}/vs10/pango.sln | 0 .../win32 => win32}/vs10/pango.vcxproj.filtersin | 8 +- {build/win32 => win32}/vs10/pango.vcxprojin | 32 ++--- .../vs10/pangocairo.vcxproj.filtersin | 10 +- {build/win32 => win32}/vs10/pangocairo.vcxprojin | 34 ++--- .../vs10/pangoft2.vcxproj.filtersin | 2 +- {build/win32 => win32}/vs10/pangoft2.vcxprojin | 2 +- .../vs10/pangowin32.vcxproj.filtersin | 2 +- {build/win32 => win32}/vs10/pangowin32.vcxprojin | 2 +- {build/win32 => win32}/vs11/Makefile.am | 4 +- {build/win32 => win32}/vs12/Makefile.am | 4 +- {build/win32 => win32}/vs14/Makefile.am | 4 +- {build/win32 => win32}/vs9/Makefile.am | 4 +- {build/win32 => win32}/vs9/README.txt | 4 +- .../vs9/pango-build-defines.vsprops | 2 +- {build/win32 => win32}/vs9/pango-ignore-fc.vsprops | 0 .../win32 => win32}/vs9/pango-install-bin.vsprops | 0 {build/win32 => win32}/vs9/pango-install.vcproj | 0 {build/win32 => win32}/vs9/pango-install.vspropsin | 10 +- {build/win32 => win32}/vs9/pango-prebuild.vsprops | 2 +- .../vs9/pango-version-paths.vsprops.in | 4 +- {build/win32 => win32}/vs9/pango.sln | 0 {build/win32 => win32}/vs9/pango.vcprojin | 16 +-- {build/win32 => win32}/vs9/pangocairo.vcprojin | 10 +- {build/win32 => win32}/vs9/pangoft2.vcprojin | 2 +- {build/win32 => win32}/vs9/pangowin32.vcprojin | 2 +- {build/win32 => win32}/vs9/stdint.h | 0 54 files changed, 370 insertions(+), 368 deletions(-) commit f47aa5a4690ce686ec70fb7c3c9a84251cdb5706 Author: Chun-wei Fan Date: Tue Nov 15 16:23:54 2016 +0800 Visual Studio 201x build: Fix pangocairo project The AdditionalIncludePaths setting missed a semicolon, fix that. build/win32/vs10/pangocairo.vcxprojin | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 3e173e5e8d596d35a8542db7c8a14cb8f8f2e87c Author: Chun-wei Fan Date: Tue Nov 15 12:39:16 2016 +0800 Visual Studio builds: Remove -lm from .pc files We don't have a separate math library for Visual Studio, so don't try to link to one in the .pc files. build/win32/pangopc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit fa98b9c23aea244b97b893d5ecc0190fa4b4cdf8 Author: Chun-wei Fan Date: Wed Oct 19 15:33:56 2016 +0800 build/win32/vs10/Makefile.am: Remove pango-install.props's on re-generation This is to ensure that any changes that was made to the generated build/win32/vs10/pango-install.props will also be applied to build/win32/vs[11|12|14] as well. build/win32/vs10/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) commit 841d0d2bcd53d371846abc5329b4d917fcf0c626 Author: Chun-wei Fan Date: Wed Oct 19 14:48:08 2016 +0800 build/: Force MSVC project file generation on Makefile.am changes Make the Makefile.am targets for generating the Visual Studio projects re-generate the project files and the header listings whenever the Makefile.am's that include build/Makefile.msvcproj changes, so that whenever a source/header is added, they will be reflected in the projects and in the property sheets that are used to copy the headers. Also ensure that these are applied to the vs11, vs12 and vs14 projects when this happens, as they are copied and processed from the Visual Studio 2010 projects. build/Makefile-newvs.am | 2 +- build/Makefile.msvcproj | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-)