[gentoo-commits] gentoo-x86 commit in media-gfx/fontforge/files: fontforge-20090923-libpng14.patch

[gentoo-commits] gentoo-x86 commit in media-gfx/fontforge/files: fontforge-20090923-libpng14.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/10 13:44:17

  Added:                fontforge-20090923-libpng14.patch
  Log:
  Fix building with libpng14.
  (Portage version: 2.2_rc66/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/fontforge/files/fontforge-20090923-libpng14.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch?rev=1.1&content-type=text/plain

Index: fontforge-20090923-libpng14.patch
===================================================================
http://repos.archlinux.org/wsvn/packages/fontforge/trunk/libpng14.patch
http://www.mail-archive.com/arch-commits@archlinux.org/msg11199.html

--- gutils/gimagereadpng.c
+++ gutils/gimagereadpng.c
@@ -220,13 +220,13 @@
     if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) {
 	if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA )
 	    base->trans = COLOR_CREATE(
-		    (info_ptr->trans_values.red>>8),
-		    (info_ptr->trans_values.green>>8),
-		    (info_ptr->trans_values.blue>>8));
+		    (info_ptr->trans_color.red>>8),
+		    (info_ptr->trans_color.green>>8),
+		    (info_ptr->trans_color.blue>>8));
 	else if ( base->image_type == it_mono )
-	    base->trans = info_ptr->trans[0];
+	    base->trans = info_ptr->trans_alpha[0];
 	else
-	    base->clut->trans_index = base->trans = info_ptr->trans[0];
+	    base->clut->trans_index = base->trans = info_ptr->trans_alpha[0];
     }
 
     row_pointers = galloc(info_ptr->height*sizeof(png_bytep));
--- gutils/gimagewritepng.c
+++ gutils/gimagewritepng.c
@@ -183,8 +183,8 @@
        if ( info_ptr->num_palette<=16 )
 	   _png_set_packing(png_ptr);
        if ( base->trans!=-1 ) {
-	   info_ptr->trans = galloc(1);
-	   info_ptr->trans[0] = base->trans;
+	   info_ptr->trans_alpha = galloc(1);
+	   info_ptr->trans_alpha[0] = base->trans;
        }
    } else {
        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
@@ -192,9 +192,9 @@
 	   info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
 
        if ( base->trans!=-1 ) {
-	   info_ptr->trans_values.red = COLOR_RED(base->trans);
-	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
-	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
        }
    }
    _png_write_info(png_ptr, info_ptr);
@@ -210,7 +210,7 @@
 
     _png_write_end(png_ptr, info_ptr);
 
-    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
     _png_destroy_write_struct(&png_ptr, &info_ptr);
     gfree(rows);
--- gutils/gimagewritepng.c
+++ gutils/gimagewritepng.c
@@ -314,15 +314,15 @@
        if ( info_ptr->num_palette<=16 )
 	   png_set_packing(png_ptr);
        if ( base->trans!=-1 ) {
-	   info_ptr->trans = galloc(1);
-	   info_ptr->trans[0] = base->trans;
+	   info_ptr->trans_alpha = galloc(1);
+	   info_ptr->trans_alpha[0] = base->trans;
        }
    } else {
        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
        if ( base->trans!=-1 ) {
-	   info_ptr->trans_values.red = COLOR_RED(base->trans);
-	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
-	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
        }
    }
    png_write_info(png_ptr, info_ptr);
@@ -338,7 +338,7 @@
 
     png_write_end(png_ptr, info_ptr);
 
-    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
     png_destroy_write_struct(&png_ptr, &info_ptr);
     gfree(rows);