diff options
| author | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
|---|---|---|
| committer | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
| commit | 65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch) | |
| tree | 30920f0457522be32ce2b332afe0d2916d93cf66 /src/gdisp/gdisp_image.h | |
| parent | 992850bcb1992ff052d5ac2379e4675a34861723 (diff) | |
| parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
| download | uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2 uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip | |
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
Diffstat (limited to 'src/gdisp/gdisp_image.h')
| -rw-r--r-- | src/gdisp/gdisp_image.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h index d921e063..4cd348cf 100644 --- a/src/gdisp/gdisp_image.h +++ b/src/gdisp/gdisp_image.h @@ -127,7 +127,7 @@ extern "C" { * @details Determine the image format and get ready to decode the first image frame * @return GDISP_IMAGE_ERR_OK (0) on success or an error code. * - * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be TRUE. This only makes sense on the ChibiOS + * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be GFXON. This only makes sense on the ChibiOS * operating system. * * @param[in] img The image structure @@ -142,7 +142,7 @@ extern "C" { * @details Determine the image format and get ready to decode the first image frame * @return GDISP_IMAGE_ERR_OK (0) on success or an error code. * - * @pre GFILE_NEED_MEMFS must be TRUE + * @pre GFILE_NEED_MEMFS must be GFXON * * @param[in] img The image structure * @param[in] ptr A pointer to the image bytes in memory |