From 74050ac2f8c1b2c1aaa7eb08e6c62ae03c942b87 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 6 Mar 2011 18:30:23 +0000 Subject: [PATCH] cFramebuffer: fix compiler warnings for !USE_NEVIS_GXA case git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1267 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/eea87682d2511e6076ec4abf241f87656593a4d9 Author: Stefan Seyfried Date: 2011-03-06 (Sun, 06 Mar 2011) ------------------ This commit was generated by Migit --- src/driver/framebuffer.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 12fb804a1..2bf0ed123 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -911,9 +911,9 @@ bool CFrameBuffer::paintIcon8(const std::string & filename, const int x, const i return true; } +#ifdef USE_NEVIS_GXA bool CFrameBuffer::blitToPrimary(unsigned int * data, int dx, int dy, int sw, int sh) { -#ifdef USE_NEVIS_GXA u32 cmd; void * uKva; @@ -932,10 +932,13 @@ printf("CFrameBuffer::blitToPrimary: data %x Kva %x\n", (int) data, (int) uKva); _write_gxa(gxa_base, cmd, GXA_POINT(0, 0)); /* source pos */ return true; -#else - return false; -#endif } +#else +bool CFrameBuffer::blitToPrimary(unsigned int *, int, int, int, int) +{ + return false; +} +#endif /* paint icon at position x/y, if height h is given, center vertically between y and y+h