X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpng.c;h=17381514f46cd9876043a221cb2a579203d990e8;hp=d40d3e47e1cbcbdadb469b3f3bfef700e595419a;hb=2c719855eac434f01d47ba0717d76de65939d74e;hpb=ff2fc105608a90214af3b03a6adb0078a27d04af

diff --git a/lib/png.c b/lib/png.c
index d40d3e4..1738151 100644
--- a/lib/png.c
+++ b/lib/png.c
@@ -122,7 +122,7 @@ static int png_read_header(FILE*fi, struct png_header*header)
 		return 0;
 	    }
 	    if(a!=8 && (b==2 || b==6)) {
-		printf("Bpp %d in mode %d not supported!\n", a);
+		printf("Bpp %d in mode %d not supported!\n", b, a);
 		return 0;
 	    }
 	    if(c!=0) {
@@ -486,6 +486,7 @@ EXPORT int getPNG(const char*sname, int*destwidth, int*destheight, unsigned char
     }
 
     if(!png_read_header(fi, &header)) {
+	fclose(fi);
 	return 0;
     }
 
@@ -779,10 +780,10 @@ typedef struct {
     u32 color;
 } colornum_t;
 
-int compare_colors(const void*_c1, const void*_c2) {
+static int compare_colors(const void*_c1, const void*_c2) {
     colornum_t*c1 = (colornum_t*)_c1;
     colornum_t*c2 = (colornum_t*)_c2;
-    return c1->num - c2->num;
+    return c2->num - c1->num;
 }
 
 static colornum_t* getColors(COL*image, int size, int*num)
@@ -817,6 +818,7 @@ static colornum_t* getColors(COL*image, int size, int*num)
         int col = (image[t].r)|(image[t].g)<<8|(image[t].b)<<16;
         int min,max,i,l;
         for(min=0, max=count, i=count/2, l=count; i != l; l=i,i=(min+max)/2) {
+	    // binary search
             if(colors[i].color >= col) max=i;
             else min=i+1;
         }
@@ -852,6 +854,12 @@ static COL* getOptimalPalette(COL*image, int size, int palettesize)
         return ret;
     }
 
+    if(num>2048) {
+	/* if there are too many different colors, pick the ones that
+	   occur most often */
+	num = 2048;
+    }
+
     colornum_t*centers = malloc(sizeof(colornum_t)*palettesize);
     int t;
     for(t=0;t<palettesize;t++) {
@@ -904,7 +912,7 @@ static COL* getOptimalPalette(COL*image, int size, int palettesize)
                 }
             }
             if(!count) {
-                int random = lrand48()%num;
+                int random = rand()%num;
                 centers[s].color = colors[random].color;
                 centers[s].num = 0;
                 change = 1;
@@ -1335,8 +1343,15 @@ EXPORT void savePNG(const char*filename, unsigned char*data, int width, int heig
     long idatsize = 0;
     {
 	int x,y;
-	int srcwidth = width * (bpp/8);
-	int linelen = 1 + ((srcwidth+3)&~3);
+        int bypp = bpp/8;
+	int srcwidth = width * bypp;
+	int linelen = 1 + srcwidth;
+        if(bypp==2) 
+            linelen = 1 + ((srcwidth+1)&~1);
+        else if(bypp==3) 
+            linelen = 1 + ((srcwidth+2)/3)*3;
+        else if(bypp==4) 
+            linelen = 1 + ((srcwidth+3)&~3);
 	unsigned char* line = (unsigned char*)malloc(linelen);
 	unsigned char* bestline = (unsigned char*)malloc(linelen);
 	memset(line, 0, linelen);
@@ -1344,8 +1359,7 @@ EXPORT void savePNG(const char*filename, unsigned char*data, int width, int heig
 	{
 	    int filtermode;
 	    int bestsize = 0x7fffffff;
-	    for(filtermode=0;filtermode<=5;filtermode++) {
-
+	    for(filtermode=0;filtermode<=0;filtermode++) {
 		if(!y && filtermode>=2)
 		    continue; // don't do y direction filters in the first row
 		
@@ -1377,11 +1391,11 @@ EXPORT void savePNG(const char*filename, unsigned char*data, int width, int heig
     fclose(fi);
 }
 
-void writePNG(const char*filename, unsigned char*data, int width, int height)
+EXPORT void writePNG(const char*filename, unsigned char*data, int width, int height)
 {
     savePNG(filename, data, width, height, 0);
 }
-void writePalettePNG(const char*filename, unsigned char*data, int width, int height)
+EXPORT void writePalettePNG(const char*filename, unsigned char*data, int width, int height)
 {
     savePNG(filename, data, width, height, 256);
 }