.gitignore

@@ -1,3 +1,4 @@
+docs/html
 build
 .build
 .dep
@@ -8,10 +9,5 @@ build
 *.lst
 *.o
 *.map
-
 src/gdisp/fonts/*.dat
-
-docs/html
 docs/html.zip
-docs/*.db
-docs/*.tmp

changelog.txt

@@ -2,13 +2,7 @@
 *** Releases                                                              ***
 *****************************************************************************
 
-*** After Release 2.9 ***
+*** After Release 2.8 ***
-CHANGE:		Added type gImage          to replace V2.x gdispImage
-FIX:		Fixed GWIN console widget scroll
-FIX:		A warning and adjusted is made if GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE is less than 40 bytes.
-
-
-*** Release 2.9 ***
 FEATURE:	Added config vars GINPUT_TOUCH_CALIBRATION_FONT1 and GINPUT_TOUCH_CALIBRATION_FONT2
 FEATURE:	Added config vars GINPUT_TOUCH_CALIBRATION_TITLE and GINPUT_TOUCH_CALIBRATION_ERROR
 FIX:		Fixed ensuring the clock is fully started in STM32LTDC based boards
@@ -28,6 +22,7 @@ CHANGE:		Added type gThread         to replace V2.x gfxThreadHandle and macros G
 CHANGE:		Added type gThreadreturn   to replace V2.x threadreturn_t and pseudo function gfxThreadReturn() to replace THREAD_RETURN()
 CHANGE:		Added type gThreadpriority to replace V2.x threadpriority_t and values gThreadpriorityLow/Normal/High to replace LOW_/NORMAL_/HIGH_PRIORITY
 CHANGE:		Added type gPoint          to replace V2.x point and point_t
+CHANGE:		Added type gImage          to replace V2.x gdispImage
 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

src/gdisp/gdisp_colors.h

@@ -216,7 +216,7 @@ typedef gU16	gColorformat;
 	 */
 	#define LUMA_OF(c)			((RED_OF(c)+((gU16)GREEN_OF(c)<<1)+BLUE_OF(c))>>2)
 	#define RED_OF(c)			(((c) & 0xF800)>>8)
-	#define GREEN_OF(c)			(((c)&0x07E0)>>3)
+	#define GREEN_OF(c)			(((c)&0x007E)>>3)
 	#define BLUE_OF(c)			(((c)&0x001F)<<3)
 	/** @} */
 

src/gdisp/gdisp_image_bmp.c

@@ -11,16 +11,6 @@
 
 #include "gdisp_image_support.h"
 
-#if GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE * (COLOR_TYPE_BITS/8) < 40
-		#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
-			#warning "GDISP: GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE must be at least 40 bytes. It has been adjusted for you."
-		#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
-			COMPILER_WARNING("GDISP: GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE must be at least 40 bytes. It has been adjusted for you.")
-		#endif
-	#undef GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE
-	#define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE	((40 + (COLOR_TYPE_BITS/8) - 1) / (COLOR_TYPE_BITS/8))
-#endif
-
 typedef struct gdispImagePrivate_BMP {
 	gU8		bmpflags;
 		#define BMP_V2				0x01		// Version 2 (old) header format

src/gdisp/gdisp_options.h

@@ -389,8 +389,8 @@
 		#define GDISP_NEED_IMAGE_BMP_32		GFXON
 	#endif
 	/**
-	 * @brief   The BMP blit buffer size in pixels.
+	 * @brief   The BMP blit buffer size.
-	 * @details	Defaults to 32 pixels
+	 * @details	Defaults to 32
 	 * @note 	Bigger is faster but requires more RAM.
 	 * @note 	This must be greater than 40 bytes and 32 pixels as we read our headers into this space as well.
 	 */

src/ginput/ginput_mouse.c

@@ -833,3 +833,4 @@ void _gmouseWakeupI(GMouse *m) {
 }
 
 #endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */
+/** @} */

src/gos/gos_win32.c

@@ -127,3 +127,5 @@ gThreadreturn gfxThreadWait(gThread thread) {
 }
 
 #endif /* GFX_USE_OS_WIN32 */
+/** @} */
+

src/gos/gos_zephyr.h

@@ -90,3 +90,4 @@ gTicks gfxSystemTicks();
 
 #endif /* GFX_USE_OS_ZEPHYR */
 #endif /* _GOS_H */
+/** @} */

src/gwin/gwin.c

@@ -414,3 +414,5 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
 #endif
 
 #endif /* GFX_USE_GWIN */
+/** @} */
+

src/gwin/gwin_class.h

@@ -445,3 +445,4 @@ gBool _gwinWMAdd(GHandle gh, const GWindowInit *pInit);
 #endif /* GFX_USE_GWIN */
 
 #endif /* _CLASS_GWIN_H */
+/** @} */

src/gwin/gwin_console.c

@@ -179,7 +179,7 @@
 		}
 
 		// Was there a newline, if not delete everything.
-		if (p >= ep) {
+		if (*p != '\n') {
 			gcw->bufpos = 0;
 			return;
 		}

src/gwin/gwin_container.c

@@ -72,6 +72,7 @@ gCoord gwinGetInnerHeight(GHandle gh) {
 }
 
 #endif /* GFX_USE_GWIN && GWIN_NEED_CONTAINERS */
+/** @} */
 
 /*-----------------------------------------------
  * The simplest container type - a container
@@ -200,8 +201,6 @@ void gwinContainerDraw_Std(GWidgetObject *gw, void *param) {
 
 		#undef gi
 	}
-#endif /* GDISP_NEED_IMAGE */ 
+#endif
 
-#endif /* GFX_USE_GWIN && GWIN_NEED_CONTAINERS */
+#endif
-
-/** @} */

src/gwin/gwin_keyboard_layout.h

@@ -66,3 +66,4 @@ typedef struct GVKeyTable {
 	} GVKeyTable;
 
 #endif /* _GWIN_KEYBOARD_LAYOUT_H */
+/** @} */

src/gwin/gwin_widget.c

@@ -747,5 +747,5 @@ gBool gwinAttachListener(GListener *pl) {
 
 #undef gw
 #undef wvmt
-
 #endif /* GFX_USE_GWIN && GWIN_NEED_WIDGET */
+/** @} */

src/gwin/gwin_wm.c

@@ -1029,3 +1029,4 @@ static void WM_Raise(GHandle gh) {
 }
 
 #endif /* GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER */
+/** @} */