[Mlt-devel] SF.net SVN: mlt:[1398] trunk/mlt/src

[<dde...@us...>]

Revision: 1398
          http://mlt.svn.sourceforge.net/mlt/?rev=1398&view=rev
Author:   ddennedy
Date:     2009-04-10 07:54:00 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
Merge branch 'review-2' of git://github.com/rayl/mlt

Conflicts:
	src/miracle/miracle_connection.c

Modified Paths:
--------------
    trunk/mlt/src/framework/mlt_consumer.c
    trunk/mlt/src/framework/mlt_pool.c
    trunk/mlt/src/miracle/miracle_connection.c
    trunk/mlt/src/modules/kdenlive/filter_boxblur.c
    trunk/mlt/src/modules/kino/riff.cc

Modified: trunk/mlt/src/framework/mlt_consumer.c
===================================================================
--- trunk/mlt/src/framework/mlt_consumer.c	2009-04-10 07:25:36 UTC (rev 1397)
+++ trunk/mlt/src/framework/mlt_consumer.c	2009-04-10 07:54:00 UTC (rev 1398)
@@ -409,7 +409,8 @@
 
 	// Check and run an ante command
 	if ( mlt_properties_get( properties, "ante" ) )
-		system( mlt_properties_get( properties, "ante" ) );
+		if ( system( mlt_properties_get( properties, "ante" ) ) == -1 )
+			mlt_log( MLT_CONSUMER_SERVICE( this ), MLT_LOG_ERROR, "system(%s) failed!\n", mlt_properties_get( properties, "ante" ) );
 
 	// Set the real_time preference
 	this->real_time = mlt_properties_get_int( properties, "real_time" );
@@ -949,7 +950,8 @@
 
 	// Check and run a post command
 	if ( mlt_properties_get( properties, "post" ) )
-		system( mlt_properties_get( properties, "post" ) );
+		if (system( mlt_properties_get( properties, "post" ) ) == -1 )
+			mlt_log( MLT_CONSUMER_SERVICE( this ), MLT_LOG_ERROR, "system(%s) failed!\n", mlt_properties_get( properties, "post" ) );
 
 	mlt_log( MLT_CONSUMER_SERVICE( this ), MLT_LOG_DEBUG, "stopped\n" );
 

Modified: trunk/mlt/src/framework/mlt_pool.c
===================================================================
--- trunk/mlt/src/framework/mlt_pool.c	2009-04-10 07:25:36 UTC (rev 1397)
+++ trunk/mlt/src/framework/mlt_pool.c	2009-04-10 07:54:00 UTC (rev 1398)
@@ -137,7 +137,7 @@
 				release->references = 1;
 
 				// Determine the ptr
-				ptr = ( void * )release + sizeof( struct mlt_release_s );
+				ptr = ( char * )release + sizeof( struct mlt_release_s );
 			}
 		}
 
@@ -161,7 +161,7 @@
 	if ( ptr != NULL )
 	{
 		// Get the release pointer
-		mlt_release that = ptr - sizeof( struct mlt_release_s );
+		mlt_release that = ( void * )(( char * )ptr - sizeof( struct mlt_release_s ));
 
 		// Get the pool
 		mlt_pool this = that->pool;
@@ -186,7 +186,7 @@
 	if ( ptr != NULL )
 	{
 		// Free the release itself
-		free( ptr - sizeof( struct mlt_release_s ) );
+		free( ( char * )ptr - sizeof( struct mlt_release_s ) );
 	}
 }
 
@@ -207,7 +207,7 @@
 		while ( ( release = mlt_deque_pop_back( this->stack ) ) != NULL )
 		{
 			// We'll free this item now
-			free( release - sizeof( struct mlt_release_s ) );
+			free( ( char * )release - sizeof( struct mlt_release_s ) );
 		}
 
 		// We can now close the stack
@@ -293,7 +293,7 @@
 	if ( ptr != NULL )
 	{
 		// Get the release pointer
-		mlt_release that = ptr - sizeof( struct mlt_release_s );
+		mlt_release that = ( void * )(( char * )ptr - sizeof( struct mlt_release_s ));
 
 		// If the current pool this ptr belongs to is big enough
 		if ( size > that->pool->size - sizeof( struct mlt_release_s ) )
@@ -346,7 +346,7 @@
 
 		// We'll free all unused items now
 		while ( ( release = mlt_deque_pop_back( this->stack ) ) != NULL )
-			free( release - sizeof( struct mlt_release_s ) );
+			free( ( char * )release - sizeof( struct mlt_release_s ) );
 
 		// Unlock the pool
 		pthread_mutex_unlock( &this->lock );

Modified: trunk/mlt/src/miracle/miracle_connection.c
===================================================================
--- trunk/mlt/src/miracle/miracle_connection.c	2009-04-10 07:25:36 UTC (rev 1397)
+++ trunk/mlt/src/miracle/miracle_connection.c	2009-04-10 07:54:00 UTC (rev 1398)
@@ -129,12 +129,14 @@
 		}
 
 		if ( ( code == 201 || code == 500 ) && strcmp( valerie_response_get_line( response, items - 1 ), "" ) )
-			write( fd, "\r\n", 2 );
+			if ( write( fd, "\r\n", 2 ) != 2 )
+				miracle_log( LOG_ERR, "write(\"\\r\\n\") failed!" );
 	}
 	else
 	{
 		const char *message = "500 Empty Response\r\n\r\n";
-		write( fd, message, strlen( message ) );
+		if ( write( fd, message, strlen( message ) ) != strlen( message ))
+			miracle_log( LOG_ERR, "write(%s) failed!", message );
 	}
 
 	return error;

Modified: trunk/mlt/src/modules/kdenlive/filter_boxblur.c
===================================================================
--- trunk/mlt/src/modules/kdenlive/filter_boxblur.c	2009-04-10 07:25:36 UTC (rev 1397)
+++ trunk/mlt/src/modules/kdenlive/filter_boxblur.c	2009-04-10 07:54:00 UTC (rev 1398)
@@ -26,7 +26,7 @@
 #include <math.h>
 
 
-static void PreCompute(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int height)
+static void PreCompute(uint8_t *yuv, int32_t *rgb, int width, int height)
 {
 	register int x, y, z;
 	register int uneven = width % 2;

Modified: trunk/mlt/src/modules/kino/riff.cc
===================================================================
--- trunk/mlt/src/modules/kino/riff.cc	2009-04-10 07:25:36 UTC (rev 1397)
+++ trunk/mlt/src/modules/kino/riff.cc	2009-04-10 07:54:00 UTC (rev 1398)
@@ -515,7 +515,7 @@
 
 	/* Check whether it is a LIST. If so, let ParseList deal with it */
 
-	read( fd, &type, sizeof( type ) );
+	fail_if( read( fd, &type, sizeof( type ) ) != sizeof( type ));
 	if ( type == make_fourcc( "LIST" ) )
 	{
 		typesize = (int) -sizeof( type );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.