Re: [PATCH] src/sfnt/ttcolr.c: fix build in C90 mode

[Werner LEMBERG]

> See attached patch

Applied, thanks!


Werner

[PATCH] src/sfnt/ttcolr.c: fix build in C90 mode

[Ozkan Sezer]

See attached patch - also inlined below (hopefully not mangled.)

Regards.

--
O.S.

diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 0601d26..b326c35 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -1280,6 +1280,7 @@
 while ( min < max )
 {
   FT_UInt  mid = min + ( max - min ) / 2;
+  FT_UShort  gid;

   /*
* `base_glyph_begin` is the beginning of `BaseGlyphV1List`;
@@ -1296,7 +1297,7 @@
   if ( p > end_colr - 2 - 4 )
 return 0;

-  FT_UShort  gid = FT_NEXT_USHORT( p );
+  gid = FT_NEXT_USHORT( p );


   if ( gid < glyph_id )
From c043e267376e7c884446035058f03284318e7d9a Mon Sep 17 00:00:00 2001
From: Ozkan Sezer 
Date: Mon, 8 Jan 2024 22:02:50 +0300
Subject: [PATCH] src/sfnt/ttcolr.c: fix build in C90 mode

---
 src/sfnt/ttcolr.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 0601d26..b326c35 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -1280,6 +1280,7 @@
 while ( min < max )
 {
   FT_UInt  mid = min + ( max - min ) / 2;
+  FT_UShort  gid;
 
   /*
* `base_glyph_begin` is the beginning of `BaseGlyphV1List`;
@@ -1296,7 +1297,7 @@
   if ( p > end_colr - 2 - 4 )
 return 0;
 
-  FT_UShort  gid = FT_NEXT_USHORT( p );
+  gid = FT_NEXT_USHORT( p );
 
 
   if ( gid < glyph_id )
-- 
1.7.1