summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-23 10:16:35 (UTC)
committer sandman <sandman>2002-09-23 10:16:35 (UTC)
commit4af73fb07b69dce910abb2ac098b1045403cda67 (patch) (unidiff)
treef8a7c1ff8a18a88709ac52e42a472431f0aa7010
parent8b06ea9e4407628ebae54d63592e8b8c940a62ad (diff)
downloadopie-4af73fb07b69dce910abb2ac098b1045403cda67.zip
opie-4af73fb07b69dce910abb2ac098b1045403cda67.tar.gz
opie-4af73fb07b69dce910abb2ac098b1045403cda67.tar.bz2
gcc workaround for inline applied once again .. thanks Harlekin ;)
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 daa7413..c796326 100644
--- a/library/inlinepics_p.h
+++ b/library/inlinepics_p.h
@@ -3700,33 +3700,33 @@ static struct EmbedImage {
3700 { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" }, 3700 { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" },
3701 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" }, 3701 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" },
3702 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" }, 3702 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" },
3703 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" }, 3703 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" },
3704 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" }, 3704 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" },
3705 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" }, 3705 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" },
3706 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" }, 3706 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" },
3707 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" }, 3707 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" },
3708}; 3708};
3709 3709
3710static int cmpEmbedImage(const void *a, const void *b) 3710static int cmpEmbedImage(const void *a, const void *b)
3711{ 3711{
3712 const EmbedImage* ea = (const EmbedImage*)a; 3712 const EmbedImage* ea = (const EmbedImage*)a;
3713 const EmbedImage* eb = (const EmbedImage*)b; 3713 const EmbedImage* eb = (const EmbedImage*)b;
3714 return strcmp(ea->name,eb->name); 3714 return strcmp(ea->name,eb->name);
3715} 3715}
3716inline const QImage& qembed_findImage(const char* name) 3716inline static const QImage& qembed_findImage(const char* name)
3717{ 3717{
3718 EmbedImage key; key.name = name; 3718 EmbedImage key; key.name = name;
3719 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec, 3719 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
3720 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage ); 3720 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
3721 QImage* img; 3721 QImage* img;
3722 if ( r ) { 3722 if ( r ) {
3723 img = new QImage((uchar*)r->data, 3723 img = new QImage((uchar*)r->data,
3724 r->width, 3724 r->width,
3725 r->height, 3725 r->height,
3726 r->depth, 3726 r->depth,
3727 (QRgb*)r->colorTable, 3727 (QRgb*)r->colorTable,
3728 r->numColors, 3728 r->numColors,
3729 QImage::BigEndian 3729 QImage::BigEndian
3730 ); 3730 );
3731 if ( r->alpha ) 3731 if ( r->alpha )
3732 img->setAlphaBuffer(TRUE); 3732 img->setAlphaBuffer(TRUE);