FS-10184: [Build-System] Fix missing #ifdefs for proper build w/o libyuv/libvpx

This commit is contained in:
Mike Jerris 2017-03-27 11:50:48 -05:00
parent d832743ddc
commit 440dbf0dd8

View File

@ -289,6 +289,7 @@ SWITCH_DECLARE(void) switch_img_free(switch_image_t **img)
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif #endif
#ifdef SWITCH_HAVE_YUV
static void switch_img_patch_rgb_noalpha(switch_image_t *IMG, switch_image_t *img, int x, int y) static void switch_img_patch_rgb_noalpha(switch_image_t *IMG, switch_image_t *img, int x, int y)
{ {
int i; int i;
@ -324,9 +325,11 @@ static void switch_img_patch_rgb_noalpha(switch_image_t *IMG, switch_image_t *im
} }
} }
} }
#endif
SWITCH_DECLARE(void) switch_img_attenuate(switch_image_t *img) SWITCH_DECLARE(void) switch_img_attenuate(switch_image_t *img)
{ {
#ifdef SWITCH_HAVE_YUV
if (img->fmt != SWITCH_IMG_FMT_ARGB) { if (img->fmt != SWITCH_IMG_FMT_ARGB) {
return; return;
} }
@ -337,10 +340,15 @@ SWITCH_DECLARE(void) switch_img_attenuate(switch_image_t *img)
ARGBAttenuate(img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], ARGBAttenuate(img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED],
img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], img->d_w, img->d_h); img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], img->d_w, img->d_h);
#else
return;
#endif
} }
SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *img, int x, int y, switch_bool_t noalpha) SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *img, int x, int y, switch_bool_t noalpha)
{ {
#ifdef SWITCH_HAVE_YUV
int i; int i;
if (noalpha) { if (noalpha) {
@ -386,6 +394,7 @@ SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *i
dst_argb += dst_stride_argb; dst_argb += dst_stride_argb;
} }
} }
#endif
} }
SWITCH_DECLARE(void) switch_img_patch(switch_image_t *IMG, switch_image_t *img, int x, int y) SWITCH_DECLARE(void) switch_img_patch(switch_image_t *IMG, switch_image_t *img, int x, int y)