define pgm_read_glyph_ptr() and pgm_read_pointer() as static

vortigont · vortigont · commit d351ce599658 · 2024-12-25T13:45:25.000+09:00
functions defined in header file (.h) must be defined as static, oherwise there could a situations when
linker fails with 'multiple definition' error'
diff --git a/src/Arduino_GFX.h b/src/Arduino_GFX.h
@@ -138,7 +138,7 @@
 #endif
 
 #if !defined(ATTINY_CORE)
-GFX_INLINE GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
+GFX_INLINE static GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
 {
 #ifdef __AVR__
   return &(((GFXglyph *)pgm_read_pointer(&gfxFont->glyph))[c]);
@@ -150,7 +150,7 @@ GFX_INLINE GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c)
 #endif //__AVR__
 }
 
-GFX_INLINE uint8_t *pgm_read_bitmap_ptr(const GFXfont *gfxFont)
+GFX_INLINE static uint8_t *pgm_read_bitmap_ptr(const GFXfont *gfxFont)
 {
 #ifdef __AVR__
   return (uint8_t *)pgm_read_pointer(&gfxFont->bitmap);

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@`
`138`	`138`	`#endif`
`139`	`139`
`140`	`140`	`#if !defined(ATTINY_CORE)`
`141`		`-GFX_INLINE GFXglyph pgm_read_glyph_ptr(const GFXfont gfxFont, uint8_t c)`
	`141`	`+GFX_INLINE static GFXglyph pgm_read_glyph_ptr(const GFXfont gfxFont, uint8_t c)`
`142`	`142`	`{`
`143`	`143`	`#ifdef __AVR__`
`144`	`144`	`return &(((GFXglyph *)pgm_read_pointer(&gfxFont->glyph))[c]);`
`@@ -150,7 +150,7 @@ GFX_INLINE GFXglyph pgm_read_glyph_ptr(const GFXfont gfxFont, uint8_t c)`
`150`	`150`	`#endif //__AVR__`
`151`	`151`	`}`
`152`	`152`
`153`		`-GFX_INLINE uint8_t pgm_read_bitmap_ptr(const GFXfont gfxFont)`
	`153`	`+GFX_INLINE static uint8_t pgm_read_bitmap_ptr(const GFXfont gfxFont)`
`154`	`154`	`{`
`155`	`155`	`#ifdef __AVR__`
`156`	`156`	`return (uint8_t *)pgm_read_pointer(&gfxFont->bitmap);`