Permalink
Browse files

fix buffer namespace conflict

closes #88
  • Loading branch information...
1 parent 42c6490 commit ff57ac2d58567b60f64570c197fd46070b65a2df @kof kof committed with Nov 9, 2012
Showing with 35 additions and 32 deletions.
  1. +27 −27 History.md
  2. +5 −2 README.md
  3. +3 −3 lib/command.js
View
@@ -252,44 +252,44 @@
## v0.2.1 - 7/31/2010
- * fixed naming conflict. depth() manipulation method renamed bitdepth()
+ * fixed naming conflict. depth() manipulation method renamed bitdepth()
* added better docs
## v0.2.0 - 7/29/2010
new methods
-
- - swirl
- - spread
- - solarize
- - sharpen
- - roll
- - sepia
- - region
- - raise
- - lower
- - paint
- - noise
- - negative
- - morph
- - median
- - antialias
- - limit
- - label
+
+ - swirl
+ - spread
+ - solarize
+ - sharpen
+ - roll
+ - sepia
+ - region
+ - raise
+ - lower
+ - paint
+ - noise
+ - negative
+ - morph
+ - median
+ - antialias
+ - limit
+ - label
- implode
- gamma
- - enhance
- - equalize
+ - enhance
+ - equalize
- emboss
- edge
- dither
- monochrome
- - despeckle
- - depth
- - cycle
- - contrast
- - comment
- - colors
+ - despeckle
+ - depth
+ - cycle
+ - contrast
+ - comment
+ - colors
added more default args to several methods
added more examples
View
@@ -135,7 +135,7 @@ or clone the repo:
## Examples:
- Check out the [examples](http://github.com/aheckmann/gm/tree/master/examples/) directory to play around.
+ Check out the [examples](http://github.com/aheckmann/gm/tree/master/examples/) directory to play around.
Also take a look at the [extending gm](http://wiki.github.com/aheckmann/gm/extending-gm)
page to see how to customize gm to your own needs.
@@ -153,7 +153,7 @@ or clone the repo:
- [size](http://aheckmann.github.com/gm/docs.html#getters) - returns the size (WxH) of the image
- [orientation](http://aheckmann.github.com/gm/docs.html#orientation) - returns the EXIF orientation of the image
- [format](http://aheckmann.github.com/gm/docs.html#getters) - returns the image format (gif, jpeg, png, etc)
- - [depth](http://aheckmann.github.com/gm/docs.html#getters) - returns the image color depth
+ - [depth](http://aheckmann.github.com/gm/docs.html#getters) - returns the image color depth
- [color](http://aheckmann.github.com/gm/docs.html#getters) - returns the number of colors
- [res](http://aheckmann.github.com/gm/docs.html#getters) - returns the image resolution
- [filesize](http://aheckmann.github.com/gm/docs.html#getters) - returns image filesize
@@ -362,6 +362,9 @@ or clone the repo:
## Inspiration
http://github.com/quiiver/magickal-node
+## Plugins
+[https://github.com/aheckmann/gm/wiki](https://github.com/aheckmann/gm/wiki)
+
## License
(The MIT License)
View
@@ -204,13 +204,13 @@ module.exports = function (proto) {
self.sourceStream.pipe(proc.stdin);
// resume any buffered events from a previous identify operation
- if (self.buffer) {
- self.buffer.resume();
+ if (self._buffer) {
+ self._buffer.resume();
// if {bufferStream: true} was passed to an identify operation,
// we buffer the input stream events so we can use them again
} else if (self.bufferStream) {
- self.buffer = utils.buffer(self.sourceStream);
+ self._buffer = utils.buffer(self.sourceStream);
}
}

0 comments on commit ff57ac2

Please sign in to comment.