Sophie

Sophie

distrib > Mageia > 7 > i586 > by-pkgid > 59444479cc56ee16ea1cff3e42393519 > files > 3

clash-0.4.5-12.mga7.src.rpm

--- src/external/flash/flash.cpp.orig	2011-09-03 15:06:52.321219000 +0200
+++ src/external/flash/flash.cpp	2011-09-03 15:07:26.551219000 +0200
@@ -36,7 +36,7 @@
 	movie->setRate(fps); // 12 frames per seconds
 	
   //SWFShape *shape = new SWFShape();
-	SWFSprite *objectSprite = new SWFSprite();
+	SWFMovieClip *objectSprite = new SWFMovieClip();
 	
 	for(int i=0; i < object->getLayerCount(); i++) {
 		Layer* layer = object->getLayer(i);
@@ -44,13 +44,13 @@
 			// paints the bitmap images
 			if(layer->type == Layer::BITMAP) {
 				LayerBitmap* layerBitmap = (LayerBitmap*)layer;
-				SWFSprite *layerSprite = new SWFSprite();
+				SWFMovieClip *layerSprite = new SWFMovieClip();
 				SWFDisplayItem *previousItem = NULL;
 				for(int frameNumber = startFrame; frameNumber <= endFrame; frameNumber++) {
 					BitmapImage* bitmapImage = layerBitmap->getBitmapImageAtFrame(frameNumber);
 					if(bitmapImage != NULL) {
 						if(previousItem != NULL) layerSprite->remove( previousItem );
-						SWFSprite *imageSprite = new SWFSprite();
+						SWFMovieClip *imageSprite = new SWFMovieClip();
 						convertToSWFSprite( bitmapImage, object, view, imageSprite);
 						previousItem = layerSprite->add( imageSprite );
 					}
@@ -63,13 +63,13 @@
 			// paints the vector images
 			if(layer->type == Layer::VECTOR) {
 				LayerVector* layerVector = (LayerVector*)layer;
-				SWFSprite *layerSprite = new SWFSprite();
+				SWFMovieClip *layerSprite = new SWFMovieClip();
 				SWFDisplayItem *previousItem = NULL;
 				for(int frameNumber = startFrame; frameNumber <= endFrame; frameNumber++) {
 					VectorImage* vectorImage = layerVector->getVectorImageAtFrame(frameNumber);
 					if(vectorImage != NULL) {
 						if(previousItem != NULL) layerSprite->remove( previousItem );
-						SWFSprite *sprite = new SWFSprite();
+						SWFMovieClip *sprite = new SWFMovieClip();
 						convertToSWFSprite( vectorImage, object, view, sprite);
 						previousItem = layerSprite->add( sprite );
 					}
@@ -100,7 +100,7 @@
 }
 
 
-void Flash::convertToSWFSprite( BitmapImage* bitmapImage, Object* object, QMatrix view, SWFSprite* sprite ) {
+void Flash::convertToSWFSprite( BitmapImage* bitmapImage, Object* object, QMatrix view, SWFMovieClip* sprite ) {
 	QString tempPath = QDir::tempPath()+"/penciltemp.png";
 	QByteArray tempPath2( tempPath.toLatin1());
 	bitmapImage->image->save( tempPath , "PNG");
@@ -120,7 +120,7 @@
 }
 
 
-void Flash::convertToSWFSprite( VectorImage* vectorImage, Object* object, QMatrix view, SWFSprite* sprite ) {
+void Flash::convertToSWFSprite( VectorImage* vectorImage, Object* object, QMatrix view, SWFMovieClip* sprite ) {
 	
 	// add filled areas
 	for(int i=0; i< vectorImage->area.size(); i++) {
@@ -148,7 +148,7 @@
 
 
 
-void Flash::addShape( SWFSprite* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill ) {
+void Flash::addShape( SWFMovieClip* sprite, QPainterPath path, QColor fillColour, QColor borderColour, qreal width, bool fill ) {
 	SWFShape* shape = new SWFShape();
 	//float widthf = static_cast< float >(width);
 	if(width == 0.0) {