Prepare to tag v0.7.4

CAsciiArt.php

@@ -1,7 +1,6 @@
 <?php
 /**
  * Create an ASCII version of an image.
- * Inspired by https://gist.github.com/donatj/1353237 and various sources.
  *
  */
 class CAsciiArt
@@ -72,7 +71,7 @@ class CAsciiArt
 
 
     /**
-     * Length of current character set.
+     * Set options for processing, defaults are available.
      *
      * @param array $options to use as default settings.
      *

CImage.php

@@ -1221,7 +1221,7 @@ class CImage
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
                     for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= ":".$filter["arg{$i}"];
+                        $filters .= "-".$filter["arg{$i}"];
                     }
                 }
             }

README.md

@@ -45,14 +45,14 @@ There are several ways of installing. You either install the whole project which
 
 The [sourcode is available on GitHub](https://github.com/mosbth/cimage). Clone, fork or [download as zip](https://github.com/mosbth/cimage/archive/master.zip). 
 
-**Latest stable version is v0.7.1 released 2015-07-25.**
+**Latest stable version is v0.7.4 released 2015-09-15.**
 
 I prefer cloning like this. Do switch to the latest stable version.
 
 ```bash
 git clone git://github.com/mosbth/cimage.git
 cd cimage
-git checkout v0.7.1
+git checkout v0.7.4
 ```
 
 Make the cache-directory writable by the webserver.
@@ -75,7 +75,7 @@ There are some all-included bundles of `img.php` that can be downloaded and used
 Dowload the version of your choice like this.
 
 ```bash
-wget https://github.com/mosbth/cimage/tree/v0.7.1/webroot/imgp.php
+wget https://github.com/mosbth/cimage/tree/v0.7.4/webroot/imgp.php
 ```
 
 Open up the file in your editor and edit the array `$config`. Ensure that the paths to the image directory and the cache directory matches your environment, or create an own config-file for the script.

REVISION.md

@@ -5,6 +5,13 @@ Revision history
 [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
 
 
+v0.7.4 (2015-09-15)
+-------------------------------------
+
+* Add CAsciiArt.php to composer for autoloading, fix #102.
+* Generate filename with filters, does not work on Windows, fix #100.
+
+
 v0.7.3 (2015-09-01)
 -------------------------------------
 

composer.json

@@ -25,12 +25,8 @@
             "CImage.php",
             "CHttpGet.php",
             "CRemoteImage.php",
-            "CWhitelist.php"
+            "CWhitelist.php",
+            "CAsciiArt.php"
         ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.7.x-dev"
-        }
     }
 }

webroot/img.php

@@ -8,7 +8,7 @@
  *
  */
 
-$version = "v0.7.3 (2015-09-01)";
+$version = "v0.7.4 (2015-09-15)";
 
 
 

webroot/imgd.php

@@ -706,7 +706,6 @@ class CWhitelist
 
 /**
  * Create an ASCII version of an image.
- * Inspired by https://gist.github.com/donatj/1353237 and various sources.
  *
  */
 class CAsciiArt
@@ -777,7 +776,7 @@ class CAsciiArt
 
 
     /**
-     * Length of current character set.
+     * Set options for processing, defaults are available.
      *
      * @param array $options to use as default settings.
      *
@@ -2141,7 +2140,7 @@ class CImage
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
                     for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= ":".$filter["arg{$i}"];
+                        $filters .= "-".$filter["arg{$i}"];
                     }
                 }
             }
@@ -3402,7 +3401,7 @@ EOD;
  *
  */
 
-$version = "v0.7.3 (2015-09-01)";
+$version = "v0.7.4 (2015-09-15)";
 
 
 

webroot/imgp.php

@@ -706,7 +706,6 @@ class CWhitelist
 
 /**
  * Create an ASCII version of an image.
- * Inspired by https://gist.github.com/donatj/1353237 and various sources.
  *
  */
 class CAsciiArt
@@ -777,7 +776,7 @@ class CAsciiArt
 
 
     /**
-     * Length of current character set.
+     * Set options for processing, defaults are available.
      *
      * @param array $options to use as default settings.
      *
@@ -2141,7 +2140,7 @@ class CImage
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
                     for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= ":".$filter["arg{$i}"];
+                        $filters .= "-".$filter["arg{$i}"];
                     }
                 }
             }
@@ -3402,7 +3401,7 @@ EOD;
  *
  */
 
-$version = "v0.7.3 (2015-09-01)";
+$version = "v0.7.4 (2015-09-15)";
 
 
 

webroot/imgs.php

@@ -706,7 +706,6 @@ class CWhitelist
 
 /**
  * Create an ASCII version of an image.
- * Inspired by https://gist.github.com/donatj/1353237 and various sources.
  *
  */
 class CAsciiArt
@@ -777,7 +776,7 @@ class CAsciiArt
 
 
     /**
-     * Length of current character set.
+     * Set options for processing, defaults are available.
      *
      * @param array $options to use as default settings.
      *
@@ -2141,7 +2140,7 @@ class CImage
                 if (is_array($filter)) {
                     $filters .= "_f{$filter['id']}";
                     for ($i=1; $i<=$filter['argc']; $i++) {
-                        $filters .= ":".$filter["arg{$i}"];
+                        $filters .= "-".$filter["arg{$i}"];
                     }
                 }
             }
@@ -3402,7 +3401,7 @@ EOD;
  *
  */
 
-$version = "v0.7.3 (2015-09-01)";
+$version = "v0.7.4 (2015-09-15)";