diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-11-11 13:35:24 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-11-11 13:35:24 +0100 |
| commit | e8ee122321b72e4e4229a8ac985313054e929703 (patch) | |
| tree | 34b9ef7e5c30c5fc6492eaf9e0d7580f67162ac7 | |
| parent | 933ea0a8661fe4552036d9a392bcf2e822e6f60a (diff) | |
| download | uGFX-e8ee122321b72e4e4229a8ac985313054e929703.tar.gz uGFX-e8ee122321b72e4e4229a8ac985313054e929703.tar.bz2 uGFX-e8ee122321b72e4e4229a8ac985313054e929703.zip | |
Revert "removed unused RGB565CONVERT. Please use RGB2COLOR instead"
This reverts commit 8231e9738c20bd676943638830fedeb71ca1195d.
| -rw-r--r-- | demos/mandelbrot/main.c | 1 | ||||
| -rw-r--r-- | include/gdisp.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/demos/mandelbrot/main.c b/demos/mandelbrot/main.c index 92f4aaa2..0c8dc47d 100644 --- a/demos/mandelbrot/main.c +++ b/demos/mandelbrot/main.c @@ -43,6 +43,7 @@ void mandelbrot(float x1, float y1, float x2, float y2) { x = xx - yy + cx;
}
color = ((iter << 8) | (iter&0xFF));
+ //color = RGB565CONVERT(iter*4, iter*13, iter*10);
gdispDrawPixel(i, j, color);
}
}
diff --git a/include/gdisp.h b/include/gdisp.h index 9be97a12..db865284 100644 --- a/include/gdisp.h +++ b/include/gdisp.h @@ -293,6 +293,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); /* Now obsolete functions */
#define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
+#define RGB565CONVERT(r,g,b) RGB2COLOR(r,g,b)
/* Macro definitions for common gets and sets */
#define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
|