diff options
| author | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
| commit | 39bde23dd9b156b05aad549ca1d9c0e5026378fe (patch) | |
| tree | cd09969caf68e02571faecc53a3b8ba8e047f716 /src/gdisp/gdisp_pixmap.h | |
| parent | 835f0f197f7fc7eecf5dcd36892987c71caa5caa (diff) | |
| parent | ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc (diff) | |
| download | uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.gz uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.bz2 uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/gdisp/gdisp_pixmap.h')
| -rw-r--r-- | src/gdisp/gdisp_pixmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gdisp/gdisp_pixmap.h b/src/gdisp/gdisp_pixmap.h index b5e5f099..de6d1ad5 100644 --- a/src/gdisp/gdisp_pixmap.h +++ b/src/gdisp/gdisp_pixmap.h @@ -63,13 +63,13 @@ gPixel *gdispPixmapGetBits(GDisplay *g); #if GDISP_NEED_PIXMAP_IMAGE || defined(__DOXYGEN__) /** - * @brief Get a pointer to a native format gdispImage. - * @return A pointer to a NATIVE format gdispImage in memory or NULL if this display is not a pixmap. + * @brief Get a pointer to a native format gImage. + * @return A pointer to a NATIVE format gImage in memory or NULL if this display is not a pixmap. * @pre GDISP_NEED_PIXAMP_IMAGE must be GFXON in your gfxconf.h * * @param[in] g The pixmap virtual display * - * @return The pointer to the native gdispImage + * @return The pointer to the native gImage * * @note The pointer returned can be passed to @p gdispImageOpenMemory() or to @p gfileOpenMemory(). * @note If you are just wanting to copy to a real display it is more efficient to use @p gdispGetPixmapBits() and @p gdispGBlitArea(). |