for doc for -T option

[swftools.git] / lib / modules / swfbits.c

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index b301532..df8c1c9 100644 (file)
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -7,9 +7,19 @@
 
    Copyright (c) 2000, 2001 Rainer Böhme <rfxswf@reflex-studio.de>
  
-   This file is distributed under the GPL, see file COPYING for details 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-*/
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #define OUTBUFFER_SIZE 0x8000
 
@@ -128,6 +138,26 @@ void swf_SetJPEGBits2(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality)
   swf_SetJPEGBitsFinish(jpeg);
 }
 
+void swf_GetJPEGSize(char * fname, int*width, int*height)
+{ struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  FILE * fi;
+  *width = 0;
+  *height = 0;
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_decompress(&cinfo); 
+  if ((fi=fopen(fname,"rb"))==NULL) {
+      fprintf(stderr, "rfxswf: file open error\n");
+      return;
+  }
+  jpeg_stdio_src(&cinfo, fi);
+  jpeg_read_header(&cinfo, TRUE);
+  *width = cinfo.image_width;
+  *height = cinfo.image_height;
+  jpeg_destroy_decompress(&cinfo);
+  fclose(fi);
+}
+
 int swf_SetJPEGBits(TAG * t,char * fname,int quality)
 { struct jpeg_decompress_struct cinfo;
   struct jpeg_error_mgr jerr;
@@ -184,9 +214,8 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
              int y = js[x*3+0];
              int u = js[x*3+1];
              int v = js[x*3+1];
-             // untested:
              js[x*3+0] = y + ((360*(v-128))>>8);
-             js[x*3+1] = y - ((88*(u-128)-183*(v-128))>>8);
+             js[x*3+1] = y - ((88*(u-128)+183*(v-128))>>8);
              js[x*3+2] = y + ((455 * (u-128))>>8);
          }
        }
@@ -300,24 +329,11 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
       fprintf(stderr, "rfxswf: unknown bitmap type %d\n", bitmap_flags);
       return -1;
   }
-  
+
   swf_SetU8(t,bitmap_flags);
   swf_SetU16(t,width);
   swf_SetU16(t,height);
 
-
-  /* fix for buggy flash players which can't handle plain-color bitmaps 
-     TODO: is there a better solution?
-  */
-  { int s;
-    int l=32;
-    for(s=0;s<height*width*4;s+=4) {
-       ((U8*)bitmap)[s+0] = s;
-       if(s>l)
-           break;
-    }
-  }
-
   { z_stream zs;
       
     memset(&zs,0x00,sizeof(z_stream));
@@ -333,6 +349,17 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
       
     } else res = -3; // zlib error
   }
+
+  while(t->len < 64) { /* actually, 63 and above is o.k., but let's stay on the safe side */
+
+      /* Flash players up to MX crash or do strange things if they encounter a 
+        DefineLossless Tag with a payload of less than 63 bytes. They also
+        substitute the whole bitmap by a red rectangle.
+
+        This loop fills up the tag with zeroes so that this doesn't happen.
+      */
+      swf_SetU8(t, 0);
+  }
   
   return res;
 }
@@ -340,7 +367,6 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
 int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors)
 { RGBA * pal = palette;
   int bps = BYTES_PER_SCANLINE(width);
-  U8 * data;
   int res = 0;
     
   if (!pal)     // create default palette for grayscale images
@@ -415,16 +441,24 @@ int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * p
 
         deflateEnd(&zs);
 
-        if (zs.next_out>data) swf_SetBlock(t,data,zs.next_out-data);
-
         free(zpal);
       } else res = -2; // memory error
     } else res = -3; // zlib error
-    free(data);
   }
   
   if (!palette) free(pal);
 
+  while(t->len < 64) { /* actually, 63 and above is o.k., but let's stay on the safe side */
+
+      /* Flash players up to MX crash or do strange things if they encounter a 
+        DefineLossless(2) Tag with a payload of less than 63 bytes. They also
+        substitute the whole bitmap by a red rectangle.
+
+        This loop fills up the tag with zeroes so that this doesn't happen.
+      */
+      swf_SetU8(t, 0);
+  }
+  
   return res;
 }