From e23ae94e91369501df310bc3afd4ab711d263cab Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sun, 8 Jul 2018 14:04:14 +1000
Subject: [PATCH] Added type gColorformat to replace V2.x colorformat

---
 changelog.txt            | 1 +
 src/gdisp/gdisp.h        | 1 +
 src/gdisp/gdisp_colors.h | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 9586ff90..feed5d4b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,6 +20,7 @@ CHANGE:		Added type gPoint       to replace V2.x point and point_t
 CHANGE:		Added type gCoord       to replace V2.x coord_t
 CHANGE:		Added type gPixel       to replace V2.x pixel_t
 CHANGE:		Added type gColor       to replace V2.x color_t
+CHANGE:		Added type gColorformat to replace V2.x colorformat
 CHANGE:		Added type gFont        to replace V2.x font_t
 CHANGE:		Added type gPowermode   to replace V2.x powermode_t,   and values gPowerXXX replace powerXXX
 CHANGE:		Added type gJustify     to replace V2.x justify_t,     and values gJustifyXXX replace justifyXXX
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h
index 39493257..5dc7c813 100644
--- a/src/gdisp/gdisp.h
+++ b/src/gdisp/gdisp.h
@@ -1230,6 +1230,7 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor
 
 /* V2 compatibility */
 #if GFX_COMPAT_V2
+	typedef gColorformat	colorformat;
 	typedef gColor			color_t;
 	typedef gPixel			pixel_t;
 	typedef gCoord			coord_t;
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h
index db859234..5ee49801 100644
--- a/src/gdisp/gdisp_colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -23,7 +23,7 @@
 
 #if GFX_USE_GDISP || defined(__DOXYGEN__)
 
-typedef uint16_t	colorformat;
+typedef uint16_t	gColorformat;
 
 /**
  * @name	Color system masks