From: handa <handa>
Date: Tue, 17 Jan 2006 06:37:22 +0000 (+0000)
Subject: Restore for REL-1-3-1.
X-Git-Tag: REL-1-3-1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ad88e44899ba8a2a4c654a01306306f1d55070cc;p=m17n%2Fm17n-lib.git

Restore for REL-1-3-1.
---

diff --git a/example/ChangeLog b/example/ChangeLog
index 779f671..b6f1877 100644
--- a/example/ChangeLog
+++ b/example/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-17  Kenichi Handa  <handa@m17n.org>
-
-	* mdump.c (main): Use gdImageCreateTrueColor only if HAVE_GD > 1.
-	Use gdImageAlphaBlending only if HAVE_GD > 1.
-
 2006-01-16  Kenichi Handa  <handa@m17n.org>
 
 	* Version 1.3.1 released.
diff --git a/example/mdump.c b/example/mdump.c
index 97ee4d4..f64d249 100644
--- a/example/mdump.c
+++ b/example/mdump.c
@@ -720,11 +720,7 @@ main (int argc, char **argv)
 	}
     }
 
-#if HAVE_GD > 1
   image = gdImageCreateTrueColor (paper_width, paper_height);
-#else
-  image = gdImageCreate (paper_width, paper_height);
-#endif
   from = 0;
   page_index = 1;
 
@@ -741,9 +737,7 @@ main (int argc, char **argv)
       else
 	bg_rgb = gdImageColorAllocate (image, 255, 255, 255);
       gdImageColorTransparent (image, bg_rgb);
-#if HAVE_GD > 1
       gdImageAlphaBlending (image, 0);
-#endif
     }
   else
     {
diff --git a/src/ChangeLog b/src/ChangeLog
index f8b05bf..46f2d0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-17  Kenichi Handa  <handa@m17n.org>
-
-	* m17n-gd.c (gd_render): If gdAlphaTransparent is not defined,
-	define it as 127.
-
 2006-01-16  Kenichi Handa  <handa@m17n.org>
 
 	* Version 1.3.1 released.
diff --git a/src/m17n-gd.c b/src/m17n-gd.c
index 26c0219..97a5351 100644
--- a/src/m17n-gd.c
+++ b/src/m17n-gd.c
@@ -327,9 +327,6 @@ gd_render (MDrawWindow win, int x, int y,
 	      if (bmp[j] > 0)
 		{
 		  int pixel1 = pixel;
-#ifndef gdAlphaTransparent
-#define gdAlphaTransparent 127
-#endif
 		  int alpha = gdAlphaTransparent * (255 - bmp[j]) / 255;
 
 		  if (alpha > 0)