summaryrefslogtreecommitdiff
path: root/library
authorsandman <sandman>2002-09-10 19:31:01 (UTC)
committer sandman <sandman>2002-09-10 19:31:01 (UTC)
commitb32eceaca5f1dbbfd7cd0709a34ce6f97929e28f (patch) (side-by-side diff)
tree22a605d7a7d6e697140e0334e8160881d41fe6fc /library
parent62bed9ee719bba0432596ad21f326a9e91b8a547 (diff)
downloadopie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.zip
opie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.tar.gz
opie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.tar.bz2
Workaround for gcc bug: gcc is irgnoring the inline keyword and the
qembed_findImage function is exported to libqpe
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/inlinepics_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/inlinepics_p.h b/library/inlinepics_p.h
index 52d184b..892c321 100644
--- a/library/inlinepics_p.h
+++ b/library/inlinepics_p.h
@@ -5547,60 +5547,60 @@ static struct EmbedImage {
{ 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" },
{ 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" },
{ 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" },
{ 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" },
{ 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" },
{ 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" },
{ 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" },
{ 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" },
{ 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" },
{ 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" },
{ 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" },
{ 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" },
{ 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" },
{ 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" },
{ 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" },
{ 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" },
{ 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" },
{ 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" },
{ 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" },
{ 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" },
{ 96, 16, 8, (const unsigned char*)wordgame_shapes_data, 9, wordgame_shapes_ctable, TRUE, "wordgame_shapes" },
{ 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" },
{ 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" },
{ 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" },
};
static int cmpEmbedImage(const void *a, const void *b)
{
const EmbedImage* ea = (const EmbedImage*)a;
const EmbedImage* eb = (const EmbedImage*)b;
return strcmp(ea->name,eb->name);
}
-inline const QImage& qembed_findImage(const char* name)
+inline static const QImage& qembed_findImage(const char* name)
{
EmbedImage key; key.name = name;
EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
QImage* img;
if ( r ) {
img = new QImage((uchar*)r->data,
r->width,
r->height,
r->depth,
#ifdef _WS_QWS_
(r->width*r->depth+31)/32*4,
#endif
(QRgb*)r->colorTable,
r->numColors,
QImage::BigEndian
);
if ( r->alpha )
img->setAlphaBuffer(TRUE);
} else {
static QImage dummy;
img = &dummy;
}
return *img;
}
#endif