[Mlt-devel] mlt/src/modules/qimage Makefile,1.1,1.2 configure,1.1,1.2 qimage_wrapper.cpp,1.1,1.2

[Charles Y. <lil...@us...>]

Update of /cvsroot/mlt/mlt/src/modules/qimage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18629

Modified Files:
	Makefile configure qimage_wrapper.cpp 
Log Message:
+ And a fix for the PPC darwin

Index: Makefile
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/qimage/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	29 Mar 2006 08:59:07 -0000	1.1
+++ Makefile	29 Mar 2006 11:23:25 -0000	1.2
@@ -1,12 +1,12 @@
 include ../../../config.mak
 include config.mak
 
-TARGET=../libmltqimage.so
+TARGET=../libmltqimage$(LIBSUF)
 
 OBJS=factory.o producer_qimage.o
 CPPOBJS=qimage_wrapper.o
 CFLAGS+=-I../../
-LDFLAGS+=-L../../framework $(QTLIBS) -lmlt -lstdc++
+LDFLAGS=-L../../framework $(QTLIBS) -lmlt -lstdc++
 CXXFLAGS+=$(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
 
 SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)
@@ -14,7 +14,7 @@
 all: 	$(TARGET)
 
 $(TARGET): $(OBJS) $(CPPOBJS)
-		$(CC) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
+		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
 		$(CC) -MM $(CFLAGS) $(QTCXXFLAGS) $^ 1>.depend

Index: configure
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/qimage/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure	29 Mar 2006 08:59:07 -0000	1.1
+++ configure	29 Mar 2006 11:23:25 -0000	1.2
@@ -41,7 +41,7 @@
 	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
 	then
 		echo QTCXXFLAGS=-I$qimage_includedir > config.mak
-		echo QTLIBS=-lqt-mt >> config.mak
+		echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
 		echo qimage		libmltqimage$LIBSUF >> ../producers.dat
 	else
 		echo "qimage: QT environment not found - disabling"

Index: qimage_wrapper.cpp
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/qimage/qimage_wrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qimage_wrapper.cpp	29 Mar 2006 08:59:07 -0000	1.1
+++ qimage_wrapper.cpp	29 Mar 2006 11:23:25 -0000	1.2
@@ -153,7 +153,10 @@
 		current_alpha = ( uint8_t * )mlt_pool_alloc( current_width * current_height );
 
 		// Convert the image
-		mlt_convert_bgr24a_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
+		if ( QImage::systemBitOrder( ) == QImage::BigEndian )
+			mlt_convert_argb_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
+		else
+			mlt_convert_bgr24a_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
 
 		assign_buffered_image( producer_props, current_image, current_alpha, current_width, current_height );
 	}