static int verbose = 0;
static int showbbox = 0;
static int showorigbbox = 1;
-static int expand = 1;
+static int expand = 0;
+static int clip = 0;
+static int checkclippings = 0;
static struct options_t options[] = {
{"h", "help"},
{"e", "expand"},
{"O", "optimize"},
{"S", "swifty"},
+{"c", "clip"},
{"o", "output"},
{"v", "verbose"},
{"V", "version"},
exit(0);
}
else if(!strcmp(name, "b")) {
- showorigbbox = 1;
+ showorigbbox = 2;
if(showbbox == 1) showbbox = 0;
return 0;
}
}
else if(!strcmp(name, "O")) {
optimize = 1;
- if(showbbox == 1) showbbox = 0;
+ if(showorigbbox == 1) showorigbbox = 0;
return 0;
}
else if(!strcmp(name, "S")) {
swifty = 1;
- if(showbbox == 1) showbbox = 0;
+ if(showorigbbox == 1) showorigbbox = 0;
+ return 0;
+ }
+ else if(!strcmp(name, "c")) {
+ if(showorigbbox == 1) showorigbbox = 0;
+ clip = 1;
return 0;
}
else if(!strcmp(name, "v")) {
return 0;
}
else if(!strcmp(name, "q")) {
- verbose --;
+ if(verbose)
+ verbose --;
+ return 0;
+ }
+ else if(!strcmp(name, "Q")) {
+ /* DEPRECATED- was used for testing the bbox-clip feature
+ of pdf2swf */
+ if(showorigbbox == 1) showorigbbox = 0;
+ checkclippings = 1;
return 0;
}
else if(!strcmp(name, "e")) {
printf("-h , --help Print help and exit\n");
printf("-b , --bbox Show movie bounding box (default)\n");
printf("-B , --newbbox Show recalculated (optimized/expanded) bounding box\n");
- printf("-e , --expand Write out a new file using the recalculated bounding box\n");
- printf("-O , --optimize Recalculate bounding boxes\n");
+ printf("-e , --expand Write out a new file using the recalculated header bounding box\n");
+ printf("-O , --optimize Recalculate all object bounding boxes (except for the header)\n");
printf("-S , --swifty Print out transformed bounding boxes\n");
+ printf("-c , --clip Clip bounding boxes to movie size\n");
printf("-o , --output <filename> Set output filename to <filename> (for -O)\n");
printf("-v , --verbose Be more verbose\n");
printf("-V , --version Print program version and exit\n");
return 1;
if(tag->id == ST_PLACEOBJECT2 && (tag->data[0] & 2))
return 1;
+ if(tag->id == ST_PLACEOBJECT3 && (tag->data[0] & 2))
+ return 1;
return 0;
}
return 0;
if(tag->id == ST_PLACEOBJECT2 && (tag->data[0] & 0x20))
return 1;
+ if(tag->id == ST_PLACEOBJECT3 && (tag->data[0] & 0x20))
+ return 1;
return 0;
}
swf_GetPlaceObject(tag, &o);
return o.name;
}
+ if(tag->id == ST_PLACEOBJECT3 && (tag->data[0] & 0x20)) {
+ SWFPLACEOBJECT o;
+ tag->pos = 0;tag->readBit = 0;
+ swf_GetPlaceObject(tag, &o);
+ return o.name;
+ }
return 0;
}
MATRIX m; // character transform matrix
} textbounds_t;
+typedef struct _placement
+{
+ SWFPLACEOBJECT* po;
+ int num;
+} placement_t;
+
+static placement_t* placements;
+
+static placement_t* readPlacements(SWF*swf)
+{
+ placement_t* p = (placement_t*)rfx_calloc(sizeof(placement_t)*65536);
+ TAG*tag = swf->firstTag;
+ while(tag) {
+ if(swf_isPlaceTag(tag)) {
+ SWFPLACEOBJECT*po = rfx_alloc(sizeof(SWFPLACEOBJECT));
+ int id;
+ swf_GetPlaceObject(tag, po);
+ id = po->id;
+ if(po->move) {
+ fprintf(stderr, "MOVE tags not supported with -c");
+ }
+ p[id].po = po;
+ p[id].num++;
+ }
+ tag = tag->next;
+ }
+
+ return p;
+}
+
+static void freePlacements(placement_t*p)
+{
+ int t;
+ for(t=0;t<65536;t++) {
+ if(p[t].po) {
+ swf_PlaceObjectFree(p[t].po); p[t].po = 0;
+ }
+ }
+ rfx_free(p);
+}
+
+static SRECT clipBBox(TAG*tag, SRECT mbbox, SRECT r)
+{
+ int id = swf_GetDefineID(tag);
+ MATRIX m;
+ if(!placements[id].po) {
+ if(verbose)
+ printf("Id %d is never set\n", id);
+ return r;
+ }
+ if(placements[id].num>1) {
+ if(verbose)
+ printf("Id %d is set more than once\n", id);
+ return r;
+ }
+ m = placements[id].po->matrix;
+ if(m.r0 || m.r1) {
+ fprintf(stderr, "Rotating PLACEOBJECTS are not supported with -c\n");
+ return r;
+ }
+
+ if(verbose) {
+ printf("ID %d\n", id);
+ swf_DumpMatrix(stdout, &m);
+ }
+ mbbox.xmin -= m.tx;
+ mbbox.ymin -= m.ty;
+ mbbox.xmax -= m.tx;
+ mbbox.ymax -= m.ty;
+ mbbox.xmin *= 65536.0/m.sx;
+ mbbox.xmax *= 65536.0/m.sx;
+ mbbox.ymin *= 65536.0/m.sy;
+ mbbox.ymax *= 65536.0/m.sy;
+
+ if(verbose) {
+ printf("border: %f/%f/%f/%f - rect: %f/%f/%f/%f\n",
+ mbbox.xmin /20.0,
+ mbbox.ymin /20.0,
+ mbbox.xmax /20.0,
+ mbbox.ymax /20.0,
+ r.xmin /20.0,
+ r.ymin /20.0,
+ r.xmax /20.0,
+ r.ymax /20.0);
+ }
+
+ if(checkclippings) {
+ int clip = 0;
+ if(r.xmax > mbbox.xmax) clip += r.xmax - mbbox.xmax;
+ if(r.ymax > mbbox.ymax) clip += r.ymax - mbbox.ymax;
+ if(r.xmax < mbbox.xmin) clip += -(r.xmax - mbbox.xmin);
+ if(r.ymax < mbbox.ymin) clip += -(r.ymax - mbbox.ymin);
+
+ if(r.xmin > mbbox.xmax) clip += r.xmin = mbbox.xmax;
+ if(r.ymin > mbbox.ymax) clip += r.ymin = mbbox.ymax;
+ if(r.xmin < mbbox.xmin) clip += -(r.xmin = mbbox.xmin);
+ if(r.ymin < mbbox.ymin) clip += -(r.ymin = mbbox.ymin);
+ if(clip > 3*20) {
+ printf("needs clipping: [%.2f %.2f %2.f %2.f] is outside [%.2f %2.f %2.f %2.f]\n",
+ r.xmin / 20.0, r.ymin / 20.0, r.xmax / 20.0, r.ymax / 20.0,
+ mbbox.xmin / 20.0, mbbox.ymin / 20.0, mbbox.xmax / 20.0, mbbox.ymax / 20.0
+ );
+ }
+ }
+
+ r = swf_ClipRect(mbbox, r);
+
+ if(verbose) {
+ printf("new rect: %f/%f/%f/%f\n",
+ r.xmin /20.0,
+ r.ymin /20.0,
+ r.xmax /20.0,
+ r.ymax /20.0);
+ }
+
+ return r;
+}
+
+
static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int fontsize,
int xstart, int ystart, RGBA* color)
{
/* not tested yet- the matrix/fontsize calculation is probably all wrong */
int x = xstart + xpos[t];
int y = ystart;
- int ch;
+ int ch = 0;
SRECT newglyphbbox, glyphbbox = font->layout->bounds[chars[t]];
MATRIX m = bounds->m;
-
+ SPOINT p;
+
if(chars[t] < font->numchars && font->glyph2ascii) {
ch = font->glyph2ascii[chars[t]];
}
+ p.x = x; p.y = y;
+ p = swf_TurnPoint(p, &m);
+
m.sx = (m.sx * fontsize) / 1024;
m.sy = (m.sy * fontsize) / 1024;
m.r0 = (m.r0 * fontsize) / 1024;
m.r1 = (m.r1 * fontsize) / 1024;
- m.tx += x;
- m.ty += y;
+ m.tx += p.x;
+ m.ty += p.y;
newglyphbbox = swf_TurnRect(glyphbbox, &m);
if(ch<32) ch='?';
while (tag) {
if (tag->id == ST_DEFINESHAPE ||
tag->id == ST_DEFINESHAPE2 ||
- tag->id == ST_DEFINESHAPE3) {
+ tag->id == ST_DEFINESHAPE3 ||
+ tag->id == ST_DEFINESHAPE4) {
SHAPE2 s;
if(verbose) printf("%s\n", swf_TagGetName(tag));
swf_ParseDefineShape(tag, &s);
- swf_Shape2Optimize(&s);
+ if(optimize)
+ swf_Shape2Optimize(&s);
tag->len = 2;
tag->pos = 0;
+ if(!s.bbox) {
+ fprintf(stderr, "Internal error (5)\n");
+ exit(1);
+ }
+ if(clip || checkclippings) {
+ *s.bbox = clipBBox(tag, swf->movieSize, *s.bbox);
+ }
swf_SetShape2(tag, &s);
}
if (tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) {
printf("old: %d %d %d %d\n", oldbox.xmin, oldbox.ymin, oldbox.xmax, oldbox.ymax);
printf("new: %d %d %d %d\n", bounds.r.xmin, bounds.r.ymin, bounds.r.xmax, bounds.r.ymax);
}
+ if(!optimize)
+ bounds.r = oldbox; //set to old bounds from the tag header
+ if(clip || checkclippings) {
+ bounds.r = clipBBox(tag, swf->movieSize, bounds.r);
+ }
/* now comes the tricky part:
we have to fiddle the data back in
if (tag->id == ST_SHOWFRAME) {
printf("}\n{\n\t{frame %d}\n", frame++);
}
- if (tag->id == ST_PLACEOBJECT || tag->id == ST_PLACEOBJECT2) {
+ if (swf_isPlaceTag(tag)) {
if(hasid(tag)) {
depth2id[swf_GetDepth(tag)] = swf_GetPlaceID(tag);
}
depth2name[swf_GetDepth(tag)] = getname(tag);
}
}
- if (tag->id == ST_PLACEOBJECT || tag->id == ST_PLACEOBJECT2) {
+ if (swf_isPlaceTag(tag)) {
MATRIX m = getmatrix(tag);
U16 id = depth2id[swf_GetDepth(tag)];
char*name = depth2name[swf_GetDepth(tag)];
memset(&movieSize,0,sizeof(SRECT));
- while (tag->id != ST_END) {
- if (tag->id == ST_PLACEOBJECT || tag->id == ST_PLACEOBJECT2) {
+ while (tag && tag->id != ST_END) {
+ if (swf_isPlaceTag(tag)) {
if(hasid(tag)) {
depth2id[swf_GetDepth(tag)] = swf_GetPlaceID(tag);
}
}
- if (tag->id == ST_PLACEOBJECT || tag->id == ST_PLACEOBJECT2) {
+ if (swf_isPlaceTag(tag)) {
MATRIX m = getmatrix(tag);
U16 id = depth2id[swf_GetDepth(tag)];
SRECT bbox = bboxes[id];
close(fi);
swf_OptimizeTagOrder(&swf);
+
+ if(clip || checkclippings) {
+ placements = readPlacements(&swf);
+ }
+
swf_FoldAll(&swf);
/* Optimize bounding boxes in case -O flag was set */
- if(optimize) {
+ if(optimize || checkclippings || clip) {
swf_OptimizeBoundingBoxes(&swf);
}
if(showbbox) {
if(verbose>=0)
- printf("Real Movie Size: ");
+ printf("Real Movie Size (size of visible objects): ");
printf("%.2f x %.2f :%.2f :%.2f\n",
(newMovieSize.xmax-newMovieSize.xmin)/20.0,
(newMovieSize.ymax-newMovieSize.ymin)/20.0,
}
if(showorigbbox) {
if(verbose>=0)
- printf("Original Movie Size: ");
+ printf("Movie Size accordings to file header: ");
printf("%.2f x %.2f :%.2f :%.2f\n",
(oldMovieSize.xmax-oldMovieSize.xmin)/20.0,
(oldMovieSize.ymax-oldMovieSize.ymin)/20.0,
}
swf_FreeTags(&swf);
+
+ if(placements) {
+ freePlacements(placements);
+ }
return 0;
}
git.asbjorn.biz / swftools.git / blobdiff