diff options
| author | Michael Smith <msmith@xiph.org> | 2005-11-22 22:35:57 +0000 |
|---|---|---|
| committer | Michael Smith <msmith@xiph.org> | 2005-11-22 22:35:57 +0000 |
| commit | a72e695a1e3721fb9b7fcbe7c6bcb036cf4c2567 (patch) | |
| tree | 3740345fcd938536517aae222b956de11b5de451 | |
| parent | 11c39abc9a99d5fcb0070988ffe0d773d9780875 (diff) | |
Fix for #321430: unresolved symbols due to incorrect linkage on inline functions in goom.
Original commit message from CVS:
Fix for #321430: unresolved symbols due to incorrect linkage on inline functions
in goom.
Does not, however, fix the general crackheadedness of goom (global variables,
oh my!); this should be moved to -bad.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/goom/filters.c | 4 | ||||
| -rw-r--r-- | gst/goom/graphic.h | 3 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2005-11-22 Michael Smith <msmith@fluendo.com> + + * gst/goom/filters.c: + * gst/goom/graphic.h: + Fix compilation by making some functions static inline instead of + extern inline, matching the way they're used. + 2005-11-22 Jan Schmidt <thaytan@mad.scientist.com> * ext/cairo/gsttextoverlay.c: (gst_text_overlay_init), diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 076fedd9..16f8f532 100644 --- a/gst/goom/filters.c +++ b/gst/goom/filters.c @@ -182,7 +182,7 @@ calculatePXandPY (int x, int y, int *px, int *py) /*#define _DEBUG */ -extern inline void +static inline void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c) { /* buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */ @@ -220,7 +220,7 @@ setPixelRGB_ (Uint * buffer, Uint x, Color c) -extern inline void +static inline void getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c) { register unsigned char *tmp8; diff --git a/gst/goom/graphic.h b/gst/goom/graphic.h index 67503900..4154d7fd 100644 --- a/gst/goom/graphic.h +++ b/gst/goom/graphic.h @@ -20,7 +20,4 @@ extern const Color YELLOW; extern const Color ORANGE; extern const Color VIOLET; -extern inline void setPixelRGB (Uint *buffer, Uint x, Uint y, Color c) ; -extern inline void getPixelRGB (Uint *buffer, Uint x, Uint y, Color *c) ; - #endif /*GRAPHIC_H*/ |