From facc6328e46eb0c973c6293390a14258abf071d4 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Mon, 24 Mar 2014 20:52:57 -0700 Subject: [PATCH] Fix reading binary files on Windows. --- src/modules/core/transition_composite.c | 2 +- src/modules/core/transition_luma.c | 2 +- src/modules/dv/consumer_libdv.c | 2 +- src/modules/vmfx/producer_pgm.c | 2 +- src/modules/vorbis/producer_vorbis.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index cd0183b5..9b9eada2 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -674,7 +674,7 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 ) { // Open PGM - FILE *f = fopen( resource, "r" ); + FILE *f = fopen( resource, "rb" ); if ( f != NULL ) { // Load from PGM diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c index c3263da2..224511f7 100644 --- a/src/modules/core/transition_luma.c +++ b/src/modules/core/transition_luma.c @@ -367,7 +367,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 ) { // Open PGM - FILE *f = fopen( resource, "r" ); + FILE *f = fopen( resource, "rb" ); if ( f != NULL ) { // Load from PGM diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index 3a9949c2..916c36f5 100644 --- a/src/modules/dv/consumer_libdv.c +++ b/src/modules/dv/consumer_libdv.c @@ -343,7 +343,7 @@ static void consumer_output( mlt_consumer this, uint8_t *dv_frame, int size, mlt output = mlt_properties_get_data( properties, "output_file", NULL ); if ( output == NULL ) { - output = fopen( target, "w" ); + output = fopen( target, "wb" ); if ( output != NULL ) mlt_properties_set_data( properties, "output_file", output, 0, ( mlt_destructor )fclose, 0 ); } diff --git a/src/modules/vmfx/producer_pgm.c b/src/modules/vmfx/producer_pgm.c index 5a74fa03..c0b342c2 100644 --- a/src/modules/vmfx/producer_pgm.c +++ b/src/modules/vmfx/producer_pgm.c @@ -66,7 +66,7 @@ static int read_pgm( char *name, uint8_t **image, int *width, int *height, int * { uint8_t *input = NULL; int error = 0; - FILE *f = fopen( name, "r" ); + FILE *f = fopen( name, "rb" ); char data[ 512 ]; // Initialise diff --git a/src/modules/vorbis/producer_vorbis.c b/src/modules/vorbis/producer_vorbis.c index 92010862..72f38917 100644 --- a/src/modules/vorbis/producer_vorbis.c +++ b/src/modules/vorbis/producer_vorbis.c @@ -124,7 +124,7 @@ static void producer_file_close( void *file ) static int producer_open( mlt_producer this, mlt_profile profile, char *file ) { // FILE pointer for file - FILE *input = fopen( file, "r" ); + FILE *input = fopen( file, "rb" ); // Error code to return int error = input == NULL; -- 2.39.2