[commits] Horde branch master updated. 306bcdad984fa81b1d5a3b70a6fad46a5bd504c6

[Michael J. Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 2501d35587c9ef582603fdce0cc46762f35c92cc

5cf7d41 return the old type when setting the image type
306bcda revert the Horde_Image state if we change it

-----------------------------------------------------------------------

commit 5cf7d4118237388a7aa5afe99d417a117fa459a7
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 28 21:05:07 2011 -0400

    return the old type when setting the image type

 framework/Image/lib/Horde/Image/Base.php    |    3 +++
 framework/Image/lib/Horde/Image/Imagick.php |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5cf7d4118237388a7aa5afe99d417a117fa459a7

-----------------------------------------------------------------------

commit 306bcdad984fa81b1d5a3b70a6fad46a5bd504c6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 28 21:10:18 2011 -0400

    revert the Horde_Image state if we change it
    
    Fixes broken image generation when using PNG images and
    autogenerating views on upload. If screen images are generated
    before thumb images, the JPG type was sticking.

 ansel/lib/Image.php |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/306bcdad984fa81b1d5a3b70a6fad46a5bd504c6