X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=bf88c948b912b9f097fb170a7ae70672de2ee46f;hb=469e1e998167801f48345b52b98d8bcb282b9f53;hp=1b311f83131482593e7069e1ec0721a4463fede6;hpb=774da0eb175e36c6b8a563f3a7af82e6640b19c9;p=swftools.git

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index 1b311f8..bf88c94 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -13,7 +13,7 @@
 
 #define OUTBUFFER_SIZE 0x8000
 
-#ifdef _JPEGLIB_INCLUDED_
+#ifdef HAVE_JPEGLIB
 
 typedef struct _JPEGDESTMGR
 { struct jpeg_destination_mgr mgr;
@@ -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;
@@ -124,8 +142,6 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
 
   jpeg_stdio_src(&cinfo,f);
   jpeg_read_header(&cinfo, TRUE);
-  if(JPEG_LIB_VERSION>=62) /* jpeglib Version 6b is required for grayscale-> color conversion */
-    cinfo.out_color_space = JCS_RGB; //automatically convert grayscale images
   jpeg_start_decompress(&cinfo);
 
   out = swf_SetJPEGBitsStart(t,cinfo.output_width,cinfo.output_height,quality);
@@ -135,8 +151,6 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
   { int y;
     U8 * js = scanline;
     if(cinfo.out_color_space == JCS_GRAYSCALE) {
-	/* happens only if JPEG_LIB_VERSION above
-	   was too small - let's do the conversion ourselves */
 	for (y=0;y<cinfo.output_height;y++)
 	{ int x;
 	  jpeg_read_scanlines(&cinfo,&js,1);
@@ -146,12 +160,53 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
 	  swf_SetJPEGBitsLines(out,(U8**)&js,1);
 	}
     }
-    else {
+    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);
+	}
+    }
   }
 
   swf_SetJPEGBitsFinish(out);
@@ -161,11 +216,11 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality)
   return 0;
 }
 
-#endif // _JPEGLIB_INCLUDED_
+#endif // HAVE_JPEGLIB
 
 // Lossless compression texture based on zlib
 
-#ifdef _ZLIB_INCLUDED_
+#ifdef HAVE_ZLIB
 
 int RFXSWF_deflate_wraper(TAG * t,z_stream * zs,U8 * data,boolean finish)
 { while (1)
@@ -193,6 +248,7 @@ int RFXSWF_deflate_wraper(TAG * t,z_stream * zs,U8 * data,boolean finish)
   return 0;
 }
 
+
 int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags)
 { int res = 0;
   int bps;
@@ -215,7 +271,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));
@@ -233,7 +289,6 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
 
       deflateEnd(&zs);
       
-      
     } else res = -3; // zlib error
     free(data);
   } else res = -2; // memory error
@@ -261,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));
@@ -270,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;
 
@@ -337,8 +392,92 @@ int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap)
 }
 
 
-#endif // _ZLIB_INCLUDED_
+#endif // HAVE_ZLIB
 
-#undef OUTBUFFER_SIZE
+#if defined(HAVE_ZLIB) && defined(HAVE_JPEGLIB)
+int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality)
+{
+  JPEGBITS* jpeg;
+  int y;
+  int pos;
+  int res = 0;
+  U8 * data;
+  z_stream zs;
+  
+  pos = tag->len;
+  swf_SetU32(tag, 0); //placeholder
+  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);
+  PUT32(&tag->data[pos], tag->len - pos - 4);
+
+  data=malloc(OUTBUFFER_SIZE);
+  memset(&zs,0x00,sizeof(z_stream));
 
+  if (deflateInit(&zs,Z_DEFAULT_COMPRESSION)!=Z_OK) {
+      fprintf(stderr, "rfxswf: zlib compression failed");
+      return -3;
+  }
+    
+  zs.next_out         = data;
+  zs.avail_out        = OUTBUFFER_SIZE;
+
+  for (y=0;y<height;y++)
+  { U8 scanline[width];
+    int x,p = 0;
+    for (x=0;x<width;x++) {
+      scanline[p++] = bitmap[width*y+x].a;
+    }
+    zs.avail_in         = width;
+    zs.next_in          = scanline;
+
+    while(1) {
+	if(deflate(&zs, Z_NO_FLUSH) != Z_OK) {
+	    fprintf(stderr, "rfxswf: zlib compression failed");
+	    return -4;
+	}
+	if(zs.next_out != data) {
+	    swf_SetBlock(tag, data, zs.next_out - data);
+	    zs.next_out = data;
+	    zs.avail_out = OUTBUFFER_SIZE;
+	}
+	if(!zs.avail_in) {
+	    break;
+	}
+    }
+  }
+
+  while(1) {
+      int ret = deflate(&zs, Z_FINISH);
+      if (ret != Z_OK &&
+	  ret != Z_STREAM_END)  {
+	  fprintf(stderr, "rfxswf: zlib compression failed");
+	  return -5;
+      }
+      if(zs.next_out != data) {
+	  swf_SetBlock(tag, data, zs.next_out - data);
+	  zs.next_out = data;
+	  zs.avail_out = OUTBUFFER_SIZE;
+      }
+      if (ret == Z_STREAM_END) {
+	  break;
+      }
+  }
+
+  deflateEnd(&zs);
+  free(data);
+  return 0;
+}
+#endif
+
+#undef OUTBUFFER_SIZE