Compare commits

...

1 Commits

3 changed files with 54 additions and 1 deletions

45
fix_type_error.patch Normal file
View File

@@ -0,0 +1,45 @@
commit d546aefd73dcbb0d0d1e0f3c916770d7f9f98169
Author: Joseph C Wang <joequant@gmail.com>
Date: Tue Oct 8 19:47:53 2024 +0800
fix type error
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
index c668d32..ef13576 100644
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -174,7 +174,7 @@ void FTContour::SetParity(int parity)
}
-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n)
+FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n)
{
FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]);
double olddir, dir = atan2((next - cur).Y(), (next - cur).X());
diff --git a/src/FTContour.h b/src/FTContour.h
index d2d187c..dc64e3a 100644
--- a/src/FTContour.h
+++ b/src/FTContour.h
@@ -52,7 +52,7 @@ class FTContour
* @param pointTags
* @param numberOfPoints
*/
- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints);
+ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints);
/**
* Destructor
diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
index 26e7da8..53d738e 100644
--- a/src/FTVectoriser.cpp
+++ b/src/FTVectoriser.cpp
@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours()
for(int i = 0; i < ftContourCount; ++i)
{
FT_Vector* pointList = &outline.points[startIndex];
- char* tagList = &outline.tags[startIndex];
+ unsigned char* tagList = &outline.tags[startIndex];
endIndex = outline.contours[i];
contourLength = (endIndex - startIndex) + 1;

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 6 08:44:17 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
- Fix build failure, add patch fix_type_error.patch
-------------------------------------------------------------------
Mon Feb 26 08:49:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@@ -1,7 +1,7 @@
#
# spec file for package ftgl
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@ Patch1: ftgl-pkgconfig.patch
Patch2: ftgl-fix-no-add-needed.patch
# PATCH-FIX-OPENSUSE: install FTVectoriser.h, required by tulip-5.0; kkaempf@suse.de
Patch3: install-FTVectoriser.h.patch
# PATCH-FIX-UPSTREAM: https://github.com/frankheckenbach/ftgl/commit/d546aefd73dcbb0d0d1e0f3c916770d7f9f98169
Patch4: fix_type_error.patch
%if %{with ftgl_html}
BuildRequires: doxygen
BuildRequires: texlive-epstopdf
@@ -97,6 +99,7 @@ This package provides demo application showing usage of the library.
%patch -P 1
%patch -P 2
%patch -P 3 -p1
%patch -P 4 -p1
%build
export CC=gcc