X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=85e7c375fbf50f1cb0d7a331415a391d217254b1;hb=0e8807d9a620e8932bc67653321eaae1436fdd43;hp=4349b965e3b428c40c8962429aaddfafc4f9cb85;hpb=e448c7a56df8e289c9dbd5b8d87753addd541091;p=swftools.git

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index 4349b96..85e7c37 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -110,6 +110,24 @@ int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits)
   return 0;
 }
 
+void swf_SetJPEGBits2(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality)
+{
+  JPEGBITS* jpeg;
+  int y;
+  jpeg = swf_SetJPEGBitsStart(tag,width,height,quality);
+  for (y=0;y<height;y++)
+  { U8 scanline[3*width];
+    int x,p = 0;
+    for (x=0;x<width;x++) 
+    { scanline[p++] = bitmap[width*y+x].r;
+      scanline[p++] = bitmap[width*y+x].g;
+      scanline[p++] = bitmap[width*y+x].b;
+    }
+    swf_SetJPEGBitsLine(jpeg,scanline);
+  }
+  swf_SetJPEGBitsFinish(jpeg);
+}
+
 int swf_SetJPEGBits(TAG * t,char * fname,int quality)
 { struct jpeg_decompress_struct cinfo;
   struct jpeg_error_mgr jerr;
@@ -121,7 +139,6 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
   jpeg_create_decompress(&cinfo); 
 
   if ((f=fopen(fname,"rb"))==NULL) return -1;
-  
 
   jpeg_stdio_src(&cinfo,f);
   jpeg_read_header(&cinfo, TRUE);
@@ -130,12 +147,65 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
   out = swf_SetJPEGBitsStart(t,cinfo.output_width,cinfo.output_height,quality);
   scanline = (U8*)malloc(4*cinfo.output_width);
   
-  if (scanline)
+  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);
+	}
+    }
+    else if(cinfo.out_color_space == JCS_YCCK) 
+    {
+	//FIXME
+	fprintf(stderr, "Error: Can't convert YCCK to RGB.\n");
+	return -1;
+    }
+    else if(cinfo.out_color_space == JCS_YCbCr) 
+    {
+	for (y=0;y<cinfo.output_height;y++) {
+	  int x;
+	  for(x=0;x<cinfo.output_width;x++) {
+	      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+2] = y + ((455 * (u-128))>>8);
+	  }
+	}
+    }
+    else if(cinfo.out_color_space == JCS_CMYK) 
+    { 
+	for (y=0;y<cinfo.output_height;y++)
+	{ int x;
+	  jpeg_read_scanlines(&cinfo,&js,1);
+	  /* This routine seems to work for now-
+	     It's a mixture of 3 different
+	     CMYK->RGB conversion routines I found in the
+	     web. (which all produced garbage)
+	     I'm happily accepting suggestions. (mk)*/
+	  for(x=0;x<cinfo.output_width;x++) {
+		int white = 255 - js[x*4+3];
+		js[x*3+0] = white - ((js[x*4]*white)>>8);
+		js[x*3+1] = white - ((js[x*4+1]*white)>>8);
+		js[x*3+2] = white - ((js[x*4+2]*white)>>8);
+	  }
+	  swf_SetJPEGBitsLines(out,(U8**)&js,1);
+	}
     }
   }
 
@@ -200,7 +270,7 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
   swf_SetU16(t,width);
   swf_SetU16(t,height);
 
-  if (data=malloc(OUTBUFFER_SIZE))
+  if ((data=malloc(OUTBUFFER_SIZE)))
   { z_stream zs;
       
     memset(&zs,0x00,sizeof(z_stream));
@@ -246,7 +316,7 @@ int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * p
   swf_SetU16(t,height);
   swf_SetU8(t,ncolors-1); // number of pal entries
 
-  if (data=malloc(OUTBUFFER_SIZE))
+  if ((data=malloc(OUTBUFFER_SIZE)))
   { z_stream zs;
 
     memset(&zs,0x00,sizeof(z_stream));
@@ -255,7 +325,7 @@ int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * p
 
     if (deflateInit(&zs,Z_DEFAULT_COMPRESSION)==Z_OK)
     { U8 * zpal;                    // compress palette
-      if (zpal = malloc(ncolors*4))
+      if ((zpal = malloc(ncolors*4)))
       { U8 * pp = zpal;
         int i;