X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fepng.cpp;h=e0da3eb7f18f402bd390f43f99182f24ea28ec20;hp=0f8ea56843a0c7cf6f774ab09b6aeedb67cc4c49;hb=HEAD;hpb=ee91b5df227327a79292d130410316218318f9d5

diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
index 0f8ea56..e0da3eb 100644
--- a/lib/gdi/epng.cpp
+++ b/lib/gdi/epng.cpp
@@ -1,3 +1,5 @@
+#define PNG_SKIP_SETJMP_CHECK
+#include <zlib.h>
 #include <png.h>
 #include <stdio.h>
 #include <lib/gdi/epng.h>
@@ -51,7 +53,7 @@ int loadPNG(ePtr<gPixmap> &result, const char *filename)
 		fclose(fp);
 		return 0;
 	 }
-	if (setjmp(png_ptr->jmpbuf))
+	if ( setjmp(png_jmpbuf(png_ptr)) )
 	{
 		eDebug("das war wohl nix");
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
@@ -229,6 +231,8 @@ int loadJPG(ePtr<gPixmap> &result, const char *filename, ePtr<gPixmap> alpha)
 
 int savePNG(const char *filename, gPixmap *pixmap)
 {
+
+	eDebug("\33[33m %s \33[0m",filename);
 	FILE *fp=fopen(filename, "wb");
 	if (!fp)
 		return -1;
@@ -254,7 +258,12 @@ int savePNG(const char *filename, gPixmap *pixmap)
 		unlink(filename);
 		return -3;
 	}
-	if (setjmp(png_ptr->jmpbuf))
+
+	png_set_IHDR(png_ptr, info_ptr, surface->x, surface->y, surface->bpp/surface->bypp, 
+		PNG_COLOR_TYPE_RGB_ALPHA, 
+		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+	if ( setjmp(png_jmpbuf(png_ptr)) )
 	{
 		eDebug("error :/");
 		png_destroy_write_struct(&png_ptr, &info_ptr);
@@ -266,29 +275,35 @@ int savePNG(const char *filename, gPixmap *pixmap)
 	png_set_filter(png_ptr, 0, PNG_FILTER_NONE|PNG_FILTER_SUB|PNG_FILTER_PAETH);
 	png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);
 
-	png_set_IHDR(png_ptr, info_ptr, surface->x, surface->y, surface->bpp, 
-		surface->clut.data ? PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY, 
-		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-	if (surface->clut.data)
+	png_write_info(png_ptr, info_ptr);
+	png_set_packing(png_ptr);
+
+	png_byte *row_pointer;
+	png_byte *cr = new png_byte[surface->y * surface->stride];
+	if (cr == NULL)
+	{
+		printf("Error: malloc\n");
+		return -5;
+	}
+	for (int i=0; i<surface->y; ++i)
 	{
-		png_color palette[surface->clut.colors];
-		png_byte trans[surface->clut.colors];
-		for (int i=0; i<surface->clut.colors; ++i)
+		row_pointer=((png_byte*)surface->data)+i*surface->stride;
+		if (surface->bypp == 4)
 		{
-			palette[i].red=surface->clut.data[i].r;
-			palette[i].green=surface->clut.data[i].g;
-			palette[i].blue=surface->clut.data[i].b;
-			trans[i]=255-surface->clut.data[i].a;
+			memcpy(cr, row_pointer, surface->stride);
+			for (int j=0; j<surface->stride; j+=4)
+			{
+				unsigned char tmp = cr[j];
+				cr[j] = cr[j+2];
+				cr[j+2]= tmp;
+			}
+			png_write_row(png_ptr, cr);
 		}
-		png_set_PLTE(png_ptr, info_ptr, palette, surface->clut.colors);
-		png_set_tRNS(png_ptr, info_ptr, trans, surface->clut.colors, 0);
+		else
+			png_write_row(png_ptr, row_pointer);
 	}
-	png_write_info(png_ptr, info_ptr);
-	png_set_packing(png_ptr);
-	png_byte *row_pointers[surface->y];
-	for (int i=0; i<surface->y; ++i)
-		row_pointers[i]=((png_byte*)surface->data)+i*surface->stride;
-	png_write_image(png_ptr, row_pointers);
+	delete [] cr;
+
 	png_write_end(png_ptr, info_ptr);
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 	fclose(fp);