Author: qboosh Date: Wed Feb 1 07:12:22 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixes and hacks to build with gcc 4.x
---- Files affected:
SOURCES:
gplflash2-gcc4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/gplflash2-gcc4.patch
diff -u /dev/null SOURCES/gplflash2-gcc4.patch:1.1
--- /dev/null Wed Feb 1 08:12:22 2006
+++ SOURCES/gplflash2-gcc4.patch Wed Feb 1 08:12:17 2006
@@ -0,0 +1,113 @@
+--- gplflash2/ASLib/as_sprite.cc.orig 2005-12-01 18:27:19.000000000 +0100
++++ gplflash2/ASLib/as_sprite.cc 2006-01-31 23:54:01.165238750 +0100
+@@ -26,7 +26,7 @@
+ **/
+ ASSprite::ASSprite(Script *s, Graphics *g) : ASMovieClip(s,g,L"Sprite") {
+ changeColorRequired = false;
+- currentTag = NULL;
++ currentTag = (list<BaseTag*>::iterator)NULL;
+ modifiedByScript = false;
+ characterDepth = new IntASObjectMap();
+ oldCharacterDepth = new IntASObjectMap();
+@@ -36,7 +36,7 @@
+ }
+
+ ASSprite::ASSprite(ASSprite *p) : ASMovieClip(p) {
+- currentTag = NULL;
++ currentTag = (list<BaseTag*>::iterator)NULL;
+ characterDepth = new IntASObjectMap();
+ oldCharacterDepth = new IntASObjectMap();
+ shape = NULL;
+@@ -184,7 +184,7 @@
+ **/
+ void ASSprite::goNextTag(bool nextFrame) {
+ //printf(" goNextTag: %d %x nextVal:%d\n",currentFrame,this,
(*currentTag)->getType()); fflush(stdout);
+- if (currentTag == NULL) {
++ if (currentTag == (list<BaseTag*>::iterator)NULL) {
+ if (stopRequested) {
+ isStopped = true;
+ stopRequested = false;
+@@ -200,12 +200,12 @@
+ }
+
+ int ASSprite::getCurrentTagType() {
+- if (currentTag == NULL) return 0;
++ if (currentTag == (list<BaseTag*>::iterator)NULL) return 0;
+ return (*currentTag)->getType();
+ }
+
+ bool ASSprite::isAtEnd() {
+- if (currentTag == NULL) return true;
++ if (currentTag == (list<BaseTag*>::iterator)NULL) return true;
+ return currentTag == tags->end();
+ }
+
+@@ -668,7 +668,7 @@
+ if (getCurrentTagType() == stagEnd) {
+ continueDecode = false;
+ actionGotoFrame(0);
+- } else if (getCurrentTag() == NULL ||
getCurrentTagType() == stagShowFrame) {
++ } else if (getCurrentTag() ==
(list<BaseTag*>::iterator)NULL || getCurrentTagType() == stagShowFrame) {
+ continueDecode = false;
+ } else {
+ if (onGotoFrame && getCurrentTagType() ==
stagDoAction) {
+--- gplflash2/lib/swf.cc.orig 2005-06-19 16:50:25.000000000 +0200
++++ gplflash2/lib/swf.cc 2006-02-01 00:26:19.630385250 +0100
+@@ -121,7 +121,8 @@
+
+ Shape::~Shape() {
+ list<ShapeRecord*>::iterator it;
+- for (it = shapeRecords->begin(); it != NULL && it !=
shapeRecords->end(); it++)
++ if (!shapeRecords->empty())
++ for (it = shapeRecords->begin(); it != shapeRecords->end(); it++)
+ delete (*it);
+ shapeRecords->clear();
+ delete shapeRecords;
+--- gplflash2/lib/localFonts.hh.orig 2005-09-30 19:55:04.000000000 +0200
++++ gplflash2/lib/localFonts.hh 2006-01-31 23:37:34.059548500 +0100
+@@ -48,7 +48,7 @@
+
+ class LocalFontManager {
+ public:
+- LocalFontManager::LocalFontManager(BaseTexture *texture);
++ LocalFontManager(BaseTexture *texture);
+ ~LocalFontManager();
+ bool loadFontFaces(char *fontName,int fontId,bool isBold, bool
isItalic,int codeTableSize, UI16* codeTable);
+ bool loadFullFontFaces(char *fontName,int fontId,bool isBold, bool
isItalic);
+--- gplflash2/lib/swf_dump.cc.orig 2005-04-24 22:50:48.000000000 +0200
++++ gplflash2/lib/swf_dump.cc 2006-02-01 00:09:00.385436500 +0100
+@@ -72,7 +72,7 @@
+ void Swf_decoder::dumpGradient(FILE *f, GRADIENT *r) {
+ if (r == NULL) return;
+ list<GRADRECORD*>::iterator it;
+- if (r->getGradientRecords()->begin() == NULL) return;
++ if (r->getGradientRecords()->empty()) return;
+ for (it = r->getGradientRecords()->begin(); it !=
r->getGradientRecords()->end(); it++) {
+ GRADRECORD *d = *it;
+ fprintf(f," Ratio:%d color:(%d,%d,%d,%d)
\n",d->getRatio(),d->getColor()->red,d->getColor()->green,d->getColor()->blue,d->getColor()->alpha);
+@@ -82,7 +82,7 @@
+ void Swf_decoder::dumpMorphGradient(FILE *f, MORPHGRADIENT *r) {
+ if (r == NULL) return;
+ list<MORPHGRADRECORD*>::iterator it;
+- if (r->getGradientRecords()->begin() == NULL) return;
++ if (r->getGradientRecords()->empty()) return;
+ for (it = r->getGradientRecords()->begin(); it !=
r->getGradientRecords()->end(); it++) {
+ MORPHGRADRECORD *d = *it;
+ fprintf(f," StartRatio:%d EndRatio:%d
",d->startRatio,d->endRatio);
+--- gplflash2/lib/swf_engine.cc.orig 2006-01-31 22:40:26.000000000 +0100
++++ gplflash2/lib/swf_engine.cc 2006-02-01 00:17:52.930718500 +0100
+@@ -1347,12 +1347,12 @@
+ script->getObjectStore()->removeObjectAtDepth(t->getDepth());
+ } else {
+ // remove associated actions
+- list<DoActiontag*>::iterator itRemove = NULL;
++ list<DoActiontag*>::iterator itRemove =
(list<DoActiontag*>::iterator)NULL;
+ for (list<DoActiontag*>::iterator it = doActionList.begin(); it
!= doActionList.end() ; ++it) {
+ DoActiontag *t2 = *it;
+ if (t2->getCurSpriteId() == t->getCurSpriteId())
itRemove = it;
+ }
+- if (itRemove != NULL) {
++ if (itRemove != (list<DoActiontag*>::iterator)NULL) {
+ doActionList.erase(itRemove);
+ }
+
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
