diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-10-03 15:35:38 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-10-03 15:35:38 +0200 |
| commit | c2b80edb2bcff20b0dc4b5b5ee07c6aa45603a99 (patch) | |
| tree | 1849fc5eaef01ceaa28d165df86564dd6ec2dab7 | |
| parent | d982412a34cf4e672da6ee89edf2728a646f5f6b (diff) | |
| download | osc-graphics-c2b80edb2bcff20b0dc4b5b5ee07c6aa45603a99.tar.gz | |
minor macro cleanup
| -rw-r--r-- | src/layer_image.cpp | 8 | ||||
| -rw-r--r-- | src/layer_image.h | 8 | ||||
| -rw-r--r-- | src/layer_text.cpp | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/layer_image.cpp b/src/layer_image.cpp index 7f338b2..9b17788 100644 --- a/src/layer_image.cpp +++ b/src/layer_image.cpp @@ -13,6 +13,14 @@ Layer::CtorInfo LayerImage::ctor_info = {"image", "s" /* file */}; +/* + * Macros + */ +#define SDL_IMAGE_ERROR(FMT, ...) do { \ + fprintf(stderr, "%s(%d): " FMT ": %s\n", \ + __FILE__, __LINE__, ##__VA_ARGS__, IMG_GetError()); \ +} while (0) + LayerImage::LayerImage(const char *name, SDL_Rect geo, float opacity, const char *file) : Layer(name), diff --git a/src/layer_image.h b/src/layer_image.h index 5f2271f..1674348 100644 --- a/src/layer_image.h +++ b/src/layer_image.h @@ -47,12 +47,4 @@ private: } }; -/* - * Macros - */ -#define SDL_IMAGE_ERROR(FMT, ...) do { \ - fprintf(stderr, "%s(%d): " FMT ": %s\n", \ - __FILE__, __LINE__, ##__VA_ARGS__, IMG_GetError()); \ -} while (0) - #endif diff --git a/src/layer_text.cpp b/src/layer_text.cpp index 32b4963..38ba0e5 100644 --- a/src/layer_text.cpp +++ b/src/layer_text.cpp @@ -16,6 +16,9 @@ Layer::CtorInfo LayerText::ctor_info = { COLOR_TYPES "ss" /* r, g, b, text, font file */ }; +/* + * Macros + */ #define TTF_CLOSEFONT_SAFE(FONT) do { \ if (FONT) { \ TTF_CloseFont(FONT); \ |