X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjpeg2swf.c;h=a9a413caeabfbe774395289cdec6ed705f519785;hb=23c1c9363c730dfafc683bd00920a2c33cc07ee2;hp=717c750de9daa97e1cabfa78c8573d0b41db125c;hpb=aaccc6be0a888fe45e7d7ab05636200cfbdbfeb8;p=swftools.git

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index 717c750..a9a413c 100644
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -64,7 +64,7 @@ int MovieFinish(SWF * swf,TAG * t,char * sname)
 
    if ((!isatty(so))&&(!sname)) handle = so;
    else
-   { if (!sname) sname = "out.swf";
+   { if (!sname) sname = "output.swf";
      handle = open(sname,O_RDWR|O_CREAT|O_TRUNC,0666);
    }
    if FAILED(swf_WriteSWF(handle,swf)) if (VERBOSE(1)) fprintf(stderr,"Unable to write output file: %s\n",sname);
@@ -109,14 +109,30 @@ TAG * MovieAddFrame(SWF * swf,TAG * t,char * sname,int quality,int scale,int id)
   
         out = swf_SetJPEGBitsStart(t,cinfo.output_width,cinfo.output_height,quality);
         scanline = (U8*)malloc(4*cinfo.output_width);
-  
+ 
+	// the following code is a duplication of swf_SetJPEGBits in ../lib/modules/swfbits.c
         if (scanline)
         { int y;
           U8 * js = scanline;
-          for (y=0;y<cinfo.output_height;y++)
-          { jpeg_read_scanlines(&cinfo,&js,1);
-            swf_SetJPEGBitsLines(out,(U8**)&js,1);
-          }
+
+	  if(cinfo.out_color_space == JCS_GRAYSCALE) 
+	  {
+	      for (y=0;y<cinfo.output_height;y++)
+	      { int x;
+		jpeg_read_scanlines(&cinfo,&js,1);
+		for(x=cinfo.output_width-1;x>=0;x--) {
+		    js[x*3] = js[x*3+1] = js[x*3+2] = js[x];
+		}
+		swf_SetJPEGBitsLines(out,(U8**)&js,1);
+	      }
+	  }
+	  else if(cinfo.out_color_space == JCS_RGB) 
+	  {
+	      for (y=0;y<cinfo.output_height;y++)
+	      { jpeg_read_scanlines(&cinfo,&js,1);
+		swf_SetJPEGBitsLines(out,(U8**)&js,1);
+	      }
+	  }
           free(scanline);
         }
         
@@ -278,7 +294,8 @@ int args_callback_option(char*arg,char*val)
   }
   
   if (res<0)
-  { if (VERBOSE(1)) fprintf(stderr,"Unknown option: -v%s\n",arg);
+  { if (VERBOSE(1)) fprintf(stderr,"Unknown option: -%s\n",arg);
+    exit(1);
     return 0;
   }
   return res;