summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-10 19:31:01 (UTC)
committer sandman <sandman>2002-09-10 19:31:01 (UTC)
commitb32eceaca5f1dbbfd7cd0709a34ce6f97929e28f (patch) (unidiff)
tree22a605d7a7d6e697140e0334e8160881d41fe6fc
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 (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
@@ -5563,33 +5563,33 @@ static struct EmbedImage {
5563 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" }, 5563 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" },
5564 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" }, 5564 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" },
5565 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" }, 5565 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" },
5566 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" }, 5566 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" },
5567 { 96, 16, 8, (const unsigned char*)wordgame_shapes_data, 9, wordgame_shapes_ctable, TRUE, "wordgame_shapes" }, 5567 { 96, 16, 8, (const unsigned char*)wordgame_shapes_data, 9, wordgame_shapes_ctable, TRUE, "wordgame_shapes" },
5568 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" }, 5568 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" },
5569 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" }, 5569 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" },
5570 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" }, 5570 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" },
5571}; 5571};
5572 5572
5573static int cmpEmbedImage(const void *a, const void *b) 5573static int cmpEmbedImage(const void *a, const void *b)
5574{ 5574{
5575 const EmbedImage* ea = (const EmbedImage*)a; 5575 const EmbedImage* ea = (const EmbedImage*)a;
5576 const EmbedImage* eb = (const EmbedImage*)b; 5576 const EmbedImage* eb = (const EmbedImage*)b;
5577 return strcmp(ea->name,eb->name); 5577 return strcmp(ea->name,eb->name);
5578} 5578}
5579inline const QImage& qembed_findImage(const char* name) 5579inline static const QImage& qembed_findImage(const char* name)
5580{ 5580{
5581 EmbedImage key; key.name = name; 5581 EmbedImage key; key.name = name;
5582 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec, 5582 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
5583 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage ); 5583 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
5584 QImage* img; 5584 QImage* img;
5585 if ( r ) { 5585 if ( r ) {
5586 img = new QImage((uchar*)r->data, 5586 img = new QImage((uchar*)r->data,
5587 r->width, 5587 r->width,
5588 r->height, 5588 r->height,
5589 r->depth, 5589 r->depth,
5590#ifdef _WS_QWS_ 5590#ifdef _WS_QWS_
5591 (r->width*r->depth+31)/32*4, 5591 (r->width*r->depth+31)/32*4,
5592#endif 5592#endif
5593 (QRgb*)r->colorTable, 5593 (QRgb*)r->colorTable,
5594 r->numColors, 5594 r->numColors,
5595 QImage::BigEndian 5595 QImage::BigEndian