author | sandman <sandman> | 2002-09-10 19:31:01 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-10 19:31:01 (UTC) |
commit | b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f (patch) (unidiff) | |
tree | 22a605d7a7d6e697140e0334e8160881d41fe6fc | |
parent | 62bed9ee719bba0432596ad21f326a9e91b8a547 (diff) | |
download | opie-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
-rw-r--r-- | library/inlinepics_p.h | 2 |
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 { | |||
5547 | { 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" }, | 5547 | { 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" }, |
5548 | { 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" }, | 5548 | { 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" }, |
5549 | { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" }, | 5549 | { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" }, |
5550 | { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" }, | 5550 | { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" }, |
5551 | { 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" }, | 5551 | { 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" }, |
5552 | { 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" }, | 5552 | { 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" }, |
5553 | { 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" }, | 5553 | { 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" }, |
5554 | { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" }, | 5554 | { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" }, |
5555 | { 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" }, | 5555 | { 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" }, |
5556 | { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" }, | 5556 | { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" }, |
5557 | { 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" }, | 5557 | { 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" }, |
5558 | { 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" }, | 5558 | { 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" }, |
5559 | { 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" }, | 5559 | { 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" }, |
5560 | { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" }, | 5560 | { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" }, |
5561 | { 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" }, | 5561 | { 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" }, |
5562 | { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" }, | 5562 | { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" }, |
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 | ||
5573 | static int cmpEmbedImage(const void *a, const void *b) | 5573 | static 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 | } |
5579 | inline const QImage& qembed_findImage(const char* name) | 5579 | inline 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 |
5596 | ); | 5596 | ); |
5597 | if ( r->alpha ) | 5597 | if ( r->alpha ) |
5598 | img->setAlphaBuffer(TRUE); | 5598 | img->setAlphaBuffer(TRUE); |
5599 | } else { | 5599 | } else { |
5600 | static QImage dummy; | 5600 | static QImage dummy; |
5601 | img = &dummy; | 5601 | img = &dummy; |
5602 | } | 5602 | } |
5603 | return *img; | 5603 | return *img; |
5604 | } | 5604 | } |
5605 | 5605 | ||
5606 | #endif | 5606 | #endif |