From ec01340aa7906ad49eba22f93f1889f5b02cf526 Mon Sep 17 00:00:00 2001
From: MEUNIER Thibaud <thibaud.meunier@laposte.net>
Date: Mon, 6 Jan 2020 14:43:25 +0100
Subject: [PATCH] ajout des chroniques dans about.php

---
 about.php       |  4 ++--
 images/logo.php | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/about.php b/about.php
index db72564..027c4f9 100644
--- a/about.php
+++ b/about.php
@@ -159,7 +159,7 @@
     <div class="col-sm-8" style="margin-top:0px">
       <h4 style="margin-top:0px">This site is a hobby.<br>It's also a testing place where i can do <a href="blog.php">things</a> that are impossible at work.</h4>
       <p class="text-justify">I like <b>surfing</b> and sailing on the ocean. But during longs winter nights, computing is fun. I'm interested into <b>cryptocurrencies</b>, computationnal art, datavisualisation. I know that <b>42</b> is the answer to <b>the Life, Universe and Everything Else</b>. As <b>Eto Demerzel</b> said to me, the <b>Seldon's Plan</b> will save the Galaxy. My favorites books are the <b>House of leaves</b>, the <b>Necronomicron</b> and the <b>DarkHold</b>. I also know that <b>great power comes with great responsibility</b>. I'm still in <b>the search of Captain Zero</b>, because <b>the Truth is out there</b>.</p>
-      <p class="text-justify">.I'm also really astonished by <b>Universal Numbers</b>, aka Disjunctives Sequences. Thinking that a single number can contain every others, that's a great <b>mystery</b>. So I'm trying to write the chronicles of these numbers (in french)</p>
+      <p class="text-justify">.I'm also really astonished by <b>Universal Numbers</b>, aka Disjunctives Sequences. Thinking that a single number can contain every others, that's a great <b>mystery</b>. So I'm trying to write the <a href="page.php?id=00190327">Chronicles</a> of these numbers (in french)</p>
     </div>
     <div class="col-sm-4">
         <!--
@@ -167,7 +167,7 @@
             <img id="gargoyle" src="images/logo.php" alt="avatar dragon gargoyle" width="100%; height: auto" style="opacity:0.4"></img>
         </div>
         -->
-        <img id="gargoyle" class="simple-parallax" src="images/logo.php" alt="avatar dragon gargoyle" width="100%; height: auto" style="margin-top:-20px"></img>
+        <img id="gargoyle" class="simple-parallax" src="images/logo.php" alt="avatar dragon gargoyle" width="100%; height: auto" style="margin-top:-50px"></img>
     </div>
   </div>
 </div>
diff --git a/images/logo.php b/images/logo.php
index 3825fa1..d8b2098 100644
--- a/images/logo.php
+++ b/images/logo.php
@@ -13,17 +13,17 @@ $height = imagesy($block_image);
 $img=imagecreatetruecolor( $width, $height );
 
 // enable alpha blending on the destination image.
-imagealphablending($img, true);
+imagealphablending($img, false);
+imagesavealpha($img,true);
+
 
 // Allocate a transparent color and fill the new image with it.
 // Without this the image will have a black background instead of being transparent.
-$transparent = imagecolorallocatealpha( $img, 255, 255, 255, 127 );
-imagefill( $img, 0, 0, $transparent );
+//$transparent = imagecolorallocatealpha( $img, 255, 255, 255, 127 );
+//imagefill( $img, 0, 0, $transparent );
 
 // copy the thumbnail into the output image.
-imagecopyresampled($img,$block_image, 0, 0, 0, 0, $width, $height, $width, $height );
-
-imagedestroy($block_image);
+// imagecopyresampled($img,$block_image, 0, 0, 0, 0, $width, $height, $width, $height );
 
 if ($alea < 1000)
 {
@@ -37,13 +37,13 @@ if ($alea < 1000)
   $superpose = @imagecreatefrompng($files[0]);
 
   //imagecopymerge($img, $superpose, 0, 0, 0, 0, $width, $height, 50);
+
   imagecopyresampled($img,$superpose, 0, 0, 0, 0, $width, $height, imagesx($superpose), imagesy($superpose));
 
   imagedestroy($superpose);
 }
 
-imagealphablending($img, false);
-imagesavealpha($img,true);
+imagecopymerge($img, $block_image, 0, 0, 0, 0, $width, $height, 45);
 
 // ---
 // --- envoyer l'image au navigateur
@@ -52,5 +52,6 @@ header("Content-Type: image/png");
 imagepng($img);
 
 imagedestroy($img);
+imagedestroy($block_image);
 
 ?>