From 06affa3248460ff2dca714bcddb7c43a5696201d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 17 Sep 2014 10:12:42 +0200 Subject: [PATCH] Value initialize class with () not {} Fixes problems with GCC 4.6 --- src/blackmagic_common.cpp | 2 +- src/capture_filter/logo.cpp | 4 ++-- src/hd-rum-translator/hd-rum-decompress.cpp | 2 +- src/rtp/video_decoders.cpp | 2 +- src/utils/video_frame_pool.h | 2 +- src/video_capture/decklink.cpp | 2 +- src/video_compress/cuda_dxt.cpp | 2 +- src/video_compress/dxt_glsl.cpp | 2 +- src/video_compress/jpeg.cpp | 2 +- src/video_decompress/jpeg_to_dxt.cpp | 2 +- src/video_display/decklink.cpp | 6 +++--- src/video_display/sdl.cpp | 6 +++--- src/vo_postprocess/deinterlace.cpp | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/blackmagic_common.cpp b/src/blackmagic_common.cpp index 45740a4ff..ad7a7345c 100644 --- a/src/blackmagic_common.cpp +++ b/src/blackmagic_common.cpp @@ -104,7 +104,7 @@ void release_bmd_api_str(BMD_STR string) IDeckLinkIterator *create_decklink_iterator(bool verbose) { - IDeckLinkIterator *deckLinkIterator{}; + IDeckLinkIterator *deckLinkIterator = nullptr; #ifdef WIN32 HRESULT result = CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL, IID_IDeckLinkIterator, (void **) &deckLinkIterator); diff --git a/src/capture_filter/logo.cpp b/src/capture_filter/logo.cpp index bd5abd7c4..5bf0a5ebe 100644 --- a/src/capture_filter/logo.cpp +++ b/src/capture_filter/logo.cpp @@ -80,7 +80,7 @@ static bool load_logo_data_from_file(struct state_capture_filter_logo *s, const } getline(file, line); bool rgb = false; - int depth{}; + int depth = 0; while (!file.eof()) { if (line.compare(0, strlen("WIDTH"), "WIDTH") == 0) { s->width = atoi(line.c_str() + strlen("WIDTH ")); @@ -137,7 +137,7 @@ static bool load_logo_data_from_file(struct state_capture_filter_logo *s, const static int init(struct module *parent, const char *cfg, void **state) { UNUSED(parent); - struct state_capture_filter_logo *s = new state_capture_filter_logo{}; + struct state_capture_filter_logo *s = new state_capture_filter_logo(); s->x = s->y = -1; diff --git a/src/hd-rum-translator/hd-rum-decompress.cpp b/src/hd-rum-translator/hd-rum-decompress.cpp index dcb6958f3..33a65258c 100644 --- a/src/hd-rum-translator/hd-rum-decompress.cpp +++ b/src/hd-rum-translator/hd-rum-decompress.cpp @@ -161,7 +161,7 @@ static void *worker(void *arg) memset(&last_desc, 0, sizeof(last_desc)); memset(&last_fec_desc, 0, sizeof(last_fec_desc)); - struct video_desc video_header{}; + struct video_desc video_header = video_desc(); pthread_mutex_unlock(&s->lock); diff --git a/src/rtp/video_decoders.cpp b/src/rtp/video_decoders.cpp index 57bc19b11..6a037c54e 100644 --- a/src/rtp/video_decoders.cpp +++ b/src/rtp/video_decoders.cpp @@ -632,7 +632,7 @@ struct state_video_decoder *video_decoder_init(struct module *parent, { struct state_video_decoder *s; - s = new state_video_decoder{}; // call the constructor + s = new state_video_decoder(); s->parent = parent; diff --git a/src/utils/video_frame_pool.h b/src/utils/video_frame_pool.h index 33b66835e..5cbbbfd11 100644 --- a/src/utils/video_frame_pool.h +++ b/src/utils/video_frame_pool.h @@ -86,7 +86,7 @@ struct video_frame_pool { }; public: - video_frame_pool() : m_generation(0), m_desc{}, m_max_data_len(0) { + video_frame_pool() : m_generation(0), m_desc(), m_max_data_len(0) { pthread_mutex_init(&m_lock, NULL); } diff --git a/src/video_capture/decklink.cpp b/src/video_capture/decklink.cpp index 7ae32efcd..baf0f06dc 100644 --- a/src/video_capture/decklink.cpp +++ b/src/video_capture/decklink.cpp @@ -578,7 +578,7 @@ vidcap_decklink_probe(bool verbose) vt->name = "decklink"; vt->description = "Blackmagic DeckLink card"; - IDeckLinkIterator* deckLinkIterator{}; + IDeckLinkIterator* deckLinkIterator = nullptr; IDeckLink* deckLink; int numDevices = 0; HRESULT result; diff --git a/src/video_compress/cuda_dxt.cpp b/src/video_compress/cuda_dxt.cpp index 84ec01c5e..3bd38d071 100644 --- a/src/video_compress/cuda_dxt.cpp +++ b/src/video_compress/cuda_dxt.cpp @@ -87,7 +87,7 @@ struct module *cuda_dxt_compress_init(struct module *parent, const struct video_compress_params *params) { state_video_compress_cuda_dxt *s = - new state_video_compress_cuda_dxt{}; + new state_video_compress_cuda_dxt(); const char *fmt = params->cfg; s->out_codec = DXT1; diff --git a/src/video_compress/dxt_glsl.cpp b/src/video_compress/dxt_glsl.cpp index 7d976d049..21ea091f1 100644 --- a/src/video_compress/dxt_glsl.cpp +++ b/src/video_compress/dxt_glsl.cpp @@ -229,7 +229,7 @@ struct module *dxt_glsl_compress_init(struct module *parent, const struct video_ return &compress_init_noerr; } - s = new state_video_compress_rtdxt{}; + s = new state_video_compress_rtdxt(); if (strcasecmp(opts, "DXT5") == 0) { s->color_spec = DXT5; diff --git a/src/video_compress/jpeg.cpp b/src/video_compress/jpeg.cpp index 5af762cbd..dc4bae04b 100644 --- a/src/video_compress/jpeg.cpp +++ b/src/video_compress/jpeg.cpp @@ -272,7 +272,7 @@ struct module * jpeg_compress_init(struct module *parent, const struct video_com struct state_video_compress_jpeg *s; const char *opts = params->cfg; - s = new state_video_compress_jpeg{}; + s = new state_video_compress_jpeg(); if(opts && strcmp(opts, "help") == 0) { printf("JPEG comperssion usage:\n"); diff --git a/src/video_decompress/jpeg_to_dxt.cpp b/src/video_decompress/jpeg_to_dxt.cpp index 4a651547a..1f62ce9e2 100644 --- a/src/video_decompress/jpeg_to_dxt.cpp +++ b/src/video_decompress/jpeg_to_dxt.cpp @@ -61,7 +61,7 @@ namespace { struct thread_data { thread_data() : m_in(1), m_out(1), - jpeg_decoder(0), desc{}, out_codec{}, ppb{}, dxt_out_buff(0), + jpeg_decoder(0), desc(), out_codec(), ppb(), dxt_out_buff(0), cuda_dev_index(-1) {} message_queue m_in; diff --git a/src/video_display/decklink.cpp b/src/video_display/decklink.cpp index 4bafe6cbf..840a181e9 100644 --- a/src/video_display/decklink.cpp +++ b/src/video_display/decklink.cpp @@ -348,7 +348,7 @@ display_decklink_getf(void *state) if (s->initialized) { for (unsigned int i = 0; i < s->vid_desc.tile_count; ++i) { const int linesize = vc_get_linesize(s->vid_desc.width, s->vid_desc.color_spec); - IDeckLinkMutableVideoFrame *deckLinkFrame{}; + IDeckLinkMutableVideoFrame *deckLinkFrame = nullptr; lock_guard lg(s->buffer_pool.second); while (!s->buffer_pool.first.empty()) { @@ -386,7 +386,7 @@ display_decklink_getf(void *state) deckLinkFrame->GetBytes((void **) &out->tiles[i].data); if (s->stereo) { - IDeckLinkVideoFrame *deckLinkFrameRight{}; + IDeckLinkVideoFrame *deckLinkFrameRight = nullptr; dynamic_cast(deckLinkFrame)->GetFrameForRightEye(&deckLinkFrameRight); deckLinkFrameRight->GetBytes((void **) &out->tiles[1].data); // release immedieatelly (parent still holds the reference) @@ -745,7 +745,7 @@ void *display_decklink_init(const char *fmt, unsigned int flags) } - s = new state_decklink{}; + s = new state_decklink(); s->magic = DECKLINK_MAGIC; s->stereo = FALSE; s->emit_timecode = false; diff --git a/src/video_display/sdl.cpp b/src/video_display/sdl.cpp index bf79aa31e..3db5d8987 100644 --- a/src/video_display/sdl.cpp +++ b/src/video_display/sdl.cpp @@ -110,10 +110,10 @@ struct state_sdl { #endif volatile bool should_exit; - state_sdl() : magic(MAGIC_SDL), frames(0), yuv_image(nullptr), sdl_screen(nullptr), dst_rect{}, + state_sdl() : magic(MAGIC_SDL), frames(0), yuv_image(nullptr), sdl_screen(nullptr), dst_rect(), deinterlace(false), fs(false), nodecorate(false), - screen_w(0), screen_h(0), audio_buffer(nullptr), audio_frame{}, play_audio(false), - current_desc{}, current_display_desc{}, + screen_w(0), screen_h(0), audio_buffer(nullptr), audio_frame(), play_audio(false), + current_desc(), current_display_desc(), #ifdef HAVE_MACOSX autorelease_pool(nullptr), #endif diff --git a/src/vo_postprocess/deinterlace.cpp b/src/vo_postprocess/deinterlace.cpp index 57c67906c..5462dce2e 100644 --- a/src/vo_postprocess/deinterlace.cpp +++ b/src/vo_postprocess/deinterlace.cpp @@ -64,7 +64,7 @@ void * deinterlace_init(char *config) { return NULL; } - struct state_deinterlace *s = new state_deinterlace{}; + struct state_deinterlace *s = new state_deinterlace(); return s; }